diff --git a/anaconda/.tx/config b/anaconda/.tx/config
index 8232704..db3663c 100644
--- a/anaconda/.tx/config
+++ b/anaconda/.tx/config
@@ -1,4 +1,4 @@
-[anaconda.f20-branch]
+[anaconda.f21-branch]
 file_filter = po/<lang>.po
 source_file = po/anaconda.pot
 source_lang = en
diff --git a/anaconda/COPYING b/anaconda/COPYING
index a43ea21..d159169 100644
--- a/anaconda/COPYING
+++ b/anaconda/COPYING
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/anaconda/Makefile.am b/anaconda/Makefile.am
index 787d84a..dcc6eed 100644
--- a/anaconda/Makefile.am
+++ b/anaconda/Makefile.am
@@ -19,10 +19,17 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
 SUBDIRS = data docs dracut po pyanaconda scripts tests widgets utils
 
 EXTRA_DIST = config.rpath COPYING
 
+# Files generated for gettext need to be included in the distribution
+EXTRA_DIST += $(srcdir)/anaconda.po
+$(srcdir)/anaconda.po: $(srcdir)/anaconda
+	@$(MAKE) -C $(top_builddir)/po $(abs_top_srcdir)/$(subdir)/$$(basename $@)
+
 MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \
                        depcomp install-sh ltmain.sh missing ABOUT-NLS \
                        INSTALL aclocal.m4 configure *.pyc py-compile \
@@ -31,32 +38,37 @@ MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \
 
 CLEANFILES = *~
 
-MOSTLYCLEANDIRS = m4
-
 dist_noinst_DATA      = $(PACKAGE_NAME).spec
 
 dist_sbin_SCRIPTS     = anaconda
 
 ARCHIVE_TAG   = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)
 
-TX_PULL_ARGS = -a --disable-overwrite
+TX_PULL_ARGS = -a -f
 TX_PUSH_ARGS = -s
 
+INSTALLATION_GUIDE_REPO_URL = git://git.fedorahosted.org/git/docs/install-guide.git
+
 tag:
 	@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
 	@echo "Tagged as $(ARCHIVE_TAG)"
 
 po-pull:
-	rm -f $(srcdir)/po/en@boldquot.gmo $(srcdir)/po/en@boldquot.po
-	rm -f $(srcdir)/po/en@quot.gmo $(srcdir)/po/en@quot.po
 	rpm -q transifex-client &>/dev/null || ( echo "need to run: yum install transifex-client"; exit 1 )
 	tx pull $(TX_PULL_ARGS)
 
-scratch: po-pull
+po-empty:
+	for lingua in $$(grep -v '^#' $(srcdir)/po/LINGUAS) ; do \
+		[ -f $(srcdir)/po/$$lingua.po ] || \
+		msginit -i $(srcdir)/po/$(PACKAGE_NAME).pot -o $(srcdir)/po/$$lingua.po --no-translator || \
+		exit 1 ; \
+	done
+
+scratch: po-empty get-help
 	$(MAKE) ARCHIVE_TAG=HEAD dist
 	git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot
 
-scratch-bumpver: po-pull
+scratch-bumpver: po-empty get-help
 	@opts="-n $(PACKAGE_NAME) -v $(PACKAGE_VERSION) -r $(PACKAGE_RELEASE) -b $(PACKAGE_BUGREPORT)" ; \
 	if [ ! -z "$(IGNORE)" ]; then \
 		opts="$${opts} -i $(IGNORE)" ; \
@@ -67,10 +79,13 @@ scratch-bumpver: po-pull
 	if [ ! -z "$(BZDEBUG)" ]; then \
 		opts="$${opts} -d" ; \
 	fi ; \
+	if [ ! -z "$(SKIP_ACKS)" ]; then \
+		opts="$${opts} -s" ; \
+	fi ; \
 	( cd $(srcdir) && scripts/makebumpver $${opts} ) || exit 1 ; \
 	$(MAKE) -C po $(PACKAGE_NAME).pot-update ; 
 
-release:
+release: get-help
 	$(MAKE) dist && $(MAKE) tag && git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot
 
 api:
@@ -87,6 +102,9 @@ bumpver: po-pull
 	if [ ! -z "$(BZDEBUG)" ]; then \
 		opts="$${opts} -d" ; \
 	fi ; \
+	if [ ! -z "$(SKIP_ACKS)" ]; then \
+		opts="$${opts} -s" ; \
+	fi ; \
 	( cd $(srcdir) && scripts/makebumpver $${opts} ) || exit 1 ; \
 	$(MAKE) -C po $(PACKAGE_NAME).pot-update && \
 	tx push $(TX_PUSH_ARGS)
@@ -172,3 +190,24 @@ runglade:
 	GLADE_CATALOG_SEARCH_PATH=$(srcdir)/widgets/glade \
 	GLADE_MODULE_SEARCH_PATH=$(builddir)/widgets/src/.libs \
 	glade ${GLADE_FILE}
+
+
+# Get content for the Anaconda built-in help system by cloning the
+# installation guide git repository and running the help processing
+# script (it is part of the repository).
+# Once the help content has been generated copy it to our help folder,
+# so that it can be included in the tarball.
+# Skip the git clone if the repository already exists but run git pull
+# to make sure it is up to date. We also clone the repository
+# without history as it si rather big (>400 MB!), which is quite
+# an overkill for <100 kB of help conent. :)
+get-help:
+	if [ ! -d "install-guide" ]; then \
+		if [ -f "installation_guide_repo_url" ]; then \
+			git clone --depth=1 `cat installation_guide_repo_url` ; \
+	    else \
+			git clone --depth=1 $(INSTALLATION_GUIDE_REPO_URL) ; \
+		fi ; \
+	fi ; \
+	( cd install-guide && git pull --rebase && python prepare_anaconda_help_content.py )
+	cp -r install-guide/anaconda_help_content/* $(srcdir)/data/help
diff --git a/anaconda/anaconda b/anaconda/anaconda
index 75e94fe..4ec1a12 100755
--- a/anaconda/anaconda
+++ b/anaconda/anaconda
@@ -31,11 +31,105 @@
 # This toplevel file is a little messy at the moment... (2001-06-22)
 # ...still messy (2013-07-12)
 
-import atexit, sys, os, time, subprocess
-# keep up with process ID of the window manager if we start it
-wm_pid = None
+coverage = None
+
+proc_cmdline = open("/proc/cmdline", "r").read()
+proc_cmdline = proc_cmdline.split()
+if ("debug=1" in proc_cmdline) or ("debug" in proc_cmdline):
+    import coverage
+    cov = coverage.coverage(data_file="/mnt/sysimage/root/anaconda.coverage",
+                            branch=True,
+                            source=["/usr/sbin/anaconda", "pyanaconda"]
+                            )
+    cov.start()
+
+
+import atexit, sys, os, time, subprocess, signal, errno
+
+# Install a global SIGCHLD handler to keep track of things that should be
+# running for as long as anaconda does. The dictionary is of the form
+# {pid: name, ...}. The handler will raise ExitError (defined below), so if
+# not caught a SIGCHLD from a watched process will halt anaconda.
+forever_pids = {}
+
+class ExitError(RuntimeError):
+    pass
+
+def sigchld_handler(num, frame):
+    # Check whether anything in the list of processes being watched has
+    # exited. We don't want to call waitpid(-1), since that would break
+    # anything else using wait/waitpid (like the subprocess module).
+    exited_pids = []
+    exn_message = []
+
+    for child_pid in forever_pids:
+        try:
+            pid_result, status = iutil.eintr_retry_call(os.waitpid, child_pid, os.WNOHANG)
+        except OSError as e:
+            if e.errno == errno.ECHILD:
+                continue
+
+        if pid_result:
+            proc_name = forever_pids[child_pid]
+            exited_pids.append(child_pid)
+
+            if os.WIFEXITED(status):
+                status_str = "with status %s" % os.WEXITSTATUS(status)
+            elif os.WIFSIGNALED(status):
+                status_str = "on signal %s" % os.WTERMSIG(status)
+            else:
+                status_str = "with unknown status code %s" % status
+
+            exn_message.append("%s exited %s" % (proc_name, status_str))
+
+    for child_pid in exited_pids:
+        del forever_pids[child_pid]
+
+    if exn_message:
+        raise ExitError(", ".join(exn_message))
+
+signal.signal(signal.SIGCHLD, sigchld_handler)
+
+# Fork a new process and add it to forever_pids. The return values are the
+# the same as os.fork, but neither the parent nor the child will return
+# until the process is watched.
+def start_watched_pid(proc_name):
+    readpipe, writepipe = os.pipe()
+    childpid = os.fork()
+    if childpid == 0:
+        # No need for the write pipe in the child
+        iutil.eintr_retry_call(os.close, writepipe)
+
+        # Wait for the parent to signal that it's ready to return
+        iutil.eintr_retry_call(os.read, readpipe, 1)
+
+        # Ready to go
+        iutil.eintr_retry_call(os.close, readpipe)
+        return childpid
+    else:
+        # No need for the read pipe in the parent
+        iutil.eintr_retry_call(os.close, readpipe)
+
+        # Add the pid to the list of watched pids
+        forever_pids[childpid] = proc_name
+
+        # Signal to the child that we're ready to return
+        # D is for Done
+        iutil.eintr_retry_call(os.write, writepipe, 'D')
+        iutil.eintr_retry_call(os.close, writepipe)
+        return childpid
 
 def exitHandler(rebootData, storage, exitCode=None):
+    # Clear the list of watched PIDs.
+    global forever_pids
+    forever_pids = {}
+
+    # stop and save coverage here b/c later the file system may be unavailable
+    if coverage is not None:
+        cov.stop()
+        if os.path.isdir('/mnt/sysimage/root'):
+            cov.save()
+
     if flags.usevnc:
         vnc.shutdownServer()
 
@@ -44,37 +138,41 @@ def exitHandler(rebootData, storage, exitCode=None):
 
     if "nokill" in flags.cmdline:
         iutil.vtActivate(1)
-        print "anaconda halting due to nokill flag."
-        print "The system will be rebooted when you press Ctrl-Alt-Delete."
+        print("anaconda halting due to nokill flag.")
+        print("The system will be rebooted when you press Ctrl-Alt-Delete.")
         while True:
             time.sleep(10000)
 
     if image_count or flags.dirInstall:
-        anaconda.storage.umountFilesystems(ignoreErrors=True, swapoff=False)
+        anaconda.storage.umountFilesystems(swapoff=False)
         devicetree = anaconda.storage.devicetree
         devicetree.teardownAll()
-        for name in devicetree.diskImages:
-            dev = devicetree.getDeviceByName(name)
+        for imageName in devicetree.diskImages:
+            dev = devicetree.getDeviceByName(imageName)
             for loop in dev.parents:
                 loop.controllable = True
             dev.deactivate(recursive=True)
 
+    if anaconda.dbus_inhibit_id:
+        from pyanaconda.screensaver import uninhibit_screensaver
+        uninhibit_screensaver(anaconda.dbus_session_connection, anaconda.dbus_inhibit_id)
+        anaconda.dbus_inhibit_id = None
+
     if not flags.imageInstall and not flags.livecdInstall \
        and not flags.dirInstall:
         from pykickstart.constants import KS_SHUTDOWN, KS_WAIT
-        from pyanaconda.iutil import dracut_eject
+        from pyanaconda.iutil import dracut_eject, get_mount_paths
 
         if flags.eject or rebootData.eject:
-            for drive in storage.devicetree.devices:
-                if drive.type != "cdrom":
-                    continue
-                dracut_eject(drive.path)
+            for cdrom in storage.devicetree.getDevicesByType("cdrom"):
+                if get_mount_paths(cdrom.path):
+                    dracut_eject(cdrom.path)
 
         if rebootData.action == KS_SHUTDOWN:
             subprocess.Popen(["systemctl", "--no-wall", "poweroff"])
         elif rebootData.action == KS_WAIT:
             subprocess.Popen(["systemctl", "--no-wall", "halt"])
-        else: # reboot action is KS_REBOOT or None
+        else:  # reboot action is KS_REBOOT or None
             subprocess.Popen(["systemctl", "--no-wall", "reboot"])
 
 def startSpiceVDAgent():
@@ -85,20 +183,105 @@ def startSpiceVDAgent():
     else:
         log.info("Started spice-vdagent.")
 
+def startX11():
+    # Start X11 with its USR1 handler set to ignore, which will make it send
+    # us SIGUSR1 if it succeeds. If it fails, catch SIGCHLD and bomb out.
+    # Use a list so the value can be modified from the handler
+    x11_started = [False]
+    def sigusr1_handler(num, frame):
+        log.debug("X server has signalled a successful start.")
+        x11_started[0] = True
+
+    # Fail after, let's say a minute, in case something weird happens
+    # and we don't receive SIGUSR1
+    def sigalrm_handler(num, frame):
+        # Check that it didn't make it under the wire
+        if x11_started[0]:
+            return
+        log.error("Timeout trying to start the X server")
+        raise ExitError("Timeout trying to start the X server")
+
+    try:
+        old_sigusr1_handler = signal.signal(signal.SIGUSR1, sigusr1_handler)
+        old_sigalrm_handler = signal.signal(signal.SIGALRM, sigalrm_handler)
+
+        childpid = start_watched_pid("Xorg")
+
+        if not childpid:
+            # after this point the method should never return (or throw an exception
+            # outside)
+            try:
+                # dup /dev/tty5 to stdout and stderr
+                xfd = iutil.eintr_retry_call(os.open, "/dev/tty5", os.O_WRONLY | os.O_APPEND)
+                iutil.eintr_retry_call(os.dup2, xfd, sys.stdout.fileno())
+                iutil.eintr_retry_call(os.dup2, xfd, sys.stderr.fileno())
+
+                # Close all other file descriptors
+                try:
+                    maxfd = os.sysconf("SC_OPEN_MAX")
+                except ValueError:
+                    maxfd = 1024
+
+                os.closerange(3, maxfd)
+
+                # Replace the SIGUSR1 handler with SIG_IGN as described above
+                signal.signal(signal.SIGUSR1, signal.SIG_IGN)
+
+                # Run it
+                os.execlp("Xorg", "Xorg", "-br",
+                          "-logfile", "/tmp/X.log",
+                          ":1", "vt6", "-s", "1440", "-ac",
+                          "-nolisten", "tcp", "-dpi", "96",
+                          "-noreset")
+
+                # We should never get here
+                raise OSError(0, "Unable to exec")
+            except BaseException as e:
+                # catch all possible exceptions
+                # Reopen the logger in case it was closed by closerange.
+                # Use a different name because assigning to variables across a
+                # fork confuses the hell out of python.
+                child_log = logging.getLogger("anaconda")
+                child_log.error("Problems running Xorg: %s", e)
+                os._exit(1)
+
+        # Parent process
+        # Start the timer
+        signal.alarm(60)
+
+        # Wait for SIGUSR1
+        while not x11_started[0]:
+            signal.pause()
+
+        # Now that X is started, make $DISPLAY available
+        os.environ["DISPLAY"] = ":1"
+    finally:
+        # Put everything back where it was
+        signal.alarm(0)
+        signal.signal(signal.SIGUSR1, old_sigusr1_handler)
+        signal.signal(signal.SIGALRM, old_sigalrm_handler)
+
 def startMetacityWM():
-    childpid = os.fork()
+    # When metacity actually connects to the X server is unknowable, but
+    # fortunately it doesn't matter. metacity does not need to be the first
+    # connection to Xorg, and if anaconda starts up before metacity, metacity
+    # will just take over and maximize the window and make everything right,
+    # fingers crossed.
+
+    childpid = start_watched_pid("metacity")
     if not childpid:
         # after this point the method should never return (or throw an exception
         # outside)
         try:
-            iutil.execWithRedirect('metacity', ["--display", ":1", "--sm-disable"])
+            returncode = iutil.execWithRedirect('metacity', ["--display", ":1", "--sm-disable"])
         except BaseException as e:
             # catch all possible exceptions
             log.error("Problems running the window manager: %s", e)
             os._exit(1)
 
         log.info("The window manager has terminated.")
-        os._exit(0)
+        os._exit(returncode)
+
     return childpid
 
 def startAuditDaemon():
@@ -111,23 +294,18 @@ def startAuditDaemon():
             log.error("Error running the audit daemon: %s", e)
         os._exit(0)
     # auditd will turn into a daemon so catch the immediate child pid now:
-    os.waitpid(childpid, 0)
+    iutil.eintr_retry_call(os.waitpid, childpid, 0)
 
 # function to handle X startup special issues for anaconda
 def doStartupX11Actions():
     """Start window manager"""
 
-    global wm_pid # pid of the anaconda fork where the window manager is running
-
     # now start up the window manager
     wm_pid = startMetacityWM()
     log.info("Starting window manager, pid %s.", wm_pid)
 
 def set_x_resolution(runres):
-    # cant do this if no window manager is running because otherwise when we
-    # open and close an X connection in the xutils calls the X server will exit
-    # since this is the first X connection (if no window manager is running)
-    if runres and opts.display_mode == 'g' and not flags.usevnc and wm_pid :
+    if runres and opts.display_mode == 'g' and not flags.usevnc:
         try:
             log.info("Setting the screen resolution to: %s.", runres)
             iutil.execWithRedirect("xrandr",
@@ -144,8 +322,6 @@ def doExtraX11Actions(runres):
 
     startSpiceVDAgent()
 
-    keyboard.background_XklWrapper_initialize()
-
 def setupPythonUpdates():
     from distutils.sysconfig import get_python_lib
     import gi.overrides
@@ -205,114 +381,156 @@ def symlink_updates(dest_dir, update_dir):
                 continue
             os.symlink(dest_path, update_path)
 
-def getAnacondaVersion():
-    # Using _isys here so we don't drag in the logging stuff, which is always
-    # complicated.
-    from pyanaconda import _isys
-    return _isys.getAnacondaVersion()
+def getAnacondaVersionString():
+    # we are importing the startup module directly so that it can be replaced
+    # by updates image, if it was replaced before the updates image can be
+    # loaded, it could not be easily replaced
+    from pyanaconda import startup_utils
+    return startup_utils.get_anaconda_version_string()
 
-def parseOptions(argv=None, cmdline=None):
-    from pyanaconda.anaconda_optparse import AnacondaOptionParser
+
+def parseArguments(argv=None, boot_cmdline=None):
+    from pyanaconda.anaconda_argparse import AnacondaArgumentParser
+    from pyanaconda.anaconda_argparse import HelpTextParser
+
+    datadir = os.environ.get("ANACONDA_DATADIR", "/usr/share/anaconda")
 
     # NOTE: for each long option (like '--repo'), AnacondaOptionParser
     # checks the boot arguments for bootarg_prefix+option ('inst.repo').
     # If require_prefix is False, it also accepts the option without the
     # bootarg_prefix ('repo').
     # See anaconda_optparse.py and BootArgs (in flags.py) for details.
-    op = AnacondaOptionParser(version="%prog " + getAnacondaVersion(),
-                              bootarg_prefix="inst.", require_prefix=False)
+    ap = AnacondaArgumentParser(bootarg_prefix="inst.", require_prefix=False)
+    help_parser = HelpTextParser(os.path.join(datadir, "anaconda_options.txt"))
 
     # NOTE: store_false options will *not* get negated when the user does
     # "option=0" on the boot commandline (store_true options do, though).
     # Basically, don't use store_false unless the option starts with "no".
 
+    # YET ANOTHER NOTE: If you change anything here:
+    # a) document its usage in docs/boot-options.txt
+    # b) be prepared to maintain it for a very long time
+    # If this seems like too much trouble, *don't add a new option*!
+
+    # Version
+    ap.add_argument('--version', action='version', version="%(prog)s " + getAnacondaVersionString())
+
     # Interface
-    op.add_option("-C", "--cmdline", dest="display_mode", action="store_const", const="c",
-                  default="g")
-    op.add_option("-G", "--graphical", dest="display_mode", action="store_const", const="g")
-    op.add_option("-T", "--text", dest="display_mode", action="store_const", const="t")
-    op.add_option("-S", "--script", dest="display_mode", action="store_const", const="s")
+    ap.add_argument("-C", "--cmdline", dest="display_mode", action="store_const", const="c",
+                    default="g", help=help_parser.help_text("cmdline"))
+    ap.add_argument("-G", "--graphical", dest="display_mode", action="store_const", const="g",
+                    help=help_parser.help_text("graphical"))
+    ap.add_argument("-T", "--text", dest="display_mode", action="store_const", const="t",
+                    help=help_parser.help_text("text"))
 
     # Network
-    op.add_option("--noipv4", action="store_true", default=False)
-    op.add_option("--noipv6", action="store_true", default=False)
-    op.add_option("--proxy")
+    ap.add_argument("--proxy", metavar='PROXY_URL', help=help_parser.help_text("proxy"))
 
     # Method of operation
-    op.add_option("--autostep", action="store_true", default=False)
-    op.add_option("-d", "--debug", dest="debug", action="store_true", default=False)
-    op.add_option("--ks", dest="ksfile", action="store_const", const="/run/install/ks.cfg")
-    op.add_option("--kickstart", dest="ksfile")
-    op.add_option("--rescue", dest="rescue", action="store_true", default=False)
-    op.add_option("--targetarch", "rpmarch", dest="targetArch", type="string")
-    op.add_option("--armplatform", dest="armPlatform", type="string")
-    op.add_option("--multilib", dest="multiLib", action="store_true", default=False)
+    ap.add_argument("-d", "--debug", dest="debug", action="store_true",
+                    default=False, help=help_parser.help_text("debug"))
+    ap.add_argument("--ks", dest="ksfile", action="store_const",
+                    metavar="KICKSTART_URL", const="/run/install/ks.cfg",
+                    help=help_parser.help_text("ks"))
+    ap.add_argument("--kickstart", dest="ksfile", metavar="KICKSTART_PATH",
+                    help=help_parser.help_text("kickstart"))
+    ap.add_argument("--rescue", dest="rescue", action="store_true", default=False,
+                    help=help_parser.help_text("rescue"))
+    ap.add_argument("--armplatform", dest="armPlatform", type=str, metavar="PLATFORM_ID",
+                    help=help_parser.help_text("armplatform"))
+    ap.add_argument("--multilib", dest="multiLib", action="store_true", default=False,
+                    help=help_parser.help_text("multilib"))
 
-    op.add_option("-m", "--method", dest="method", default=None)
-    op.add_option("--askmethod", dest="askmethod", action="store_true", default=False)
-    op.add_option("--repo", dest="method", default=None)
-    op.add_option("--stage2", dest="stage2", default=None)
-    op.add_option("--noverifyssl", action="store_true", default=False)
-
-    op.add_option("--liveinst", action="store_true", default=False)
+    ap.add_argument("-m", "--method", dest="method", default=None, metavar="METHOD",
+                    help=help_parser.help_text("method"))
+    ap.add_argument("--askmethod", dest="askmethod", action="store_true", default=False,
+                    help=help_parser.help_text("askmethod"))
+    ap.add_argument("--repo", dest="method", default=None, metavar="REPO_URL",
+                    help=help_parser.help_text("repo"))
+    ap.add_argument("--stage2", dest="stage2", default=None, metavar="STAGE2_URL",
+                    help=help_parser.help_text("stage2"))
+    ap.add_argument("--noverifyssl", action="store_true", default=False,
+                    help=help_parser.help_text("noverifyssl"))
+    ap.add_argument("--liveinst", action="store_true", default=False,
+                    help=help_parser.help_text("liveinst"))
 
     # Display
-    op.add_option("--headless", dest="isHeadless", action="store_true", default=False)
-    op.add_option("--nofb")
-    op.add_option("--resolution", dest="runres", default=None)
-    op.add_option("--usefbx", dest="xdriver", action="store_const", const="fbdev")
-    op.add_option("--vnc", action="store_true", default=False)
-    op.add_option("--vncconnect")
-    op.add_option("--vncpassword", default="")
-    op.add_option("--xdriver", dest="xdriver", action="store", type="string", default=None)
+    ap.add_argument("--resolution", dest="runres", default=None, metavar="WIDTHxHEIGHT",
+                    help=help_parser.help_text("resolution"))
+    ap.add_argument("--usefbx", dest="xdriver", action="store_const", const="fbdev",
+                    help=help_parser.help_text("usefbx"))
+    ap.add_argument("--vnc", action="store_true", default=False,
+                    help=help_parser.help_text("vnc"))
+    ap.add_argument("--vncconnect", metavar="HOST:PORT", help=help_parser.help_text("vncconnect"))
+    ap.add_argument("--vncpassword", default="", metavar="PASSWORD",
+                    help=help_parser.help_text("vncpassword"))
+    ap.add_argument("--xdriver", dest="xdriver", action="store", type=str,
+                    default=None, metavar="DRIVER", help=help_parser.help_text("xdriver"))
 
     # Language
-    op.add_option("--keymap")
-    op.add_option("--kbdtype")
-    op.add_option("--lang")
+    ap.add_argument("--keymap", metavar="KEYMAP", help=help_parser.help_text("keymap"))
+    ap.add_argument("--lang", metavar="LANG", help=help_parser.help_text("lang"))
 
     # Obvious
-    op.add_option("--loglevel")
-    op.add_option("--syslog")
+    ap.add_argument("--loglevel", metavar="LEVEL", help=help_parser.help_text("loglevel"))
+    ap.add_argument("--syslog", metavar="HOST[:PORT]", help=help_parser.help_text("syslog"))
 
-    op.add_option("--noselinux", dest="selinux", action="store_false", default=True)
-    op.add_option("--selinux", action="store_true")
+    from pykickstart.constants import SELINUX_DISABLED, SELINUX_ENFORCING
+    from pyanaconda.constants import SELINUX_DEFAULT
+    ap.add_argument("--noselinux", dest="selinux", action="store_const",
+                    const=SELINUX_DISABLED, default=SELINUX_DEFAULT,
+                    help=help_parser.help_text("noselinux"))
+    ap.add_argument("--selinux", action="store_const",
+                    const=SELINUX_ENFORCING, help=help_parser.help_text("selinux"))
 
-    op.add_option("--nompath", dest="mpath", action="store_false", default=True)
-    op.add_option("--mpath", action="store_true")
+    ap.add_argument("--nompath", dest="mpath", action="store_false", default=True,
+                    help=help_parser.help_text("nompath"))
+    ap.add_argument("--mpath", action="store_true", help=help_parser.help_text("mpath"))
 
-    op.add_option("--nodmraid", dest="dmraid", action="store_false", default=True)
-    op.add_option("--dmraid", action="store_true")
+    ap.add_argument("--nodmraid", dest="dmraid", action="store_false", default=True,
+                    help=help_parser.help_text("nodmraid"))
+    ap.add_argument("--dmraid", action="store_true", help=help_parser.help_text("dmraid"))
 
-    op.add_option("--noibft", dest="ibft", action="store_false", default=True)
-    op.add_option("--ibft", action="store_true")
-    op.add_option("--noiscsi", dest="iscsi", action="store_false", default=False)
-    op.add_option("--iscsi", action="store_true")
+    ap.add_argument("--noibft", dest="ibft", action="store_false", default=True,
+                    help=help_parser.help_text("noibft"))
+    ap.add_argument("--ibft", action="store_true", help=help_parser.help_text("ibft"))
 
     # Geolocation
-    op.add_option("--geoloc")
+    ap.add_argument("--geoloc", metavar="PROVIDER_ID", help=help_parser.help_text("geoloc"))
 
     # Miscellaneous
-    op.add_option("--module", action="append", default=[])
-    op.add_option("--nomount", dest="rescue_nomount", action="store_true", default=False)
-    op.add_option("--updates", dest="updateSrc", action="store", type="string")
-    op.add_option("--dlabel", action="store_true", default=False)
-    op.add_option("--image", action="append", dest="images", default=[])
-    op.add_option("--dirinstall", action="store_true", default=False)
-    op.add_option("--memcheck", action="store_true", default=True)
-    op.add_option("--nomemcheck", action="store_false", dest="memcheck")
-    op.add_option("--leavebootorder", action="store_true", default=False)
-    op.add_option("--noeject", action="store_false", dest="eject", default=True)
-    op.add_option("--extlinux", action="store_true", default=False)
-    op.add_option("--dnf", action="store_true", default=False)
+    ap.add_argument("--nomount", dest="rescue_nomount", action="store_true", default=False,
+                    help=help_parser.help_text("nomount"))
+    ap.add_argument("--updates", dest="updateSrc", action="store", type=str,
+                    metavar="UPDATES_URL", help=help_parser.help_text("updates"))
+    ap.add_argument("--image", action="append", dest="images", default=[],
+                    metavar="IMAGE_SPEC", help=help_parser.help_text("image"))
+    ap.add_argument("--dirinstall", nargs="?", const=True, default=False,
+                    help=help_parser.help_text("dirinstall"))
+    ap.add_argument("--memcheck", action="store_true", default=True,
+                    help=help_parser.help_text("memcheck"))
+    ap.add_argument("--nomemcheck", action="store_false", dest="memcheck",
+                    help=help_parser.help_text("nomemcheck"))
+    ap.add_argument("--leavebootorder", action="store_true", default=False,
+                    help=help_parser.help_text("leavebootorder"))
+    ap.add_argument("--noeject", action="store_false", dest="eject", default=True,
+                    help=help_parser.help_text("noeject"))
+    ap.add_argument("--extlinux", action="store_true", default=False,
+                    help=help_parser.help_text("extlinux"))
+    ap.add_argument("--nombr", action="store_true", default=False,
+                    help=help_parser.help_text("nombr"))
+    ap.add_argument("--dnf", action="store_true", default=False,
+                    help=help_parser.help_text("dnf"))
+    ap.add_argument("--mpathfriendlynames", action="store_true", default=True,
+                    help=help_parser.help_text("mpathfriendlynames"))
 
     # some defaults change based on cmdline flags
-    if cmdline is not None:
-        if "console" in cmdline:
-            op.set_defaults(display_mode="t")
+    if boot_cmdline is not None:
+        if "console" in boot_cmdline:
+            ap.set_defaults(display_mode="t")
 
-    (options, extraArgs) = op.parse_args(argv, cmdline=cmdline)
-    return (options, extraArgs, op.deprecated_bootargs)
+    namespace = ap.parse_args(argv, boot_cmdline=boot_cmdline)
+    return (namespace, ap.deprecated_bootargs)
 
 def setupPythonPath():
     # First add our updates path
@@ -324,7 +542,7 @@ def setupPythonPath():
 
 def setupEnvironment():
     # Silly GNOME stuff
-    if os.environ.has_key('HOME') and not os.environ.has_key("XAUTHORITY"):
+    if 'HOME' in os.environ and not "XAUTHORITY" in os.environ:
         os.environ['XAUTHORITY'] = os.environ['HOME'] + '/.Xauthority'
     os.environ['HOME'] = '/tmp'
     os.environ['LC_NUMERIC'] = 'C'
@@ -338,48 +556,52 @@ def setupEnvironment():
 
     # we can't let the LD_PRELOAD hang around because it will leak into
     # rpm %post and the like.  ick :/
-    if os.environ.has_key("LD_PRELOAD"):
+    if "LD_PRELOAD" in os.environ:
         del os.environ["LD_PRELOAD"]
 
 def setupLoggingFromOpts(options):
-    if options.debug:
-        # debugging means debug logging
+    if (options.debug or options.updateSrc) and not options.loglevel:
+        # debugging means debug logging if an explicit level hasn't been st
         options.loglevel = "debug"
 
-    if options.loglevel and anaconda_log.logLevelMap.has_key(options.loglevel):
-        level = anaconda_log.logLevelMap[opts.loglevel]
+    if options.loglevel and options.loglevel in anaconda_log.logLevelMap:
+        log.info("Switching logging level to %s", options.loglevel)
+        level = anaconda_log.logLevelMap[options.loglevel]
         anaconda_log.logger.tty_loglevel = level
         anaconda_log.setHandlersLevel(log, level)
-        packaging_log = logging.getLogger("packaging")
-        anaconda_log.setHandlersLevel(packaging_log, level)
         storage_log = logging.getLogger("storage")
         anaconda_log.setHandlersLevel(storage_log, level)
+        packaging_log = logging.getLogger("packaging")
+        anaconda_log.setHandlersLevel(packaging_log, level)
 
     if options.syslog:
         anaconda_log.logger.updateRemote(options.syslog)
 
 def gtk_warning(title, reason):
     from gi.repository import Gtk
-    dialog = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
-                               buttons = Gtk.ButtonsType.CLOSE,
+    dialog = Gtk.MessageDialog(type=Gtk.MessageType.ERROR,
+                               buttons=Gtk.ButtonsType.CLOSE,
                                message_format=reason)
     dialog.set_title(title)
     dialog.run()
     dialog.destroy()
 
-# pylint: disable-msg=W0621
+# pylint: disable=redefined-outer-name
 def check_memory(anaconda, options, display_mode=None):
+    from pyanaconda import isys
+    from pyanaconda.iutil import persistent_root_image
+
     reason_strict = _("%(product_name)s requires %(needed_ram)s MB of memory to "
                       "install, but you only have %(total_ram)s MB on this machine.\n")
     reason_graphical = _("The %(product_name)s graphical installer requires %(needed_ram)s "
-                         "MB of memory, but you only have %(total_ram)s MB.")
+                         "MB of memory, but you only have %(total_ram)s MB\n.")
 
     reboot_extra = _('\n'
                      'Press <return> to reboot your system.\n')
     livecd_title = _("Not enough RAM")
-    livecd_extra =_(" Try the text mode installer by running:\n\n"
-                    "'/usr/bin/liveinst -T'\n\n from a root "
-                    "terminal.")
+    livecd_extra = _(" Try the text mode installer by running:\n\n"
+                     "'/usr/bin/liveinst -T'\n\n from a root "
+                     "terminal.")
     nolivecd_extra = _(" Starting text mode.")
 
     if options.rescue:
@@ -389,9 +611,14 @@ def check_memory(anaconda, options, display_mode=None):
         display_mode = anaconda.displayMode
 
     reason = reason_strict
-    total_ram = int(isys.total_memory() / 1024)
-    needed_ram = int(isys.MIN_RAM / 1024)
-    graphical_ram = needed_ram + int(isys.GUI_INSTALL_EXTRA_RAM / 1024)
+    total_ram = int(isys.total_memory())
+    needed_ram = int(isys.MIN_RAM)
+    graphical_ram = int(isys.MIN_GUI_RAM)
+
+    # count the squashfs.img in if it is kept in RAM
+    if not persistent_root_image():
+        needed_ram += isys.SQUASHFS_EXTRA_RAM
+        graphical_ram += isys.SQUASHFS_EXTRA_RAM
 
     log.info("check_memory(): total:%s, needed:%s, graphical:%s",
              total_ram, needed_ram, graphical_ram)
@@ -400,13 +627,14 @@ def check_memory(anaconda, options, display_mode=None):
         log.warning("CHECK_MEMORY DISABLED")
         return
 
-    reason_args = {"product_name" : product.productName,
-                   "needed_ram" : needed_ram,
-                   "total_ram" : total_ram }
+    reason_args = {"product_name": product.productName,
+                   "needed_ram": needed_ram,
+                   "total_ram": total_ram}
     if needed_ram > total_ram:
         from snack import SnackScreen, ButtonChoiceWindow
         if options.liveinst:
-            stdoutLog.warning(reason, **reason_args)
+            # pylint: disable=logging-not-lazy
+            stdoutLog.warning(reason % reason_args)
             gtk_warning(livecd_title, reason % reason_args)
         else:
             reason += reboot_extra
@@ -419,28 +647,31 @@ def check_memory(anaconda, options, display_mode=None):
 
     # override display mode if machine cannot nicely run X
     if display_mode not in ('t', 'c', 's') and not flags.usevnc:
+        needed_ram = graphical_ram
         reason_args["needed_ram"] = graphical_ram
         reason = reason_graphical
 
         if needed_ram > total_ram:
             if options.liveinst:
                 reason += livecd_extra
-                stdoutLog.warning(reason, **reason_args)
+                # pylint: disable=logging-not-lazy
+                stdoutLog.warning(reason % reason_args)
                 title = livecd_title
                 gtk_warning(title, reason % reason_args)
                 sys.exit(1)
             else:
                 reason += nolivecd_extra
-                stdoutLog.warning(reason, **reason_args)
+                # pylint: disable=logging-not-lazy
+                stdoutLog.warning(reason % reason_args)
                 anaconda.displayMode = 't'
                 time.sleep(2)
 
 def startDebugger(signum, frame):
-    # pylint: disable-msg=F0401
+    # pylint: disable=import-error
     import epdb
     epdb.serve(skip=1)
 
-# pylint: disable-msg=W0621
+# pylint: disable=redefined-outer-name
 def setupDisplay(anaconda, options, addons=None):
     from pyanaconda.ui.tui.simpleline import App
     from pyanaconda.ui.tui.spokes.askvnc import AskVNCSpoke
@@ -453,10 +684,10 @@ def setupDisplay(anaconda, options, addons=None):
     vncS.anaconda = anaconda
 
     anaconda.displayMode = options.display_mode
-    anaconda.isHeadless = options.isHeadless or arch.isS390()
+    anaconda.isHeadless = arch.isS390()
 
     if options.vnc:
-        flags.usevnc = 1
+        flags.usevnc = True
         anaconda.displayMode = 'g'
         vncS.password = options.vncpassword
 
@@ -472,11 +703,11 @@ def setupDisplay(anaconda, options, addons=None):
         anaconda.xdriver = options.xdriver
         anaconda.writeXdriver(root="/")
 
-    if anaconda.rescue:
+    if flags.rescue_mode:
         return
 
     if anaconda.ksdata.vnc.enabled:
-        flags.usevnc = 1
+        flags.usevnc = True
         anaconda.displayMode = 'g'
 
         if vncS.password == "":
@@ -488,6 +719,17 @@ def setupDisplay(anaconda, options, addons=None):
         if vncS.vncconnectport == "":
             vncS.vncconnectport = anaconda.ksdata.vnc.port
 
+    if anaconda.displayMode == "g":
+        import pkgutil
+        import pyanaconda.ui
+
+        mods = (tup[1] for tup in pkgutil.iter_modules(pyanaconda.ui.__path__, "pyanaconda.ui."))
+        if "pyanaconda.ui.gui" not in mods:
+            stdoutLog.warning("Graphical user interface not available, falling back to text mode")
+            anaconda.displayMode = "t"
+            flags.usevnc = False
+            flags.vncquestion = False
+
     # disable VNC over text question when not enough memory is available
     if blivet.util.total_memory() < isys.MIN_GUI_RAM:
         stdoutLog.warning("Not asking for VNC because current memory (%d) < MIN_GUI_RAM (%d)", blivet.util.total_memory(), isys.MIN_GUI_RAM)
@@ -513,7 +755,7 @@ def setupDisplay(anaconda, options, addons=None):
         stdoutLog.warning("Not asking for VNC because we don't have Xvnc")
         flags.vncquestion = False
 
-    if os.environ.has_key('DISPLAY'):
+    if 'DISPLAY' in os.environ:
         flags.preexisting_x11 = True
 
     # Should we try to start Xorg?
@@ -550,54 +792,24 @@ def setupDisplay(anaconda, options, addons=None):
 
         if anaconda.ksdata.vnc.enabled:
             anaconda.displayMode = 'g'
-            flags.usevnc = 1
+            flags.usevnc = True
             vncS.password = anaconda.ksdata.vnc.password
 
     log.info("Display mode = %s", anaconda.displayMode)
     check_memory(anaconda, options)
 
+    # check_memory may have changed the display mode
+    want_x = want_x and (anaconda.displayMode == "g")
     if want_x:
-        # The following code depends on no SIGCHLD being delivered,
-        # possibly only except the one from a failing X.org. Thus
-        # make sure before entering this section that all the other
-        # children of anaconda have terminated or were forked into
-        # an orphan (which won't deliver a SIGCHLD to mess up the
-        # fragile signaling below). start X with its USR1 handler
-        # set to ignore.  this will make it send us SIGUSR1 if it
-        # succeeds.  if it fails, catch SIGCHLD and bomb out.
-        def sigchld_handler(num, frame):
-            raise OSError(0, "SIGCHLD caught when trying to start the X server.")
-
-        def sigusr1_handler(num, frame):
-            log.debug("X server has signalled a successful start.")
-
-        def preexec_fn():
-            signal.signal(signal.SIGUSR1, signal.SIG_IGN)
-
-        old_sigusr1 = signal.signal(signal.SIGUSR1, sigusr1_handler)
-        old_sigchld = signal.signal(signal.SIGCHLD, sigchld_handler)
-        xout = open("/dev/tty5", "w")
         try:
-            subprocess.Popen(["Xorg", "-br",
-                              "-logfile", "/tmp/X.log",
-                              ":1", "vt7", "-s", "1440", "-ac",
-                              "-nolisten", "tcp", "-dpi", "96",
-                              "-noreset"],
-                              close_fds=True,
-                              stdout=xout, stderr=xout,
-                              preexec_fn=preexec_fn)
-
-            signal.pause()
-            os.environ["DISPLAY"] = ":1"
+            startX11()
             doStartupX11Actions()
-        except (OSError, RuntimeError):
+        except (OSError, RuntimeError) as e:
+            log.warning("X startup failed: %s", e)
             stdoutLog.warning("X startup failed, falling back to text mode")
             anaconda.displayMode = 't'
             graphical_failed = 1
             time.sleep(2)
-        finally:
-            signal.signal(signal.SIGUSR1, old_sigusr1)
-            signal.signal(signal.SIGCHLD, old_sigchld)
 
         if not graphical_failed:
             doExtraX11Actions(options.runres)
@@ -611,7 +823,7 @@ def setupDisplay(anaconda, options, addons=None):
 
         if anaconda.ksdata.vnc.enabled:
             anaconda.displayMode = 'g'
-            flags.usevnc = 1
+            flags.usevnc = True
             vncS.password = anaconda.ksdata.vnc.password
 
     # if they want us to use VNC do that now
@@ -669,19 +881,26 @@ def cleanPStore():
     # is sufficient free space on the flash part.  On some machines this will
     # take effect immediately, which is the best case.  Unfortunately on some,
     # an intervening reboot is needed."""
-    try:
-        for root, _dirs, files in os.walk("/sys/fs/pstore"):
-            for f in files:
-                os.unlink("%s/%s" % (root,f))
-    except OSError:
-        pass
+    from pyanaconda.iutil import dir_tree_map
+    dir_tree_map("/sys/fs/pstore", os.unlink, files=True, dirs=False)
 
 if __name__ == "__main__":
-    print "Starting installer, one moment..."
+    # check if the CLI help is requested and return it at once,
+    # without importing random stuff and spamming stdout
+    if ("--help" in sys.argv) or ("-h" in sys.argv) or ("--version" in sys.argv):
+        # we skip the full logging initialisation, but we need to do at least
+        # this much (redirect any log messages to stdout) to get rid of the
+        # harmless but annoying "no handlers found" message on stdout
+        import logging
+        log = logging.getLogger("anaconda")
+        log.addHandler(logging.StreamHandler(stream=sys.stdout))
+        parseArguments()
+
+    print("Starting installer, one moment...")
 
     # Allow a file to be loaded as early as possible
     try:
-        # pylint: disable-msg=F0401,W0611
+        # pylint: disable=import-error,unused-import
         import updates_disk_hook
     except ImportError:
         pass
@@ -705,10 +924,12 @@ if __name__ == "__main__":
 
     # do this early so we can set flags before initializing logging
     from pyanaconda.flags import flags, can_touch_runtime_system
-    (opts, args, depr) = parseOptions(cmdline=flags.cmdline)
+    (opts, depr) = parseArguments(boot_cmdline=flags.cmdline)
 
-    if opts.askmethod:
-        flags.askmethod = True
+    if opts.images:
+        flags.imageInstall = True
+    elif opts.dirinstall:
+        flags.dirInstall = True
 
     # Set up logging as early as possible.
     import logging
@@ -724,28 +945,18 @@ if __name__ == "__main__":
 
     if os.geteuid() != 0:
         stdoutLog.error("anaconda must be run as root.")
-        sys.exit(0)
-
-    if opts.images and opts.dirinstall:
-        stdoutLog.error("--images and --dirinstall cannot be used at the same time")
-        sys.exit(0)
-    elif opts.images:
-        flags.imageInstall = True
-    elif opts.dirinstall:
-        flags.dirInstall = True
+        sys.exit(1)
 
     # see if we're on s390x and if we've got an ssh connection
     uname = os.uname()
     if uname[4] == 's390x':
-        if 'TMUX' not in os.environ and "RUNKS" not in flags.cmdline and not flags.imageInstall:
+        if 'TMUX' not in os.environ and not flags.ksprompt and not flags.imageInstall:
             prompt_for_ssh()
             sys.exit(0)
-        # If we get RUNKS, we default to cmdline display mode, because nothing
-        # else will work.  Kickstart options can still override.
-        if "RUNKS" in flags.cmdline:
-            opts.display_mode = 'c'
 
-    log.info("%s %s", sys.argv[0], getAnacondaVersion())
+    log.info("%s %s", sys.argv[0], getAnacondaVersionString())
+    if os.path.exists("/tmp/updates"):
+        log.info("Using updates in /tmp/updates/ from %s", opts.updateSrc)
 
     # TODO: uncomment this when we're sure that we're doing the right thing
     # with flags.cmdline *everywhere* it appears...
@@ -757,22 +968,66 @@ if __name__ == "__main__":
     from pyanaconda import product
 
     from pyanaconda import isys
-    isys.initLog()
 
-    import signal, string
+    import string
 
     from pyanaconda import iutil
+
+    if opts.images and opts.dirinstall:
+        stdoutLog.error("--images and --dirinstall cannot be used at the same time")
+        sys.exit(1)
+    elif opts.dirinstall:
+        if opts.dirinstall is True:
+            root_path = os.environ.get("ANACONDA_ROOT_PATH", "/mnt/sysimage")
+        else:
+            root_path = opts.dirinstall
+        iutil.setTargetPhysicalRoot(root_path)
+        iutil.setSysroot(root_path)
+
     from pyanaconda import vnc
     from pyanaconda import kickstart
     from pyanaconda import ntp
     from pyanaconda import keyboard
+    from pyanaconda.iutil import ProxyString, ProxyStringError
 
-    verdesc = "%s for %s %s" % (getAnacondaVersion(),
+    verdesc = "%s for %s %s" % (getAnacondaVersionString(),
                                 product.productName, product.productVersion)
+
+    logs_note = " * installation log files are stored in /tmp during the installation"
+    shell_and_tmux_note = " * shell is available on TTY2"
+    shell_only_note = " * shell is available on TTY2 and in second TMUX pane (ctrl+b, then press 2)"
+    tmux_only_note = " * shell is available in second TMUX pane (ctrl+b, then press 2)"
+    text_mode_note = " * if the graphical installation interface fails to start, try again with the\n"\
+                     "   inst.text bootoption to start text installation"
+    separate_attachements_note = " * when reporting a bug add logs from /tmp as separate text/plain attachments"
+
     if product.isFinal:
-        print "anaconda %s started." % verdesc
+        print("anaconda %s started." % verdesc)
     else:
-        print "anaconda %s (pre-release) started." % verdesc
+        print("anaconda %s (pre-release) started." % verdesc)
+
+    # we are past the --version and --help shortcut so we can import Blivet
+    # now without slowing down anything critical
+
+    # pylint: disable=import-error
+    from blivet import arch
+
+    if not opts.images and not opts.dirinstall:
+        print(logs_note)
+        # no fancy stuff like TTYs on a s390...
+        if not arch.isS390():
+            if "TMUX" in os.environ and os.environ.get("TERM") == "screen":
+                print(shell_and_tmux_note)
+            else:
+                print(shell_only_note)  # TMUX is not running
+        # ...but there is apparently TMUX during the manual installation on s390!
+        elif not opts.ksfile:
+            print(tmux_only_note)  # but not during kickstart installation
+        # no need to tell users how to switch to text mode
+        # if already in text mode
+        if opts.display_mode == 'g':
+            print(text_mode_note)
+        print(separate_attachements_note)
 
     from pyanaconda.anaconda import Anaconda
     anaconda = Anaconda()
@@ -804,79 +1059,68 @@ if __name__ == "__main__":
     # Default is to prompt to mount the installed system.
     anaconda.rescue_mount = not opts.rescue_nomount
 
-    if opts.dlabel: #autodetected driverdisc in use
-        flags.dlabel = True
-
-    if opts.noipv4:
-        flags.useIPv4 = False
-
-    if opts.noipv6:
-        flags.useIPv6 = False
-
-    if opts.proxy:
-        anaconda.proxy = opts.proxy
-
-    if opts.updateSrc:
-        anaconda.updateSrc = opts.updateSrc
-
-    if opts.method:
-        anaconda.methodstr = opts.method
-
-    if opts.stage2:
-        anaconda.stage2 = opts.stage2
-
-    if opts.noverifyssl:
-        flags.noverifyssl = True
+    # assign the other anaconda variables from options
+    anaconda.proxy = opts.proxy
+    anaconda.updateSrc = opts.updateSrc
+    anaconda.methodstr = opts.method
+    anaconda.stage2 = opts.stage2
+    flags.rescue_mode = opts.rescue
 
     if opts.liveinst:
+        from pyanaconda.screensaver import inhibit_screensaver
+        from pyanaconda import safe_dbus
+
         flags.livecdInstall = True
 
-    if opts.module:
-        for mod in opts.module:
-            anaconda.extraModules.append(mod.split(":"))
-
-    if opts.ibft:
-        flags.ibft = 1
-
-    if opts.iscsi:
-        flags.iscsi = 1
-
-    if opts.targetArch:
-        flags.targetarch = opts.targetArch
-
-    if opts.armPlatform:
-        flags.armPlatform = opts.armPlatform
-
-    if opts.extlinux:
-        flags.extlinux = opts.extlinux
-
-    if opts.dnf:
-        flags.dnf = opts.dnf
+        try:
+            anaconda.dbus_session_connection = safe_dbus.get_new_session_connection()
+        except safe_dbus.DBusCallError as e:
+            log.info("Unable to connect to DBus session bus: %s", e)
+        else:
+            anaconda.dbus_inhibit_id = inhibit_screensaver(anaconda.dbus_session_connection)
+    elif "LIVECMD" in os.environ:
+        log.warning("Running via liveinst, but not setting flags.livecdInstall - this is for testing only")
 
     # set flags
+    flags.noverifyssl = opts.noverifyssl
+    flags.armPlatform = opts.armPlatform
+    flags.extlinux = opts.extlinux
+    flags.nombr = opts.nombr
+    flags.dnf = opts.dnf
+    flags.mpathFriendlyNames = opts.mpathfriendlynames
+    flags.debug = opts.debug
+    flags.askmethod = opts.askmethod
     flags.dmraid = opts.dmraid
     flags.mpath = opts.mpath
+    flags.ibft = opts.ibft
     flags.selinux = opts.selinux
     flags.eject = opts.eject
 
+    # Switch to tty1 on exception in case something goes wrong during X start.
+    # This way if, for example, metacity doesn't start, we switch back to a
+    # text console with a traceback instead of being left looking at a blank
+    # screen. python-meh will replace this excepthook with its own handler
+    # once it gets going.
+    if not flags.imageInstall and not flags.livecdInstall \
+       and not flags.dirInstall:
+        def _earlyExceptionHandler(ty, value, traceback):
+            iutil.vtActivate(1)
+            return sys.__excepthook__(ty, value, traceback)
+
+        sys.excepthook = _earlyExceptionHandler
+
     if can_touch_runtime_system("start audit daemon"):
         startAuditDaemon()
 
     # setup links required for all install types
-    for i in ( "services", "protocols", "nsswitch.conf", "joe", "selinux",
-               "mke2fs.conf" ):
+    for i in ("services", "protocols", "nsswitch.conf", "joe", "selinux",
+              "mke2fs.conf"):
         try:
             if os.path.exists("/mnt/runtime/etc/" + i):
-                os.symlink ("../mnt/runtime/etc/" + i, "/etc/" + i)
+                os.symlink("../mnt/runtime/etc/" + i, "/etc/" + i)
         except OSError:
             pass
 
-    if opts.debug:
-        flags.debug = True
-
-    if opts.rescue:
-        anaconda.rescue = True
-
     log.info("anaconda called with cmdline = %s", sys.argv)
     log.info("Default encoding = %s ", sys.getdefaultencoding())
 
@@ -889,7 +1133,7 @@ if __name__ == "__main__":
     # execute) that now.  Otherwise, load in defaults from kickstart files
     # shipped with the installation media.
     ksdata = None
-    if opts.ksfile:
+    if opts.ksfile and not opts.liveinst:
         flags.automatedInstall = True
         flags.eject = False
         ksFiles = [opts.ksfile]
@@ -902,6 +1146,7 @@ if __name__ == "__main__":
             continue
 
         kickstart.preScriptPass(ks)
+        log.info("Parsing kickstart: " + ks)
         ksdata = kickstart.parseKickstart(ks)
 
         # Only load the first defaults file we find.
@@ -910,8 +1155,12 @@ if __name__ == "__main__":
     if not ksdata:
         ksdata = kickstart.AnacondaKSHandler(addon_paths["ks"])
 
+    # Pick up any changes from interactive-defaults.ks that would
+    # otherwise be covered by the dracut KS parser.
+    if ksdata.bootloader.extlinux:
+        flags.extlinux = True
     if ksdata.rescue.rescue:
-        anaconda.rescue = True
+        flags.rescue_mode = True
 
     # Some kickstart commands must be executed immediately, as they affect
     # how anaconda operates.
@@ -925,8 +1174,12 @@ if __name__ == "__main__":
         if not ksdata.keyboard.keyboard:
             ksdata.keyboard.keyboard = opts.keymap
 
-    if ksdata.keyboard.keyboard and can_touch_runtime_system("activate keyboard"):
-        keyboard.activate_keyboard(ksdata.keyboard)
+    if ksdata.keyboard.keyboard:
+        if can_touch_runtime_system("activate keyboard"):
+            keyboard.activate_keyboard(ksdata.keyboard)
+        else:
+            # at least make sure we have all the values
+            keyboard.populate_missing_items(ksdata.keyboard)
 
     # Some post-install parts of anaconda are implemented as kickstart
     # scripts.  Add those to the ksdata now.
@@ -935,6 +1188,24 @@ if __name__ == "__main__":
     # cmdline flags override kickstart settings
     if anaconda.proxy:
         ksdata.method.proxy = anaconda.proxy
+
+        # Setup proxy environmental variables so that pre/post scripts use it
+        # as well as libreport
+        try:
+            proxy = ProxyString(anaconda.proxy)
+        except ProxyStringError as e:
+            log.info("Failed to parse proxy \"%s\": %s", anaconda.proxy, e)
+        else:
+            # Set environmental variables to be used by pre/post scripts
+            os.environ["PROXY"] = proxy.noauth_url
+            os.environ["PROXY_USER"] = proxy.username or ""
+            os.environ["PROXY_PASSWORD"] = proxy.password or ""
+
+            # Variables used by curl, libreport, etc.
+            os.environ["http_proxy"] = proxy.url
+            os.environ["ftp_proxy"] = proxy.url
+            os.environ["HTTPS_PROXY"] = proxy.url
+
     if flags.noverifyssl:
         ksdata.method.noverifyssl = flags.noverifyssl
     if opts.multiLib:
@@ -966,7 +1237,8 @@ if __name__ == "__main__":
             ksdata.method.partition = device
             ksdata.method.dir = path
         elif anaconda.methodstr.startswith("http") or \
-             anaconda.methodstr.startswith("ftp"):
+             anaconda.methodstr.startswith("ftp") or \
+             anaconda.methodstr.startswith("file"):
             ksdata.method.method = "url"
             ksdata.method.url = anaconda.methodstr
             # installation source specified by bootoption
@@ -984,6 +1256,10 @@ if __name__ == "__main__":
         else:
             log.error("Unknown method: %s", anaconda.methodstr)
 
+    # Override the selinux state from kickstart if set on the command line
+    if flags.selinux != constants.SELINUX_DEFAULT:
+        ksdata.selinux.selinux = flags.selinux
+
     from pyanaconda import localization
     # Set the language before loading an interface, when it may be too late.
 
@@ -1018,7 +1294,17 @@ if __name__ == "__main__":
     # now start the interface
     setupDisplay(anaconda, opts, addon_paths)
 
-    if anaconda.rescue:
+    # we now know in which mode we are going to run so store the information
+    from pykickstart.constants import DISPLAY_MODE_GRAPHICAL, DISPLAY_MODE_CMDLINE, DISPLAY_MODE_TEXT
+    mode_char_to_const = {'g': DISPLAY_MODE_GRAPHICAL, 't': DISPLAY_MODE_TEXT, 'c': DISPLAY_MODE_CMDLINE}
+    ksdata.displaymode.displayMode = mode_char_to_const[anaconda.displayMode]
+
+    # if we're in text mode, the resulting system should be too
+    # ...unless the kickstart specified otherwise
+    if anaconda.displayMode != 'g' and not anaconda.ksdata.xconfig.startX:
+        anaconda.ksdata.skipx.skipx = True
+
+    if flags.rescue_mode:
         from pyanaconda import rescue
         anaconda.intf = rescue.RescueInterface()
 
@@ -1026,41 +1312,39 @@ if __name__ == "__main__":
     if anaconda.displayMode == 'c':
         flags.ksprompt = False
 
+    from pyanaconda.anaconda_argparse import name_path_pairs
+
     image_count = 0
-    for image in opts.images:
-        image_spec = image.rsplit(":", 1)
-        path = image_spec[0]
-        if len(image_spec) == 2 and image_spec[1].strip():
-            imageName = image_spec[1].strip()
-        else:
-            imageName = os.path.splitext(os.path.basename(path))[0]
-
-        if "/" in imageName or imageName in anaconda.storage.config.diskImages.keys():
-            imageName = "diskimg%d" % image_count
-
-        log.info("naming disk image '%s' '%s'", path, imageName)
-        anaconda.storage.config.diskImages[imageName] = path
-        image_count += 1
-        flags.imageInstall = True
+    try:
+        for (name, path) in name_path_pairs(opts.images):
+            log.info("naming disk image '%s' '%s'", path, name)
+            anaconda.storage.config.diskImages[name] = path
+            image_count += 1
+            flags.imageInstall = True
+    except ValueError as e:
+        stdoutLog.error("error specifying image file: %s", e)
+        sys.exit(1)
 
     if image_count:
         anaconda.storage.setupDiskImages()
 
-    from pyanaconda import exception
-    # comment out the next line to make exceptions non-fatal
-    anaconda.mehConfig = exception.initExceptionHandling(anaconda)
+    # only install interactive exception handler in interactive modes
+    if ksdata.displaymode.displayMode != DISPLAY_MODE_CMDLINE or flags.debug:
+        from pyanaconda import exception
+        anaconda.mehConfig = exception.initExceptionHandling(anaconda)
 
     # add our own additional signal handlers
     signal.signal(signal.SIGUSR1, lambda signum, frame:
-                                         exception.test_exception_handling())
+                  exception.test_exception_handling())
     signal.signal(signal.SIGUSR2, lambda signum, frame: anaconda.dumpState())
+    atexit.register(exitHandler, ksdata.reboot, anaconda.storage)
 
     from blivet import storageInitialize
-    from pyanaconda.packaging import payloadInitialize
+    from pyanaconda.packaging import payloadMgr
     from pyanaconda.network import networkInitialize, wait_for_connecting_NM_thread
     from pyanaconda.timezone import time_initialize
 
-    if anaconda.rescue:
+    if flags.rescue_mode:
         rescue.doRescue(anaconda.intf, anaconda.rescue_mount, ksdata)
     else:
         cleanPStore()
@@ -1073,13 +1357,15 @@ if __name__ == "__main__":
                                      args=(ksdata.timezone, anaconda.storage, anaconda.bootloader)))
 
     threadMgr.add(AnacondaThread(name=constants.THREAD_WAIT_FOR_CONNECTING_NM, target=wait_for_connecting_NM_thread, args=(ksdata,)))
-    threadMgr.add(AnacondaThread(name=constants.THREAD_PAYLOAD, target=payloadInitialize, args=(anaconda.storage, ksdata, anaconda.payload)))
 
-    atexit.register(exitHandler, ksdata.reboot, anaconda.storage)
+    # Fallback to default for interactive or for a kickstart with no installation method.
+    fallback = not (flags.automatedInstall and ksdata.method.method)
+    payloadMgr.restartThread(anaconda.storage, ksdata, anaconda.payload, anaconda.instClass,
+            fallback=fallback)
 
     # check if geolocation should be enabled for this type of installation
     use_geolocation = True
-    if flags.imageInstall or flags.dirInstall:
+    if flags.imageInstall or flags.dirInstall or flags.automatedInstall:
         use_geolocation = False
     # and also check if it was not disabled by boot option
     else:
@@ -1088,7 +1374,6 @@ if __name__ == "__main__":
         # and other values or geoloc not being present as True
         use_geolocation = flags.cmdline.getbool('geoloc', True)
 
-
     if use_geolocation:
         provider_id = constants.GEOLOC_DEFAULT_PROVIDER
         # check if a provider was specified by an option
diff --git a/anaconda/anaconda.spec b/anaconda/anaconda.spec
index c3c81a9..09a329f 100644
--- a/anaconda/anaconda.spec
+++ b/anaconda/anaconda.spec
@@ -1,8 +1,8 @@
-%define livearches %{ix86} x86_64 ppc ppc64
+%define livearches %{ix86} x86_64 ppc ppc64 ppc64le
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 20.25.16
+Version: 21.48.21
 Release: 12%{?dist}
 Epoch:   1000
 License: GPLv2+
@@ -24,16 +24,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
-%define gettextver 0.18.1
-%define gconfversion 2.28.1
+
+# Also update in AM_GNU_GETTEXT_VERSION in configure.ac
+%define gettextver 0.18.3
 %define intltoolver 0.31.2-3
-%define libnlver 1.0
-%define pykickstartver 1.99.46
+%define pykickstartver 1.99.63
 %define yumver 3.4.3-91
+%define dnfver 0.4.18
 %define partedver 1.8.1
 %define pypartedver 2.5-2
 %define pythonpyblockver 0.45
-%define nmver 1:0.7.1-3.git20090414
+%define nmver 0.9.9.0-10.git20130906
 %define dbusver 1.2.3
 %define yumutilsver 1.1.11-3
 %define mehver 0.23-1
@@ -48,21 +49,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define rpmver 4.10.0
 %define libarchivever 3.0.4
 %define langtablever 0.0.18-1
+%define libxklavierver 5.4
+%define libtimezonemapver 0.4.1-2
 
 BuildRequires: audit-libs-devel
 BuildRequires: gettext >= %{gettextver}
 BuildRequires: gtk3-devel
 BuildRequires: gtk-doc
+BuildRequires: gtk3-devel-docs
+BuildRequires: glib2-doc
 BuildRequires: gobject-introspection-devel
 BuildRequires: glade-devel
 BuildRequires: pygobject3
 BuildRequires: intltool >= %{intltoolver}
-BuildRequires: libX11-devel
-BuildRequires: libXt-devel
-BuildRequires: libXxf86misc-devel
 BuildRequires: libgnomekbd-devel
-BuildRequires: libnl-devel >= %{libnlver}
-BuildRequires: libxklavier-devel
+BuildRequires: libxklavier-devel >= %{libxklavierver}
 BuildRequires: pango-devel
 BuildRequires: pykickstart >= %{pykickstartver}
 %if ! 0%{?rhel}
@@ -85,15 +86,23 @@ BuildRequires: desktop-file-utils
 %ifarch s390 s390x
 BuildRequires: s390utils-devel
 %endif
+BuildRequires: libtimezonemap-devel >= %{libtimezonemapver}
 
-Requires: anaconda-widgets = %{epoch}:%{version}-%{release}
-Requires: dnf >= 0.4.8
-Requires: python-blivet >= 0.23.6
-Requires: gnome-icon-theme-symbolic
+Requires: anaconda-core = %{epoch}:%{version}-%{release}
+Requires: anaconda-gui = %{epoch}:%{version}-%{release}
+Requires: anaconda-tui = %{epoch}:%{version}-%{release}
+
+%description
+The anaconda package is a metapackage for the Anaconda installer.
+
+%package core
+Summary: Core of the Anaconda installer
+Requires: dnf >= %{dnfver}
+Requires: python-blivet >= 1:0.61.9
 Requires: python-meh >= %{mehver}
 Requires: libreport-anaconda >= 2.0.21-1
 Requires: libselinux-python
-Requires: rpm-python >= %{rpmpythonver}
+Requires: rpm-python >= %{rpmver}
 Requires: parted >= %{partedver}
 Requires: pyparted >= %{pypartedver}
 Requires: yum >= %{yumver}
@@ -110,31 +119,26 @@ Requires: dbus-python
 Requires: python-pwquality
 Requires: python-IPy
 Requires: python-nss
-Requires: tigervnc-server-minimal
 Requires: pytz
-Requires: libxklavier
-Requires: libgnomekbd
 Requires: realmd
 Requires: teamd
 %ifarch %livearches
 Requires: usermode
-Requires: zenity
 %endif
-Requires: GConf2 >= %{gconfversion}
 %ifarch s390 s390x
 Requires: openssh
 %endif
 Requires: isomd5sum >= %{isomd5sum}
 Requires: yum-utils >= %{yumutilsver}
+Requires: createrepo_c
 Requires: NetworkManager >= %{nmver}
-Requires: nm-connection-editor
 Requires: dhclient
-Requires: anaconda-yum-plugins
-Requires: libselinux-python >= %{libselinuxver}
+Requires: libselinux-python
 Requires: kbd
 Requires: chrony
 Requires: python-ntplib
 Requires: rsync
+Requires: systemd
 %ifarch %{ix86} x86_64
 Requires: fcoe-utils >= %{fcoeutilsver}
 %endif
@@ -145,16 +149,53 @@ Requires: dmidecode
 Requires: hfsplus-tools
 %endif
 %endif
+
+Requires: python-coverage
+
+# required because of the rescue mode and VNC question
+Requires: anaconda-tui = %{epoch}:%{version}-%{release}
+
 Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
 Obsoletes: booty <= 0.107-1
 
-%description
-The anaconda package contains the program which was used to install your
+%description core
+The anaconda-core package contains the program which was used to install your
 system.
 
+%package gui
+Summary: Graphical user interface for the Anaconda installer
+Requires: anaconda-core = %{epoch}:%{version}-%{release}
+Requires: anaconda-widgets = %{epoch}:%{version}-%{release}
+Requires: python-meh-gui >= %{mehver}
+Requires: adwaita-icon-theme
+Requires: system-logos
+Requires: tigervnc-server-minimal
+Requires: libxklavier >= %{libxklavierver}
+Requires: libgnomekbd
+Requires: libtimezonemap >= %{libtimezonemapver}
+Requires: nm-connection-editor
+%ifarch %livearches
+Requires: zenity
+%endif
+Requires: keybinder3
+%ifnarch s390 s390x
+Requires: NetworkManager-wifi
+%endif
+Requires: yelp
+
+%description gui
+This package contains graphical user interface for the Anaconda installer.
+
+%package tui
+Summary: Textual user interface for the Anaconda installer
+Requires: anaconda-core = %{epoch}:%{version}-%{release}
+
+%description tui
+This package contains textual user interface for the Anaconda installer.
+
 %package widgets
 Summary: A set of custom GTK+ widgets for use with anaconda
 Group: System Environment/Libraries
@@ -168,6 +209,7 @@ This package contains a set of custom GTK+ widgets used by the anaconda installe
 Summary: Development files for anaconda-widgets
 Group: Development/Libraries
 Requires: glade
+Requires: %{name}-widgets%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description widgets-devel
 This package contains libraries and header files needed for writing the anaconda
@@ -205,12 +247,15 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 
 %ifarch %livearches
 desktop-file-install ---dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
-%else
-%{__rm} -rf %{buildroot}%{_bindir}/liveinst %{buildroot}%{_sbindir}/liveinst
 %endif
+# NOTE: If you see "error: Installed (but unpackaged) file(s) found" that include liveinst files,
+#       check the IS_LIVEINST_ARCH in configure.ac to make sure your architecture is properly defined
 
 %find_lang %{name}
 
+%post widgets -p /sbin/ldconfig
+%postun widgets -p /sbin/ldconfig
+
 
 %ifarch %livearches
 %post
@@ -222,7 +267,10 @@ update-desktop-database &> /dev/null || :
 update-desktop-database &> /dev/null || :
 %endif
 
-%files -f %{name}.lang
+%files
+%doc COPYING
+
+%files core -f %{name}.lang
 %doc COPYING
 %{_unitdir}/*
 %{_prefix}/lib/systemd/system-generators/*
@@ -230,8 +278,14 @@ update-desktop-database &> /dev/null || :
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
 %{_datadir}/anaconda
+%{_datadir}/anaconda/help/*
+%exclude %{_datadir}/anaconda/tzmapdata
 %{_prefix}/libexec/anaconda
 %{_libdir}/python*/site-packages/pyanaconda/*
+%exclude %{_libdir}/python*/site-packages/pyanaconda/rescue.py*
+%exclude %{_libdir}/python*/site-packages/pyanaconda/text.py*
+%exclude %{_libdir}/python*/site-packages/pyanaconda/ui/gui/*
+%exclude %{_libdir}/python*/site-packages/pyanaconda/ui/tui/*
 %{_bindir}/analog
 %{_bindir}/anaconda-cleanup
 %ifarch %livearches
@@ -241,14 +295,20 @@ update-desktop-database &> /dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/X11/xinit/xinitrc.d/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*
 %endif
 
+%files gui
+%{_libdir}/python*/site-packages/pyanaconda/ui/gui/*
+
+%files tui
+%{_libdir}/python*/site-packages/pyanaconda/rescue.py
+%{_libdir}/python*/site-packages/pyanaconda/text.py
+%{_libdir}/python*/site-packages/pyanaconda/ui/tui/*
+
 %files widgets
 %{_libdir}/libAnacondaWidgets.so.*
 %{_libdir}/girepository*/AnacondaWidgets*typelib
 %{_libdir}/python*/site-packages/gi/overrides/*
-%{_datadir}/anaconda/tzmapdata/*
 
 %files widgets-devel
 %{_libdir}/libAnacondaWidgets.so
@@ -262,72 +322,1374 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
-* Wed Jan 15 2014 Brian C. Lane <bcl@redhat.com> - 20.25.16-1
-- Install bootloader to loop device in disk image installations. (#955202)
+* Tue Dec 02 2014 Vratislav Podzimek <vpodzime@redhat.com> - 21.48.21-1
+- Revert "Make Python's default encoding detection work on Live installations
+  (#1169019)" (awilliam)
+
+* Mon Dec 01 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.20-1
+- Revert "Search for a valid stage1 device on disks with stage1 mount points
+  (#1168118)" (sbueno+anaconda)
+- Make Python's default encoding detection work on Live installations
+  (#1169019) (vpodzime)
+- Force translation files download instead of skipping them (#1169023)
+  (vpodzime)
+
+* Fri Nov 28 2014 Vratislav Podzimek <vpodzime@redhat.com> - 21.48.19-1
+- Search for a valid stage1 device on disks with stage1 mount points (#1168118)
+  (awilliam)
+
+* Thu Nov 27 2014 Vratislav Podzimek <vpodzime@redhat.com> - 21.48.18-1
+- Tell curl it should follow redirects when fetching updates.img (#1168561)
+  (vpodzime)
+- Snapshot free space after clearpart for swap suggestion (#1167965) (vpodzime)
+
+* Wed Nov 26 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.17-1
+- Make sure storage info bar is displayed (#1166730) (bcl)
+- Fix SELINUX_DEFAULT import (#1167047) (bcl)
+- Fix noselinux cmdline default (#1167047) (bcl)
+
+* Thu Nov 20 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.16-1
+- Support high contrast mode in fedora-welcome (#1160499) (dshea)
+
+* Tue Nov 18 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.15-1
+- do not delete liveimg --url=file:/// file (gczarcinski)
+- Provide useful hints on TTY1 during the installation (mkolman)
+- Fix typo from commit 9b3259874. (#1120964) (dlehman)
+- Remove the old custom partitioning help dialog (mkolman)
+- Check if we read something when emptying stdin queue (vpodzime)
+- Require min entropy for 'part --encrypted' devices (#1162695) (vpodzime)
+- Don't rely on terminal attributes being configurable (#1162702) (vpodzime)
+- Disable payloads that failed to setup (#1162732) (dshea)
+- Don't change langpacks config of installer environment (#1066017) (rvykydal)
+
+* Tue Nov 11 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.14-1
+- Add support for doing a liveimg kickstart with local file (#1140358) (bcl)
+- Add a placeholder for a product-specific logo (dshea)
+- Load a stylesheet from product.img (dshea)
+- Fix make distcheck (mkolman)
+- Include help content in the Anaconda tarball (mkolman)
+- Fix typo causing traceback when NTP is turned ON/OFF (vpodzime)
+- Unpack the callback data given to us by blivet (vpodzime)
+- Add timeout to callbacks waiting for enough entropy (#1073679) (vpodzime)
+- Prevent tb on s390x when de-selecting a DASD and doing custom part.
+  (sbueno+anaconda)
+- Revert "Revert productName repo name change (#1128474)" (bcl)
+- Update the background image paths used in Fedora. (dshea)
+- dracut/save-initramfs.sh: don't save /tmp (wwoods)
+- Add a pylint module to detect uses of interruptible system calls. (dshea)
+- Wrap interruptible system calls in a loop (#1160041) (dshea)
+- Warn users about liveinst usage of --updates (#1153550) (bcl)
+- Catch EOFError in raw_input (#1158841) (bcl)
+- Ensure we are specifying sensible target sizes for resize. (#1120964)
+  (dlehman)
+- Set the autopart fstype for boot too (#1112697) (bcl)
+- Unconditionally clear the process handle when nm-c-e exits (#1132645) (dshea)
+- Make anaconda more scrollable (#1135024) (dshea)
+- Lightly rearrange the nav_area (dshea)
+- Do not install interactive exception handler in cmdline mode (#1155979)
+  (vpodzime)
+- Wait until all spokes are setup before updating continue button (bcl)
+- Allow adding prepboot to a blank disk in custom (#1155660) (bcl)
+- Remove unused imports (vpodzime)
+
+* Tue Oct 28 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.13-1
+- Fix handling of md fwraid names in kickstart bootloader command. (#1156354)
+  (dlehman)
+- Fix switching environments when no environment is selected (#1155756) (dshea)
+- Use an empty string for no root password instead of None (#1155576) (dshea)
+- Just preserve the %%addon header args if an addon is missing (#1155026)
+  (vpodzime)
+
+* Thu Oct 23 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.12-1
+- Fix a spelling error (#1153672) (dshea)
+- Update checkSizes to work in terms of Size objects (#1129629). (clumens)
+
+* Mon Oct 20 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.11-1
+- Don't panic prematurely on a missing size (#1154190) (amulhern)
+- Log when using updates from /tmp/updates/ (bcl)
+- Fix # handling in SimpleConfigFile (#1045687) (bcl)
+
+* Wed Oct 15 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.10-1
+- Change our docs that are close to ReST to proper ReST (vpodzime)
+- Run restorecon on /etc/hostname (#1133368) (bcl)
+- Add authconfig and firewalld packages when used in ks (#1147687) (bcl)
+- Allow kickstart with no method (#972265) (bcl)
+- Fix a typo from 73d3a8e5. (sbueno+anaconda)
+- Respect both ways how to disable bootloader installation (vpodzime)
+- Don't care about crash args in bootloader (#1116323) (vpodzime)
+- Add nombr to anaconda to suppress updating MBR (#886502) (gczarcinski)
+- Use translated versions of the AM/PM strings consistently (vpodzime)
+- Import GUI-specific stuff only when running GUI in entropy handling
+  (vpodzime)
+- Always store the information about display mode in ksdata (vpodzime)
+- Make the date format locale-dependent in our GUI (#1044233) (vpodzime)
+- A function for resolving date format and order (vpodzime)
+- Reorganize the right side of the Custom spoke (#1094856) (vpodzime)
+- Move _verifyLUKSDevicesHaveKey to Anaconda's codebase (vpodzime)
+- Add support for thin pool profile specification in kickstart (vpodzime)
+- Fix file name of the entropy dialog in POTFILES.in (vpodzime)
+- Require minimum random data entropy when creating LUKS (#1073679) (vpodzime)
+- Give blivet callbacks for reporting partitioning progress (vpodzime)
+- Split localed's converted layouts and variants (#1073825) (vpodzime)
+- Create free space snapshot before doing custom->autopart (vpodzime)
+- Specify thin pool metadata/chunk size only if given by user (#1140635)
+  (vpodzime)
+- Distribute the right docs files (vpodzime)
+- Don't automatically select environments for kickstart installs (#1018226)
+  (dshea)
+- Initialize the GUI lock in a way that doesn't break the API (dshea)
+- Don't check enabledPlugins if plugins are not yet enabled (#1142544) (dshea)
+- Really fix an enlightbox call. (dshea)
+- Don't strip accents from the user-inputted keyboard string (dshea)
+- Convert strings to unicode in have_word_match (#1146581) (dshea)
+- Switch to using the new help content path (#1072033) (mkolman)
+- Fix a race between checking for Gtk.main_level and running Gtk.main (dshea)
+- Allow recursive lightbox calls (#1147337) (dshea)
+- Disable the ntp service with --nontp (#1135768) (dshea)
+- Ignore partition start if there is a biosboot partition (#1044849) (bcl)
+- Require a larger /boot (#1129629). (clumens)
+- Remove duplicates when adding new devices (#887526) (bcl)
+
+* Wed Oct 08 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.9-1
+- Bump blivet version requires for all the DASD changes in 0.61.4.
+  (sbueno+anaconda)
+- We now need to specify an epoch for the python-blivet version requires.
+  (clumens)
+- Fix autotools rules to properly include help placeholders (#1072033)
+  (mkolman)
+- Modify nm to return defaults when no dbus is available (bcl)
+- Skip networkInitialize for image and dir installations (bcl)
+- Ignore safe_dbus errors in keyboard setup (bcl)
+- Skip syslog for dirinstall (bcl)
+- s390x: show dialog if kernel cmdline in zipl.conf is too long.
+  (sbueno+anaconda)
+- Really exit when "Exit installer" in the error dialog is clicked (vpodzime)
+- Don't allow /boot on lvm on s390x. (sbueno+anaconda)
+- Add the new langsupport.py TUI spoke to POTFILES.in. (clumens)
+- Remove the now-unused imports of storageInitialize. (clumens)
+- Add support for language selection in text mode. (sbueno+anaconda)
+- Don't force a user to return to the storage spoke after dasdfmt
+  (sbueno+anaconda)
+- Don't run storageInitialize after dasdfmt (sbueno+anaconda)
+- s390x: Apply disk selection before dasdfmt to preserve data.
+  (sbueno+anaconda)
+- Don't show the Add DASD button unless on s390x. (sbueno+anaconda)
+- Don't show the Add DASD button unless on s390x. (sbueno+anaconda)
+- Preserve network args on s390x. (sbueno+anaconda)
+- Deprecate RUNKS cmdline option. (sbueno+anaconda)
+- Re-order the tz's in text mode to mirror the graphical order.
+  (sbueno+anaconda)
+- Fix an issue with bad NFS info specified in source spoke. (sbueno+anaconda)
+- Warn if software selection size exceeds available space. (sbueno+anaconda)
+- Fix q for quit issue in text mode (#997405) (sbueno+anaconda)
+- Change the accelerator key for Add DASD label. (sbueno+anaconda)
+- Add dialog box for adding DASDs. (sbueno+anaconda)
+- Add a button for adding an ECKD DASD. (sbueno+anaconda)
+- Change a confusing string in TUI NFS configuration screen. (#1057690)
+  (sbueno+anaconda)
+- NM-wifi is missing on s390(x) (dan)
+
+* Wed Oct 01 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.8-1
+- Show help also when alt+F1 is pressed (mkolman)
+- Support display of the custom mnemonics on the help button (mkolman)
+- Activate the built-in help when F1 is pressed (mkolman)
+- Specify help file names for hubs and spokes (mkolman)
+- Add a help button to every Anaconda screen (mkolman)
+- Don't attempt terminal size detection on the s390 (#1145065) (mkolman)
+- Fix Welcome spoke not showing up during kickstart installation (#1147943)
+  (mkolman)
+- Clear the list of watched PIDs before exiting. (#1146708) (dshea)
+- Avoid the possibility of size variables being unset (#1146585) (dshea)
+- Adapt to corrected interpetation of logvol --percent. (#1146156) (dlehman)
+- Handle cancellation of new container creation. (dlehman)
+- Reflect previous custom/autopart selection in the storage spoke. (#1144520)
+  (dlehman)
+- Clear out custom storage ksdata after first attempt to apply it. (#1144560)
+  (dlehman)
+- Pass size as Size when adjusting container after device removal. (#1141707)
+  (dlehman)
+- Handle 0's returned by Gdk (dshea)
+- When running on HiDPI monitors, scale anaconda by a factor of 2 (dshea)
+- Highlight languages in langsupport that contain selected locales (dshea)
+- Add a wrapper function for GtkTreeViewColumn.set_cell_data_func (dshea)
+- Clear the kickstart password if cleared by the user (#1133185) (dshea)
+- Remove inactive languages from LINGUAS. (dshea)
+- Use suggested-action on more buttons (#1131254) (dshea)
+- Filter empty comps groups from both specific and generic lists (dshea)
+- Use one thread for payload setup. (dshea)
+
+* Wed Sep 17 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.7-1
+- Set flags.rescue_mode not anaconda.rescue (#1101341) (amulhern)
+
+* Thu Sep 11 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.6-1
+- Update tx config (sbueno+anaconda)
+- Use only the digits from productVersion (bcl)
+
+* Tue Sep 09 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.5-1
+- Revert productName repo name change (#1128474) (bcl)
+- Do not try to disable no firstboot services (#1139621) (vpodzime)
+- Let finding install classes be more flexible for Fedora (#1138820). (clumens)
+
+* Thu Sep 04 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.4-1
+- Use first part of Product for UEFI entry (#1128474) (bcl)
+- Use first part of Product as repo name (#1128474) (bcl)
+- makeupdates: Report git diff errors (bcl)
+
+* Wed Aug 27 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.3-1
+- Prevent crashes due to accessing X server from multiple threads (#1134507)
+  (vpodzime)
+- Remove anaconda_make_pixbuf (dshea)
+- Require anaconda-widgets from anaconda-widgets-devel (dshea)
+- Run /sbin/ldconfig when installing or uninstalling anaconda-widgets (dshea)
+- Remove the shebang from anaconda.py (dshea)
+- Exclude the compiled text and rescue files from anaconda-core (dshea)
+- Update our copy of the GPL (dshea)
+- Rearrange the entry, example and tip on Advanced User dialog (vpodzime)
+- Write storage after liveimg install (#1080396) (bcl)
+- Add some sanity checking to live payload (vpodzime)
+- Use blivet's getFreeSpace for limitting automatic swap size (vpodzime)
+- Ask users for enough space right at the first time (#876916) (vpodzime)
+- Don't require user creation when root is locked (#1030626) (bcl)
+
+* Fri Aug 01 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.2-1
+- Mark zRAM devices as protected and ignore them (vpodzime)
+- Make storage sanity check aware of base RAM requirements (#1123466)
+  (vpodzime)
+- Move sanityCheck code to anaconda's codebase (vpodzime)
+- Do not multiply/divide RAM sizes by 1024 back and forth (vpodzime)
+- Raise exception if reading lines from a killed process (vpodzime)
+- Use zRAM swap up to 2 GB of RAM (vpodzime)
+- RAM requirements depend on squashfs.img's origin (vpodzime)
+
+* Wed Jul 23 2014 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.1-1
+
+* Wed Jul 16 2014 Brian C. Lane <bcl@redhat.com> - 21.48-1
+- Fix the custom accelerators in custom partitioning (#1118999) (dshea)
+- Revert "Reset dnf package sack" (bcl)
+- Ignore the home directory setting if no change was requested (#1119900)
+  (dshea)
+- Set an upper limit on uids and gids. (dshea)
+- Remove the "Create a home directory" checkbox (dshea)
+- Fix a typo: inital -> initial (mkolman)
+- Don't create the configured.ini file (#1119166) (mkolman)
+- zRAM swap for Anaconda (vpodzime)
+- Split kickstart arg handling (bcl)
+- Update icon names used within python code. (dshea)
+- Add a check for whether icons used in glade files are valid (dshea)
+- Load icons by name instead of stock-id. (dshea)
+- Remove extra list() call with no effect (vpodzime)
+- Add NetworkManager-wifi dependency for the GUI subpackage (#1111417)
+  (mkolman)
+- Python's octals changed; mount's didn't. (pjones)
+- Add a basic test for ostree-based installs. (clumens)
+- Print out exceptions at log level critical. (clumens)
+- Rename environment variables in run_gui_tests.sh. (clumens)
+- Rename gui/runtest.sh to fit in with the other test names. (clumens)
+- Write the grub config even on errors (#1114774) (bcl)
+
+* Fri Jul 11 2014 Brian C. Lane <bcl@redhat.com> - 21.47-1
+- Fix references to requiredPackages (bcl)
+- Drop anaconda. prefix from copied logs (bcl)
+- dnf should put its logs in /tmp/ (bcl)
+- Make sure the software listboxes are shown (bcl)
+- dnf should report that it supports Closest Mirror (bcl)
+- Do not prefer /tmp for dnf downloads (bcl)
+- Reset dnf package sack (bcl)
+- Fix dnf base repo setup to fall back to default gracefully (bcl)
+- Move addDriverRepo into PackagePayload class (bcl)
+- Rename some dnf items to match yum (bcl)
+- rpmostreepayload: Drop selinux-ensure-labeled call (walters)
+- Run anaconda in fullscreen whenever possible. (dshea)
+- Correct the constant used with gtk_widget_set_state_flags (dshea)
+- Restore some CSS rules from the pre-3.13 Adwaita theme. (dshea)
+- Adapt to changes in blivet.udev interface. (amulhern)
+- Bump blivet version to pick up blivet.udev interface changes. (amulhern)
+- Use the enlightbox context manager for the add network device dialog
+  (mkolman)
+- DNFPayload: do not add group 'core' twice. (ales)
+- Remove the window property from UIObject. (dshea)
+- Unravel the Hub and Spoke classes. (dshea)
+- Fix --kickstart option (bcl)
+- Bump up the required pykickstart version (vpodzime)
+- Use GtkRevealer for widget hiding in storage spoke (mkolman)
+- rpmostreepayload: create /var/spool/mail required when adding user (rvykydal)
+- rpmostreepayload: Don't recreateInitrds for this payload (walters)
+- Don't use geolocation when installing with kickstart (mkolman)
+
+* Wed Jul 02 2014 Brian C. Lane <bcl@redhat.com> - 21.46-1
+- Ignore an error from pylint incorrectly analyzing types in dbus-python
+  (dshea)
+- Remove the Lightbox widget (dshea)
+- Implement the lightbox in MainWindow (dshea)
+- Added a method to create new GdkPixbufs from in-memory data (dshea)
+- Add a delete-event handler for the main window (dshea)
+- Add a window to manage Anaconda screen transitions. (dshea)
+- Add a class BaseStandalone. (dshea)
+- Increased the version of anaconda-widgets to 3.0 (dshea)
+- Use globs for the anaconda widgets library paths (dshea)
+- Remove the custom accelerators from custom storage. (dshea)
+- Add a couple more deprecation warning ignores (dshea)
+- Use a dict for string substitutions in a /boot/efi message. (clumens)
+- Use the right index for selecting region (#1114234) (vpodzime)
+- Add autopart --fstype support (#1112697) (bcl)
+- Patches to allow /boot/efi to be RAID1 (#788313) (amulhern)
+- Bump blivet version for succeeding commit. (amulhern)
+- Map our log levels to syslog log levels (bcl)
+- makeupdates: Put systemd files under /usr/lib/ (bcl)
+- Make octal literals Python 3 compatible (mkolman)
+- Use the built-in next() function for generators (mkolman)
+- Make reduce function usage Python 3 compatible (mkolman)
+- Use createrepo_c in place of createrepo (mkolman)
+
+* Fri Jun 27 2014 Brian C. Lane <bcl@redhat.com> - 21.45-1
+- Switch to tty1 if we get an exception before meh is setup (dshea)
+- Remove surprises from X startup. (dshea)
+- Import KS_MISSING_IGNORE from pykickstart.constants in DNF payload (mkolman)
+- Import Pykickstart constants directly (mkolman)
+- Switch error exit codes to 1 (bcl)
+- Add help texts for the remaining Anaconda options (mkolman)
+
+* Wed Jun 25 2014 Brian C. Lane <bcl@redhat.com> - 21.44-1
+- Fix storage checker docstring (bcl)
+- Modify --dirinstall to take a path (bcl)
+- Drop ROOT_PATH, add a method to set it (bcl)
+- Call setUpBootLoader in custom autopart (#1086811) (bcl)
+- Remove the noipv6 Anaconda option (mkolman)
+- Remove the -s/--script Anaconda option (mkolman)
+- Make rescue_mode part of flags, hence more publicly available (#1090009)
+  (amulhern)
+- Check host filesystem space for dirinstall (bcl)
+- Remove the viewport from the addon repo tree view (dshea)
+- Add a check for GtkScrollables contained in GtkViewports (dshea)
+- Enable rubber-banding in the disk tree views (dshea)
+- Make the configure mount point dialog taller. (#924182) (dshea)
+- Add the disk TreeViews directly to the scrolled windows (dshea)
+- Opened up custom_storage_helpers.glade and hit Save (dshea)
+- Add help texts for more Anaconda CLI options (mkolman)
+- Remove the targetarch Anaconda option (mkolman)
+- Add anaconda_options.txt to makeupdates (dshea)
+- Allow the location of anaconda_options.txt to be overridden (dshea)
+- Remove an unused import. (dshea)
+- Remove the headless Anaconda option (mkolman)
+
+* Thu Jun 19 2014 Brian C. Lane <bcl@redhat.com> - 21.43-1
+- Allow NFS addon repos (#985080) (dshea)
+- Add --disklabel support to clearpart (#1078537) (bcl)
+- Replace redundant ifs with direct assignments to the anaconda variables
+  (mkolman)
+- Replace ifs when assigning option values to flags where possible (mkolman)
+- Use True/False instead of 1/0 for flags (mkolman)
+- Store auto gui results in the same directory as the test itself. (clumens)
+- Use whatever network device was used to start installation. (clumens)
+- Ignore more deprecation warnings. (dshea)
+- Add help texts for the dmraid and nodmraid options (mkolman)
+- Use True instead of 1 for the dmraid flag default value (mkolman)
+- Add help texts for the ibft and noibft options (mkolman)
+- Use True instead of 1 for the ibft flag default value (mkolman)
+- Remove the iscsi and noiscsi options (mkolman)
+- Add a new log level 'lock' for _yum_lock (bcl)
+- Replace uses of gtk-missing-image (dshea)
+- Improve the SpokeSelector icon error reporting. (dshea)
+
+* Thu Jun 12 2014 Brian C. Lane <bcl@redhat.com> - 21.42-1
+- Adjust the ui package paths to find hubs and spokes (bcl)
+- Change emphasis from subvolumes to snapshots in removal warning. (dlehman)
+- Reflect the fact that some block devices cannot be reformatted. (dlehman)
+- Use StorageDevice.direct to detemine if a device is directly accessible.
   (dlehman)
 
-* Wed Dec 11 2013 Brian C. Lane <bcl@redhat.com> - 20.25.15-1
-- Fix selector device matching for unallocated partitions. (#1039292) (dlehman)
+* Wed Jun 11 2014 Brian C. Lane <bcl@redhat.com> - 21.41-1
+- Use /usr/lib* in updates images. (dshea)
+- Fix the paths we check for spokes. (sbueno+anaconda)
+- Remove the kbdtype option (mkolman)
+- Remove the noipv4 option (mkolman)
+- Remove the autostep option (mkolman)
+- Remove the disused nofb option (mkolman)
+- Remove the module option (mkolman)
+
+* Tue Jun 10 2014 Brian C. Lane <bcl@redhat.com> - 21.40-1
+- fedora-welcome: Correct an icon name after the switch to Adwaita
+  (kalevlember)
+- Pass/check displaymode in collect_categories and collectCategoriesAndSpokes.
+  (sbueno+anaconda)
+- Add help texts to some Anaconda CLI options (mkolman)
+- Don't install implicitly added but explicitly excluded packages (#1105013)
+  (vpodzime)
+- Update configure, make files, and PO files with new category changes.
+  (sbueno+anaconda)
+- Fix up collectCategoriesAndSpokes function. (sbueno+anaconda)
+- Update all relevant UI files with new category path. (sbueno+anaconda)
+- Move categories to pyanaconda.ui.categories. (sbueno+anaconda)
+- Allow testing a regular install from the live environment. (clumens)
+- Make sure /var/log/anaconda gets copied under the right root. (clumens)
+- format.setup in blivet takes only kwargs. (clumens)
+- Tweak spacing in the other storage options grid. (clumens)
+- Remove the dlable option (mkolman)
+- change default for grub2 save_entry to 0 (gczarcinski)
+- Revert "Refresh after checkbox clicked (#1074188)" (dshea)
+- Move assureLogoImage to GraphicalUserInterface (#1102238) (dshea)
+- If we cannot activate keyboard, at least populate the missing items
+  (#1104541) (vpodzime)
+- network: generate dracut arguments also for IPADDRn ifcfg values (#1103571)
+  (rvykydal)
+- Memoize the results for *RaidLevelsSupported() functions (amulhern)
+- RAID related changes for custom spoke. (amulhern)
+- Bump required blivet version. (amulhern)
+- Make parse-kickstart aware of the %%addon section (#1083002) (vpodzime)
+- Revert "Work around a parsing bug in GtkBuilder" (dshea)
+- Fix a typo in one of the bootloader installation warning messages (#1103410)
+  (mkolman)
+- Don't require network in standalone spoke for media installs (#1066807)
+  (rvykydal)
+
+* Mon Jun 02 2014 Brian C. Lane <bcl@redhat.com> - 21.39-1
+- eu_ES has been dropped from the supported languages (bcl)
+- Change 'elif encrypted' statement to 'else' statement. (amulhern)
+- Work around a parsing bug in GtkBuilder (dshea)
+- Don't uppercase the size values in the disk shopping cart. (clumens)
+- Display the sentence about being able to reuse partitions even without roots.
+  (clumens)
+- Allow a couple more keyboard shortcuts on the custom part spoke. (clumens)
+- Reword the close button on the software spoke's error dialog. (clumens)
+- Fix up quoting around passing args to anaconda in the gui test. (clumens)
+- Don't hide a serious issue (vpodzime)
+- Move autopart choices to one place and use them in both GUI and TUI
+  (vpodzime)
+- Define default autopart type as a constant (vpodzime)
+- Use enumerate() instead of getting indices of iterated items (vpodzime)
+- Preserve net.ifnames cmdline arg (#1102401) (bcl)
+- Revert the dialog sizing chunk from resize.glade. (clumens)
+- Update GUI tests for changes in gtk/atk/anaconda/whatever. (clumens)
+- Fix gui/runtest.sh to work under either "make check" or being run manually.
+  (clumens)
+- Add a -c argument to the ksflatten invocation. (clumens)
+- Do basic logging setup when short circuiting the normal Anaconda init
+  (mkolman)
+- Fix boot option warning string formatting (mkolman)
+- always rescan for vmlinuz if rescueKernelList (gczarcinski)
+- move new-kernel-pkg rpmposttrans to end of install (gczarcinski)
+- allow /boot on btrfs subvol or filesystem (gczarcinski)
+- Allow /boot on LVMlv (gczarcinski)
+
+* Wed May 28 2014 Brian C. Lane <bcl@redhat.com> - 21.38-1
+- Parse boot options before parsing CLI options (#1101341) (mkolman)
+- Check that bootloader devices are configured before validating (#1100928)
+  (dshea)
+- network: use IpInterface only for activated devices (#1101781) (rvykydal)
+- Enable LVM Thin Provisioning in text mode (vpodzime)
+- Remove the executable bit from anaconda.spec.in. (clumens)
+- Fix the nm test for big-endian results (dshea)
+- Fix issues with auto* and version.py (dshea)
+- Allow file:// url handler in --repo arg (bcl)
+- Ignore deprecation warnings for atk_role_register (dshea)
+- Handle renames in makeupdates. (pjones)
+- Move Anaconda version detection from isys to Python code (mkolman)
+- network: use IpInterface instead of Interface (#1058906, #1029214) (rvykydal)
+- network: don't modify network config for dirInstall and imageInstall
+  (rvykydal)
+- network: remove redundant image install guard (rvykydal)
+- network: add first tests for nm.py (rvykydal)
+- network: consolidate setNetworkOnbootDefault (rvykydal)
+- Set ONBOOT=yes for the device used for installation (#1002544). (rvykydal)
+- Use proper data for autopart type initialization (vpodzime)
+- Line up the right side of the FCOE dialog. (clumens)
+- Use default_width and _height on dialogs instead of _request. (clumens)
+- Remove the border around the refresh storage dialog's button. (clumens)
+- Short-circuit initialization when printing out Anaconda version (mkolman)
+- Make print statements Python 3 compatible (mkolman)
+- Fix the handling of set_const options pulled in from the boot cmdline (dshea)
+- Fix the modify software tooltip on the installation options dialogs.
+  (clumens)
+- Better visually distinguish TUI spokes states (vpodzime)
+- Reset the text direction as soon as the locale is changed (dshea)
+- Show errors from the displayed mountpoint when exiting the custom spoke
+  (dshea)
+- Check that container names input by the user are valid (dshea)
+
+* Tue May 20 2014 Brian C. Lane <bcl@redhat.com> - 21.37-1
+- Chain up to parent size_allocate functions in our standalone widgets.
+  (clumens)
+- Format the help text to properly fit to the terminal window (mkolman)
+- Call getPossiblePhysicalExtents() only once (vpodzime)
+- Default PE size to blivet's default when requested from kickstart (#1098139)
+  (vpodzime)
+- A couple of anaconda whitespace fixes (mkolman)
+- Replace the deprecated has_key() by in (mkolman)
+- Disable pylint errors on NetworkData in the new network_test.py. (clumens)
+- Tweak borders on the filter UI. (clumens)
+- network: add tests (rvykydal)
+- network: don't use ifcfg PREFIX when generating ipv6 dracut args (rvykydal)
+- network: cleanup - remove ksdevice variable (rvykydal)
+- Horizontally center the user creation spoke contents. (clumens)
+- Un-indent the reclaim space checkbox. (clumens)
+- Remove the RAID page from the filter UI. (clumens)
+- install -> installation in a string on the source spoke. (clumens)
+- Switch Anaconda to argparse (mkolman)
+- rpmostreepayload: Use systemd-tmpfiles rather than handrolling mkdir
+  (walters)
+- Add some padding to the custom partitioning note. (dshea)
+- Wrap the custom partitioning note (#1031850) (dshea)
+- Make an ostree string easier for translators to deal with. (clumens)
+- Fix the gettext warnings test for VPATH builds (dshea)
+- network: fix crash on empty ksdevice boot option (#1096846) (rvykydal)
+- Add RPMOSTreePayload (walters)
+- bootloader: Allow extlinux loader configuration to handle RPMOSTreePayload
+  case (walters)
+- install: Handle distinct physical root/sysroot (walters)
+- parse-kickstart: drop "mtu=" args (wwoods)
+- Drop workaround for old dracut BOOTIF+ip problem (wwoods)
+- Fix behavior (and docs) for ks=nfs:<path>/ (#1094645) (wwoods)
+- Allow non-ASCII characters in passwords (#960837) (dshea)
+- Use a separate label for passphrase warnings. (dshea)
+- Move more of the passphrase dialog into the glade file. (dshea)
+- Don't add redundant grub installs if stage1 is not a disk (dshea)
+- Let the user continue on bootloader errors (#1006304) (bcl)
+- Fix the parsing of NFS addon URLs (#966240) (dshea)
+- Remove redundant import (mkolman)
+- Don't overwrite function argument when parsing help texts (mkolman)
+- Return CLI help text at once (mkolman)
+- Fix typo in previous commit adjusting to blivet API change. (dlehman)
+- Adjust for movement of functions from examples into blivet proper. (dlehman)
+
+* Thu May 08 2014 Brian C. Lane <bcl@redhat.com> - 21.36-1
+- Switch to adwaita-icon-theme (kalevlember)
+- Hook up the TUI categories to autoconf/make. (#1095220) (dshea)
+- Fix the object type specifying argument name for findActions (vpodzime)
+- Remove keyword args 'ignoreErrors' from umountFilesystems() call. (amulhern)
+- Updates for new blivet.size.Size.__new__ interface. (amulhern)
+- Change uses of 'format' keyword param to 'fmt' keyword param (amulhern)
+- Update devicetree.findActions invocations to match blivet interface change
+  (amulhern)
+- Bump blivet version to ensure next four patches get the right interface.
+  (amulhern)
+
+* Mon May 05 2014 Brian C. Lane <bcl@redhat.com> - 21.35-1
+- Use format strings in the new kickstart error message translations. (clumens)
+- Mark kickstart errors as translatable, and hopefully make them more useful
+  too. (clumens)
+- install: Move Payload postInstall() after bootloader (walters)
+- iutil: Transparently redirect anyone who asks root=/mnt/sysimage to sysroot
+  (walters)
+- Fix the way categories are handled in text mode. (sbueno+anaconda)
+- Move GUI-specific helper classes to a separate module (#1091542) (dshea)
+- Fix license in parse-kickstart (mkolman)
+- main: Set flags.extlinux if extlinux is used in interactive-defaults.ks
+  (walters)
+- anaconda.service: Set GIO_USE_VFS=local (walters)
+- Use a gettext context where necessary when retranslating (#1091207) (dshea)
+- Update makebumpver for python-bugzilla 1.0.0 (bcl)
+- Skip source and software spoke in text live installations (#1092763) (bcl)
+- Add correct kernel params if rootfs is btrfs on s390x. (#874622)
+  (sbueno+anaconda)
+- Don't crash on anaconda-yum output containing multiple colons (#1092441)
+  (mkolman)
+- Revert chrooting when setting user/root password (vpodzime)
+- network: fix device configuration in text mode (#1058336) (rvykydal)
+- Change order in which packages/groups are selected/excluded (#1091952)
+  (vpodzime)
+- Check the correct button when saving changes in the Custom spoke (#1090786)
+  (vpodzime)
+- Fix unloading modules in driver-updates (#1085099) (wwoods)
+- Re-saved some of the glade files with a newer version of glade. (dshea)
+- Add viewports for the ListBoxes in the software spoke. (dshea)
+- Extend format string checks to translated format strings. (dshea)
+- Fix typo in nm_is_connected method check. (rvykydal)
+- iutil: Introduce getSysroot()/getTargetPhysicalRoot(), use instead of
+  ROOT_PATH (walters)
+
+* Thu Apr 24 2014 Brian C. Lane <bcl@redhat.com> - 21.34-1
+- Improve the "adding yum repo" message structure (mkolman)
+- Fix missing log message about adding a repository (#1089297) (mkolman)
+- Ignore use of eval warnings. (dshea)
+- Specify string format arguments as logging function parameters (dshea)
+- New encrypted state is the dialog's encrypted attribute (vpodzime)
+- Use human readable sizes with two decimal spaces in the GUI (vpodzime)
+- Make the LUKS unlock callback a timed action (vpodzime)
+- Hitting ENTER in the LUKS passwd entry should click the Unlock button
+  (vpodzime)
+- Block leaf device encryption if container is encrypted consistently
+  (vpodzime)
+- Do not remove the replacing item, remove the replaced one instead (vpodzime)
+- Give include_btrfs variable a better name (vpodzime)
+- Make the _resolve_btrfs_restrictions method's code nicer (vpodzime)
+- Refactor the btrfs magic into a separate method (vpodzime)
+- Switch the condition in long if-else statement (vpodzime)
+- Give an opaque condition a better name explaining its real meaning (vpodzime)
+- Refactor out the code for removing empty parents (vpodzime)
+- Use the (vpodzime)
+- Refactor out the code for adding device/mountpoint into a method (vpodzime)
+- Relabel /home partition if using and existing one (#1087736) (vpodzime)
+- Don't forget to call os._exit() in the child process (vpodzime)
+- users: Add root= keyword argument to set{User,Root}Password (walters)
+- users: Deduplicate code to fork()+chroot() (walters)
+- gui/spokes/software: Enable iff payload is PackagePayload (walters)
+- Use descriptive pylint messages instead of numbers. (clumens)
+- Add input validation to the source spoke. (dshea)
+- Remove the tests for duplicate and invalid repo names (dshea)
+- Expand the proxy URL validation. (dshea)
+- Convert the repository name test into a regex (dshea)
+- Add a remove_check method for InputCheckHandler. (dshea)
+- Use ID columns in the protocol combo boxes (dshea)
+- Added a link to a bug about the user data in glade problem. (dshea)
+- Remove the top and bottom padding from source spoke action area (dshea)
+- Re-add a false-positive for the GLib module (dshea)
+
+* Thu Apr 17 2014 Brian C. Lane <bcl@redhat.com> - 21.33-1
+- Add an option to copy translation files to an updates.img (dshea)
+- Set the selinux state from the command line (#784828) (dshea)
+- Remove a whole bunch of pylint false positives (dshea)
+- Ignore more informational messages printed by pylint pragmas (dshea)
+- Use more wildcards in the tests dist_ variable (dshea)
+- Make sure the idx variable is used instead of the old found variable
+  (vpodzime)
+- Disable a false positive from pylint (dshea)
+- Only run dialogs in the enlightbox context (vpodzime)
+- Separate code for finding item in containers combo and processing it
+  (vpodzime)
+- Check Update Settings button sensitivity when saving changes in one place
+  (vpodzime)
+- Only save changes if needed when adding mountpoint (vpodzime)
+- No need to call bool() on a boolean expression result (vpodzime)
+- Give names to some magic tuples, make them reusable and reuse them (vpodzime)
+- Add DEVICE_TYPE_DISK's text description to the mapping (vpodzime)
+- Move a few constants and mappings to the storage_utils module (vpodzime)
+- Split long label's string into two lines (vpodzime)
+- Don't rely on the ordering of autopart types in the combobox (vpodzime)
+- Only save changes if there are any changes to be saved (vpodzime)
+- Add device type constants to the device type combobox's store (vpodzime)
+- Change some anaconda-yum DEBUGs to be more informative (bcl)
+- Change Proxy Add Button to Ok (bcl)
+- Display a message for missing required packages and groups (#1064565) (dshea)
+- Fix issues with the errorHandler callback arguments (dshea)
+
+* Thu Apr 10 2014 Brian C. Lane <bcl@redhat.com> - 21.32-1
+- Refactor the code setting up the device type combobox a method (vpodzime)
+- Rename 'swap' variable to 'is_swap' to better express its meaning (vpodzime)
+- Refactor out the code setting up the fstype combobox into a method (vpodzime)
+- Refactor the code updating info about device container into a method
+  (vpodzime)
+- Remove the default None value from the addPage's cb argument (vpodzime)
+- Make on_updates_settings_clicked timed callback (vpodzime)
+- Rename the callback for updating mountpoint settings (vpodzime)
+- Hook up the GUI test so it's run as part of "make check". (clumens)
+- Skip running pylint on files containing "skip-file". (clumens)
+- Add comments to the kickstart tests. (clumens)
+- Add the beginnings of an automated GUI test suite. (clumens)
+- Add accessibility information to the user spoke. (clumens)
+- Add accessibility information to the root password spoke. (clumens)
+- Add accessibility information to the progress hub. (clumens)
+- Add accessibility information to most of the widgets on the storage spoke.
+  (clumens)
+- Add enough accessibility information to the network spoke for livecds.
+  (clumens)
+- Add accessibility information to the keyboard spoke. (clumens)
+- Add accessibility information to the date & time spoke. (clumens)
+- Add a script and base kickstart file for making a dogtail-enabled livecd.
+  (clumens)
+- Add accessibility information to the welcome spoke and summary hub. (clumens)
+- Add accessibility information to some of our widgets. (clumens)
+- Don't use dhcp ntpservers for dir or image installation (bcl)
+- Implement and use decorator for logging UI storage actions (vpodzime)
+- Refactor out the code doing device reformat into a function (vpodzime)
+- Refactor out the code handling encryption change into a function (vpodzime)
+- Fix variable name when logging new fstype (vpodzime)
+- Make it possible to override translation domain in GUIObjects (#1040240)
+  (mkolman)
+- Refactor out the code for handling device size change into a function
+  (vpodzime)
+- Refactor out the code for bounding size into a function (vpodzime)
+- Refactor code for reverting device reformat into a function (vpodzime)
+- Make the code changing an existing device more compact (vpodzime)
+- Comment the part of the code changing an existing device (vpodzime)
+- Do device change logging in one place where possible (vpodzime)
+- Pass information about old and new device as a dictionary (vpodzime)
+- Move code attempting to replace device into a separate function (vpodzime)
+- Mountpoint validation should only care about the new fs type (vpodzime)
+- Make size properties refreshing reused code (vpodzime)
+- Use generator instead of list for auxiliary old_disk_names variable
+  (vpodzime)
+- Remove and unused variable in Custom spoke (vpodzime)
+- Refactor mountpoint configuration validation out from _save_right_side
+  (vpodzime)
+- Don't overload selectorFromDevice function (vpodzime)
+- Use dir_tree_map for the cleanPStore function (vpodzime)
+- Check xconfig before setting the installed displaymode (dshea)
+- DNFPayload: call close() when done with the Base. (ales)
+- Do not try to get "" translated (vpodzime)
+- Use for-cycle else: branch instead of extra variable (vpodzime)
+- Have mountpoint descriptions defined in a dictionary (vpodzime)
+- Uppercase global constants in the Custom spoke (vpodzime)
+- Use cannonical RAID level names when populating RAID stores (vpodzime)
+- No RAID level (RAID level None) is a valid choice for LVM(ThP) (vpodzime)
+- LVM Thin Provisioning supports the same RAID levels as plain LVM (vpodzime)
+- Only block the password/user spokes if data was given in kickstart (vpodzime)
+- Disable a pylint error message for now. (clumens)
+- Suppress selinux error log when using default (#1083239) (bcl)
+- Use the AnacondaWidgets python gi-overrides for pylint (dshea)
+
+* Wed Apr 02 2014 Brian C. Lane <bcl@redhat.com> - 21.31-1
+- Only install consolehelper link on livearches (bcl)
+
+* Wed Apr 02 2014 Brian C. Lane <bcl@redhat.com> - 21.30-1
+- Add support ppc64le (hamzy)
+- Validate proxy URLs (dshea)
+- Provide feedback for invalid NTP hostnames. (dshea)
+- Use GUIDialogInputCheckHandler in the advanced user dialog (dshea)
+- Add a new InputCheck status for silent failures. (dshea)
+- Add an InputCheckHandler subclass for dialogs. (dshea)
+- Generalized and improved the proxy URL parsing regex (dshea)
+- Update makebumpver for the newer python-bugzilla on rawhide. (clumens)
+- network: don't crash on virtual devices turned off (#1080640) (rvykydal)
+- network: don't pop HWADDR twice for vlan on s390 (#1061646) (rvykydal)
+- Make safe_dbus module's functions less 'safe' (vpodzime)
+- Add a list of cmdline args that append instead of replace (#1073130) (bcl)
+- safe_dbus: Don't export DBus connection addresses as variables (walters)
+
+* Wed Mar 26 2014 Brian C. Lane <bcl@redhat.com> - 21.29-1
+- Add a Makefile target to create a set of empty .po files. (dshea)
+- os.path.exists -> os.path.lexists when checking for authconfig. (clumens)
+- Add support for tarfiles to liveimg kickstart command (bcl)
+- mountExistingSystem raises an exception with dirty FS (#1080210) (vpodzime)
+- Don't do yum lock logging when using updates.img (vpodzime)
+- Pass Size(0) instead of 0 to the ContainerDialog if no size is given
+  (vpodzime)
+- Update the BaseWindow and HubWindow example UI fragments (dshea)
+- Convert GtkHBox and GtkVBox to GtkBox. (dshea)
+- Fix keyboard accelerator collisions from former stock buttons (dshea)
+- Set the secret agent icon in the glade file (dshea)
+- Remove stock labels and icons. (dshea)
+- Run the pykickstart version test on the commands in parse-dracut (dshea)
+- Don't reimport os - it's imported very early on. (clumens)
+- Use an alternative image if logo is missing (mkolman)
+- Update parse-kickstart for the new bootloader command. (clumens)
+- Make sure the error info message starts on a new line (vpodzime)
+- Define two env variables removing useless warnings (vpodzime)
+- Check boot args for None (#1075918) (bcl)
+- Revert "Enable make check in %%check and add the necessary BuildRequires"
+  (dshea)
+- Fix the argument list passed to the payloadInitialize thread (#1079628)
+  (dshea)
+- Fix filtering the _storage_playground out (vpodzime)
+- Sync up step counts in install.py with reality. (clumens)
+- Avoid the "unable to init server" message. (dshea)
+- Do not attempt to run authconfig if it doesn't exist. (clumens)
+- Allow skipping installation of the core group, if asked for in kickstart.
+  (clumens)
+- Drop the vconsole.font boot arg (#1074113) (vpodzime)
+
+* Thu Mar 20 2014 Brian C. Lane <bcl@redhat.com> - 21.28-1
+- Get the DBus session bus address in a method (dshea)
+- Specify string format arguments as logging function parameters (dshea)
+- Inhibit the screen saver on live installs (#928825) (dshea)
+- Handle the dbus method call not returning anything. (dshea)
+- Convert errors raised during dbus connection to DBusCallError (dshea)
+- driverdisk: Show selection menu for network driver isos (#1075918) (bcl)
+- Write a modprobe blacklist (#1073130) (bcl)
+- Append cmdline arg values in BootArgs (#1073130) (bcl)
+- Wait for other threads to finish before sending ready (#1075103) (bcl)
+- set proxy related environmental variables (#854029) (bcl)
+- Fix pylint error in yumpayload. (sbueno+anaconda)
+- The custom spoke requires mountPointStore and mountPointCompletion, too.
+  (clumens)
+- Make the lists of files to check consistent across all checks. (dshea)
+- Fix error handling in cmdline mode. (#1034773) (sbueno+anaconda)
+- Don't create bootloader entries for kdump initrd and kernel. (#1036086)
+  (sbueno+anaconda)
+- Add a setting to network.py that got left out of the cherry-pick. (clumens)
+- Enable make check in %%check and add the necessary BuildRequires (atodorov)
+- Make it obvious user is going to begin installation. (#975793)
+  (sbueno+anaconda)
+- Move libtimezonemap requires to the anaconda-gui subpackage (vpodzime)
+- network: apply ks configuration to devices activated in initramfs (#1037605)
+  (rvykydal)
+- Add support for kickstart --interfacename for vlans (#1061646) (rvykydal)
+- network: handle race condition of disappearing active connection (#1073424)
+  (rvykydal)
+- Convert iter from filter model iter to backing store iter (#1074188)
+  (amulhern)
+- Provide ways in kickstart to skip kernel and bootloader (#1074522). (clumens)
+- DNFPayload: apply the kickstart excludedList. (ales)
+- Only pylint files that are in the git working copy (dshea)
+- Move accordion population into a separate function (vpodzime)
+- Short-circuit testing if root has any devices (vpodzime)
+- Getting new devices is not enough cheap operation for being a property
+  (vpodzime)
+- Hide and unhide the same set of disks in the Custom spoke (vpodzime)
+- Use GtkActionList when populating filesystem store (vpodzime)
+- Fix XDG_RUNTIME_DIR not set messages by creating one (dshea)
+- Make the ui_storage_logger reusable (vpodzime)
+- Decide on supported RAID levels in a better way (vpodzime)
+- Fix typo in the comment (vpodzime)
+- Add and use MountpointSelector's attributes we need (vpodzime)
+- Make code to get Size instance from user's input reusable (vpodzime)
+- Make getting raid level less hacky (vpodzime)
+- Implement a function to get container type name (vpodzime)
+- Make custom partitioning helper constants look as constants (vpodzime)
+- Simplify mountpoint validation and error reporting (vpodzime)
+- Simplify label validation and error reporting (vpodzime)
+- Move translated_new_install_name to the right place (vpodzime)
+- Rename the __storage attribute to a more propriate name (vpodzime)
+- Split out helper code from the Custom partitioning spoke (vpodzime)
+- The reset button should only be sensitive if there's something to reset.
+  (clumens)
+- Confirm before resetting custom partitioning selections (#970093). (clumens)
+- DNFPayload: Add languageGroups(). (ales)
+- Use ROOT_PATH not /mnt/sysimage (bcl)
+- Override ROOT_PATH with environmental variable (bcl)
+- Import /etc/login.defs in libuser.conf (#979815) (dshea)
+- Fix environment group changes based on ListBox row activation (dshea)
+- DNFPayload: do not crash when an addon is unavailable. (ales)
+- Payloads: make DEFAULT_REPOS a part of the interface. (ales)
+
+* Tue Mar 11 2014 Brian C. Lane <bcl@redhat.com> - 21.27-1
+- Don't disable anaconda repo on rawhide (bcl)
+- Set log level to debug when using an updates image (bcl)
+- driver-updates: accept burned driver discs (#1073719) (wwoods)
+- Do nothing if previously selected selector gets focus again (#1029798)
+  (vpodzime)
+- Firstboot is deprecated and gone on Fedora 20 and anything newer (vpodzime)
+- Reraise the exception properly (vpodzime)
+- Set progress bar to 100 %% in a different way (#1058755) (vpodzime)
+- Refresh after checkbox clicked (#1074188) (amulhern)
+- Use instclass.efi_dir when constructing the EFI path (dshea)
+- Add rescue kernels to the bootloader install list. (#1036349) (dshea)
+- Cover both possible ways that GUI WWID may have been set (#1074184)
+  (amulhern)
+- Do not write out /etc/adjtime file on s390(x) (#1070748) (vpodzime)
+- Ignore the data model and just return self.environment (mkolman)
+- Software spoke can't be complete if the payload thread is running (mkolman)
+- DNFPayload: blivet.size.Size() only knows 'spec' kwarg now. (ales)
+- Specify string format arguments as logging function parameters (dshea)
+- Add missing changelog entries (bcl)
+
+* Fri Mar 07 2014 Brian C. Lane <bcl@redhat.com> - 21.26-1
+- Don't traceback, just log a warning if connection is unavailable (#1070928)
+  (mkolman)
+- Remove unnecessary use_markup attributes. (dshea)
+- Add a check for unnecessary markup. (dshea)
+- Ignore the server keymap for spoke status if using VNC (#1045115) (dshea)
+- Call % outside of the translation (dshea)
+- Fix pylint errors about dangerous default values (dshea)
+- Typo fix (dshea)
+- driver-updates: skip iso selection with OEMDRV (#1066784) (bcl)
+- driver-updates: allow interactive mode to load multiple devices (wwoods)
+- driver-updates: add DoRefresh loop to select_iso() (#1066784) (wwoods)
+- driver-updates: add 'refresh' to selection_menu() (wwoods)
+- driver-updates: rework 'dd_finished' handling (wwoods)
+- driver-updates: refactor dd_scan (wwoods)
+- driver-updates: refactor menu to allow other options (wwoods)
+- Bump blivet Requires for DASD changes. (#1064423) (sbueno+anaconda)
+- Add GUI and TUI logic to handle unformatted DASDs. (#1064423)
+  (sbueno+anaconda)
+- Show unformatted DASDs in the local disk store. (#1064423) (sbueno+anaconda)
+- Add dialog box to warn about formatting DASDs. (#1064423) (sbueno+anaconda)
+- Update disk refs when recovering from a devicefactory failure. (#1032141)
+  (dlehman)
+- Add typelib and library paths to the test environment. (dshea)
+- Run pylint with NO_AT_BRIDGE=1 set in the environment (dshea)
+- pylint: Clean up accordion warnings (bcl)
+- Let Gtk pick the size for the isoChooserDialog (#973376) (dshea)
+- network kickstart: do not bind to MAC if SUBCHANNELS are present (#1070232)
+  (rvykydal)
+
+* Fri Feb 28 2014 Brian C. Lane <bcl@redhat.com> - 21.25-1
+- pylint: Add a pile of new E1101 exceptions (bcl)
+- pylint: change disable-msg to disable (bcl)
+- Fix console for s390 and 'noshell' mode (#1070672) (wwoods)
+- Check that the addon selection state exists before reading it (dshea)
+- Set the name in the volume group store (dshea)
+- Don't ignore the directory of the driver disk iso file (vpodzime)
+- Set rpm macros in DNFPayload (dshea)
+- Implement %%packages --instLangs (#156477) (dshea)
+- Set rpm macro information in anaconda-yum. (dshea)
+- Move the anaconda-yum exception handler (#1057120) (dshea)
+- Only run gtk actions in the gtk thread. (dshea)
+- Add createrepo Requires (#1016004) (bcl)
+- Fix a traceback gathering free space info for a container. (#1069854)
+  (dlehman)
+- network: detect also fcoe vlan device names exceeding IFNAMESIZ (#1051268)
+  (rvykydal)
+- DNFPayload: display the download progress on the hub. (ales)
+- driverdisk: Fix typo in error logging (#1016004) (bcl)
+- driverdisk: Create a repo for network drivers (#1016004) (bcl)
+- driverdisk: Catch blkid failure (#1036765) (bcl)
+- driverdisk: Ignore extra blkid fields (#1036765) (bcl)
+- We can't trust rhcrashkernel-param to give us newline-free text. (pjones)
+- Remove redundant _setCurrentFreeSpace() call (#1043763) (amulhern)
+- Enable python-coverage in anaconda (dshea)
+- Move the sidebar to the right for RTL languages (dshea)
+- Remove a bunch of unused includes and tests for headers (dshea)
+- Add a note about when and how to remove isys.sync (dshea)
+- Remove isys.isPseudoTTY (dshea)
+- Convert isys.isIsoImage to python code (dshea)
+- Focus the language search input by default (#973967) (dshea)
+- Ensure media being verified is always unmounted (dshea)
+- Write 'text'/'cmdline' in anaconda-ks.cfg in text/cmdline mode (wwoods)
+- text install -> text system (#1021963) (wwoods)
+- Support the 'skipx' kickstart command (wwoods)
+- let systemd decide when to start anaconda-sshd (wwoods)
+- Don't use tmux for inst.noshell (#1058607) (wwoods)
+- Fix a nitpick from bcl. (pjones)
+- Make rhcrashkernel-param get run on non-GRUB 2 platforms. (pjones)
+- Cast the blame appropriately when the kernel refuses efivars changes.
+  (pjones)
+- Do not use shim.efi on ARMv8 aarch64 (#1067758) (dmarlin)
+- Handle missing environments specified through kickstart (#1067492). (clumens)
+- create_sparse_file in blivet now expects a Size object. (clumens)
+- Don't traceback when no size is given in kickstart (#1067707). (clumens)
+
+* Fri Feb 21 2014 Brian C. Lane <bcl@redhat.com> - 21.24-1
+- setup default environment in initialize (bcl)
+- Move environmentAddons into packaging (bcl)
+- Skip running efibootmgr for image and dir installations (#1067749) (bcl)
+- Move translatable format strings into python. (dshea)
+- Added a check for translatable format strings in glade. (dshea)
+- Use a single script to run the glade tests. (dshea)
+- Check that s390x LVM configuration is valid. (#873135, 885011)
+  (sbueno+anaconda)
+- Re-apply disk selection on error in TUI storage. (#1056316) (sbueno+anaconda)
+- Properly retry package downloads (#924860) (mkolman)
+- Change the CSS class name of the sidebar (#1067049). (clumens)
+- Preserve ipv6.disable=1 on target system (#1040751) (wwoods)
+- Remove an unused import in driver-updates. (clumens)
+- Fix heredoc usage in generated /etc/grub.d/01_users (#1044404). (dcantrell)
+
+* Tue Feb 18 2014 Brian C. Lane <bcl@redhat.com> - 21.23-1
+- driverdisk: Parse all blkid output (#857248) (bcl)
+- Fix blkid output parsing and our output (vpodzime)
+- Don't use positional arguments to initialize Gtk objects (dshea)
+- Set mandatory property in network tui spoke. (#1064139) (sbueno+anaconda)
+- Disallow /boot on RAID on s390x. (#1027670) (sbueno+anaconda)
+- Remove a stray break statement (dshea)
+- Use devicetree.resolveDevice instead of udev_resolve_devspec. (#1047338)
+  (dlehman)
+- Set ThreadManager.any_errors to be a property (dshea)
+- Error on "bootloader --location=partition" when using grub2 (#969095).
+  (clumens)
+- Fix the handling of kernel parameters with no = (#1065704) (dshea)
+- Deal with a couple more "except Exception" lines. (clumens)
+- Fix pylint errors in the latest dnf-related commit. (clumens)
+- DNFPayload: pick the right FS as package download target. (ales)
+- DNFPayload: log import crashes. (ales)
+- DNFPayload: use dnf.exceptions.MarkingError. (ales)
+- Return the returned value in the fire_gtk_action (vpodzime)
+- Allow AddonData classes to parse options in the %%addon line (dshea)
+- Pass ints to Gtk resize functions (#1065021) (bcl)
+
+* Fri Feb 14 2014 Brian C. Lane <bcl@redhat.com> - 21.22-1
+- Remove app_paintable from a couple nav boxes (#1064708). (clumens)
+- Give a more correct error for missing groups/packages on exclude (#1060194).
+  (clumens)
+- Fix some incorrect RPM macros in the spec file. (clumens)
+- Allow using globs and alternative paths for specifying boot drive (#1057282).
+  (clumens)
+- Don't reset input check status when disabling a check (#1062273) (dshea)
+- Fix how an input check is disabled (#1062275). (dshea)
+- ListStore.remove expects an iter, not an int (#1062752). (clumens)
+
+* Tue Feb 11 2014 Brian C. Lane <bcl@redhat.com> - 21.21-1
+- Move save_netinfo into a hook (#1048231) (bcl)
+- Cleanup log message for pylint (bcl)
+- kickstart user accounts should be locked by default (#1063554) (bcl)
+- pre-push hook checking bugzilla IDs on rhelX branches (vpodzime)
+- Make sure LUKS devices can say they have a key (#1060255) (amulhern)
+- Handle LUKS passphrase before doing sanity check (#1060255) (amulhern)
+- Remove some unnecessary resets (#1060255) (amulhern)
+- Do not consider no available LUKS passphrase an error in do_autopart
+  (#1060255) (amulhern)
+- Adapt to new blivet.sanityCheck() return type (#1060255) (amulhern)
+- Adapt StorageChecker class for changed return type of sanityCheck (#1060255)
+  (amulhern)
+- Add sanityCheck functionality back into AutoPart.execute() (#1060255)
+  (amulhern)
+- Bump blivet version for changed sanityCheck() interface (amulhern)
+- UnmanagedDeviceError and UnknownConnectionError are in the nm module.
+  (clumens)
+- blivet no longer has a protectedDevices property. (clumens)
+- network: adapt to changed handling of devices without carrier in NM
+  (#1062417) (rvykydal)
+- driverdisk: Rename skip_dds to make pylint happy (bcl)
+- driverdisk: Use a single systemd service to start DD UI (#1035663) (bcl)
+- driverdisk: Add dd_args_ks handling to driver-updates (#1035663) (bcl)
+- driverdisk: Process kickstart driverdisk commands (#1035663) (bcl)
+- driverdisk: Handle kickstart driverdisk command (#1035663) (bcl)
+- driverdisk: Use getargs instead of the env variable (#1035663) (bcl)
+- Remove now-unused isys/devices.[ch]. (clumens)
+- Call finalize functions in parent classes. (dshea)
+- Fix crashes in the LayoutIndicator dispose function. (dshea)
+- Require systemd (dshea)
+- Remove the now-unused anaconda_spoke_header.png. (clumens)
+- Minor aesthetic cleanups (#1045250). (duffy)
+- Add a topbar design to SpokeWindows. (#1045250) (duffy)
+- Update the Aarch64 packages to include efibootmgr. (dmarlin)
+- Add a sidebar to the standalone and hub windows (#1045250) (duffy)
+- Allow specifying an environment in the kickstart file (#1050994). (clumens)
+- The autopart scheme combo should work for creating partitions manually, too.
+  (clumens)
+
+* Tue Feb 04 2014 Brian C. Lane <bcl@redhat.com> - 21.20-1
+- makebumpver: Any failure should cancel the bump (bcl)
+- Add option help text for --image and --dirinstall flags (#1056791) (amulhern)
+- Update bumpver to allow Related bugs (bcl)
+- Fix up some pylint errors. (clumens)
+- If a user has been created, don't allow entering the user spoke (#1058564).
+  (clumens)
+- Tweak passphrase wording a bit. (clumens)
+- Tweak the final progress messages to fit on the screen a little better
+  (#1058463). (clumens)
+- Fix iscsi target selection checkbox in GUI (#1058653) (rvykydal)
+- network ks: allow setting only hostname with network command (#1051564)
+  (rvykydal)
+- fcoe: add fcoe=<NIC>:<EDB> to boot options for nics added manually (#1040215)
+  (rvykydal)
+- network GUI: ignore fcoe vlan devices (#1051268) (rvykydal)
+- Use an unused variable. (dshea)
+- Ignore an unused function warning on isys_init (dshea)
+- Remove unused isys files. (dshea)
+- Fix the handling of realloc failures. (dshea)
+- Run cppcheck on the C source files. (dshea)
+- Check RAID10 box for BTRFS (#1021856) (amulhern)
+- Make sure directory for DD extraction exists (vpodzime)
+- Handle --image arguments more thoroughly (#982164,#994488) (amulhern)
+- Remove the border from the custom part notebook. (clumens)
+- Style the Done button to make it more noticable (mizmo). (clumens)
+- Change the string used to test for serial console (#1054951) (dmarlin)
+
+* Tue Jan 28 2014 Brian C. Lane <bcl@redhat.com> - 21.19-1
+- Change the reclaim space button rules (#980496) (bcl)
+- Revert "Fix up username checking regex a bit." (dshea)
+- Fix a pylint-caught problem from my previous cherry-pick. (clumens)
+- Give priority to IPv4 addresses when showing VNC & SSH IP (#1056420)
+  (mkolman)
+- Display custom part warnings/errors on the spoke itself (#975840). (clumens)
+- Fix listing threads that caused an error (vpodzime)
+- Do not add errors item for thread in advance (vpodzime)
+- Log exceptions before running exception handling (vpodzime)
+- Fix kickstart 'updates' command (#1056727) (wwoods)
+- Fix exitHandler loop deactivation (bcl)
+- Show hidden disk images (#1034996) (bcl)
+- Fix pylint errors (dshea)
+- Provide a maximum width to the betanag dialog. (clumens)
+- Don't include zero sized disks in the custom part UI either (#903131).
+  (clumens)
+- Move the Quit button to the right and make it consistently sized (#1038802).
+  (clumens)
+- "Delete All" on the reclaim dialog should not delete hdiso source (#980496).
+  (clumens)
+- Add a scrollbar to the error dialog (#1021506). (clumens)
+- Change the product name we key off (#1055019). (clumens)
+- Another dracut pylint change. (dshea)
+- Fix page logic in driver selection (#1055333) (bcl)
+- Give users way to select DD ISO interactively (#1036765) (vpodzime)
+- Make network-fetched driver disk .iso files work (#1003595) (vpodzime)
+- Disable pylint messages too annoying to deal with. (dshea)
+- Fix unused variable warnings (dshea)
+- Remove unused imports (dshea)
+- Specify string format arguments as logging function parameters (dshea)
+- Remove the raidstart and raidstop commands (dshea)
+- Expand the reach of pylint (dshea)
+- Put Xorg on tty6 in accordance with Ancient Anaconda Tradition (#980062)
+  (wwoods)
+- Fix the handling of kickstart NFS repos with options (#1045528) (dshea)
+- Skip empty layout-variant specifications when setting layouts (#1057442)
+  (vpodzime)
+
+* Thu Jan 23 2014 Brian C. Lane <bcl@redhat.com> - 21.18-1
+- Use validate_label to check whether label should be updated (#1038590)
+  (amulhern)
+- Always reject label if the format exists (#1038590) (amulhern)
+- Make label field always sensitive (#1038590) (amulhern)
+- Save module list after initial module load (#1050352) (bcl)
+- Require gtk3 and glib2 documentation to build (dshea)
+- Rename get_widgets_datadir to anaconda_get_widgets_datadir. (dshea)
+- Include the annotation-glossary (dshea)
+- Set device.format.label field close to where we read it (#1056139) (amulhern)
+- Install the rpmrc file to the initrd.img (#1016004) (vpodzime)
+- Give users hint about VNC password restrictions (#1053546) (vpodzime)
+- Be more liberal in what is accepted as a size unit. (dshea)
+- Remove en_spec parameters from blivet.size.Size. (dshea)
+
+* Tue Jan 21 2014 Brian C. Lane <bcl@redhat.com> - 21.17-1
+- Test for DataHolder Class (#1034427) (bcl)
+- Use DataHolder for TUI nfs data (#1034427) (bcl)
+- Add DataHolder class (#1034427) (bcl)
+- Handle inst.{gpt,dnf,extlinux} using cmdline.getbool() (wwoods)
+- Drop unreferenced 'useIPv[46]' flag (wwoods)
+- Don't force shell on tty2 (#980062) (wwoods)
+- add comment about boot-options.txt (wwoods)
+- Add support for getting stage2 image from boot.iso (#1035514) (mkolman)
+- Various changes to handling of filesystem label setting (#1038590) (amulhern)
+- Fix translation context on the storage options dialogs. (clumens)
+- Fix problems going into custom partitioning with the new work flow. (clumens)
+- Don't show actions next to free space lines in the reclaim dialog (#1054208).
+  (clumens)
+- If there's a label in the ISO device combo, put it on a new line (#1031727).
+  (clumens)
+- Make the device name in a MountpointSelector less wide (#1048583). (clumens)
+- If a root password is set, don't show the spoke (#910355, #1041405).
+  (clumens)
+- Check for certain disk attrs before trying to access them. (#1053055)
+  (sbueno+anaconda)
+- Use gtk_get_locale_direction. (dshea)
+- Always run efibootmgr from ROOT_PATH (bcl)
+- A class for scheduling Gtk actions and running them all at once (vpodzime)
+- Remove some leftover float conversions. (dshea)
+- Use uint64 for the resize target size. (dshea)
+- Return program output as a string instead of a list (dshea)
+- Implement and use a function for one-off running Gtk actions (vpodzime)
+- Be more defensive when getting layouts and their variants (vpodzime)
+- Implement and use functions for conversion between keymaps and layouts
+  (vpodzime)
+- Fix reset of existing device to its original size. (dlehman)
+- Don't disable checks for global at the module level. (dshea)
+- Clean up the pylint-false-positives. (dshea)
+- Remove pylint comments that are no longer necessary (dshea)
+- Allow pylint-false-positives to end with a newline (dshea)
+- Change storage widget visibility based on disks selected. (clumens)
+- Rename widgets in the two remaining options dialogs. (clumens)
+- Allow going to the reclaim dialog even for autopart (#1014671). (clumens)
+- Add the autopart type combo to custom storage (#1014671). (clumens)
+- Tweak DiskOverview spacing a little bit (#1014671). (clumens)
+- Add custom part and encryption buttons to the main storage spoke (#1014671).
+  (clumens)
+- Remove the existing install_options1 dialog, rename the others (#1014671).
+  (clumens)
+- Grow the spoke gradient image to fit the nav_area (#1035772). (clumens)
+- Additional completion checks in network spoke. (#1044571) (sbueno+anaconda)
+- Fix problems reported by pylint (dshea)
+- Decode potentially 8-bit strings in TUI windows (dshea)
+
+* Fri Jan 10 2014 Brian C. Lane <bcl@redhat.com> - 21.16-1
+- Use blivet.size.Size for all size quantities. (dlehman)
+- make anaconda-shell (wwoods)
+- handle "ks=cdrom[:<path>]" on systems with multiple CDs (#1049237) (wwoods)
+- dracut: add when_any_cdrom_appears for cdrom autoprobe (wwoods)
+- dracut: minor shell cleanup (wwoods)
+- fix inst.noshell (#807703) (wwoods)
+- Error gracefully if we have a question in cmdline mode. (#869731)
+  (sbueno+anaconda)
+- Verify that designated label can be set (#1038590) (amulhern)
+- Do not change sensitivity of label field (#1038590) (amulhern)
+- Make the clear icon functional in language spoke. (sbueno+anaconda)
+- Fix the translated pango markup check (dshea)
+- Remove iutil.strip_markup. (dshea)
+- Pass additional command-line arguments to pylint (dshea)
+- Fix and ignore markup warnings where appropriate (dshea)
+- Check that the Pango markup in glade files is valid (dshea)
+- Added a pylint module to check pango markup. (dshea)
+- Split the po-based translation code into a separate file. (dshea)
+- Fix bool parsing of boot options with inst. prefix (#1044391) (mkolman)
+- Use vc_keymap as X layout only if we get nothing from localed (#1048592)
+  (vpodzime)
+- Warn user if entering LUKS password with non-ASCII characters (#1039168)
+  (vpodzime)
+- Add back some erroneously removed set_use_underline calls (dshea)
+- Only show the "DATA" heading if there are data mount points under it.
+  (clumens)
+- Don't allow the advanced user dialog to be saved with errors (dshea)
+- Move the add_check stuff into helper classes. (dshea)
+- Remove the UID and GID maximums. (#978846) (dshea)
+- Fix an invalid mnemonic widget reference in passphrase entry (dshea)
+- Added checks for some potential issues in glade files (dshea)
+- Remove scrot dependency for global screenshot support (mkolman)
+- Fix mnemonic widget reference id (vpodzime)
+
+* Tue Jan 07 2014 Brian C. Lane <bcl@redhat.com> - 21.15-1
+- Use the new Gtk.ListBox for displaying environments and addons (#1039683).
+  (clumens)
+- Display additional disk attributes in TUI storage spoke. (#1024760)
+  (sbueno+anaconda)
+- Fix 'select all disks' logic in TUI storage spoke. (sbueno+anaconda)
+- Ignore the compile script (dshea)
+- network GUI: don't crash when wifi is activated in standalone spoke
+  (#1046138) (rvykydal)
+- Use the right test for there being any storage actions. (clumens)
+- Only display the actions summary dialog if there are any actions (#1030511).
+  (clumens)
+- Do not support kickstart+live installs (#1027160). (clumens)
+- We no longer directly use libnl (#1034830). (clumens)
+- Remove _transactionErrors from yumpayload.py. (clumens)
+- Move xhost handling to the xinit script (#1045280) (dshea)
+- Check for ready before baseRepo in completed (#1044985) (bcl)
+- Treat the output of vncpasswd as binary data, since it is (#1045119) (dshea)
+- Add iutil.exec* options for handling binary data (dshea)
+- Print a message and exit if a user attempts to upgrade via kickstart. (dshea)
+
+* Wed Dec 18 2013 Brian C. Lane <bcl@redhat.com> - 21.14-1
+- Fix the release notes image cycler. (#1043393) (dshea)
 - Do not schedule resize actions for non-resizing requests (#1039491)
   (vpodzime)
 - Use ceil for minSize in resize dialog (#1040012) (bcl)
 - Use integer numbers of megabytes in the Reclaim dialog (#1040012) (vpodzime)
+- fcoe gui: repopulate device tree only if device was actually added (#1039223)
+  (rvykydal)
+- Exclude FCoE disks from local disks (#1039223) (rvykydal)
+- fcoe: repopulate devicetree after adding FCoE SAN (#1039223) (rvykydal)
+- Add initial 64-bit ARM aarch64 EFI support (#1034428) (dmarlin)
+- Rename network spoke header (mkolman)
+- Show the Shell spoke in debug mode (vpodzime)
+- Accept only .iso files from the IsoChooser dialog (#1015169) (vpodzime)
+- Just run the IsoChooser dialog lightbox (vpodzime)
+- Use libxklavier's new methods instead of our nasty hack (vpodzime)
+- Move atexit registration before running rescue mode (#1038855) (vpodzime)
+- Only display the addon separator if there's a reason to. (clumens)
+- Stop using deprecated gtk margin functions. (clumens)
+- Fix the check_accelerators srcdir path. (dshea)
+- Show msg in TUI if user attempts to create invalid username. (#965561)
+  (sbueno+anaconda)
+- Fix up username checking regex a bit. (sbueno+anaconda)
+- Fix default device for ks=cdrom (#1042500) (bcl)
+- createUser is already in a chroot (#1038241) (bcl)
+- Skip checks on files that are not staged for commit. (dshea)
+- Allow catching exceptions from threads (vpodzime)
+- Enable warnings about abstract methods not overridden (dshea)
+- Provide empty methods to override abstract parent methods. (dshea)
+- Implement status in StandaloneSpoke. (dshea)
+- Move a bunch of abstract methods from Payload to PackagePayload (dshea)
+- Remove some methods from packaging.Payload. (dshea)
+- Disable abstract method warnings in intermediate abstract classes. (dshea)
+- Remove Personalization spoke (dshea)
+- Remove some vestigal code from an earlier version of GUICheck (dshea)
+
+* Thu Dec 12 2013 Brian C. Lane <bcl@redhat.com> - 21.13-1
+- Refresh environment addons on source change (#1033749) (bcl)
+- Fix selector device matching for unallocated partitions. (#1039292) (dlehman)
+- Rename the network config spoke a little bit. (clumens)
 - Don't encrypt device if container is encrypted (bcl)
+- network: add s390 options in ifcfgs generated from kickstart (#1031376)
+  (rvykydal)
+- Remove enablement of whiteout/blackout plugins, and the requires on anaconda-
+  yum-plugins. (notting)
+- Fix checking if we are collecting our module (vpodzime)
+- Remove an unnecessary continue statement in the potfiles check (vpodzime)
+- Use sys.exit instead of os._exit in the potfiles test (vpodzime)
+- List addons in exception report data (vpodzime)
+- Make Hub.storage and Spoke.storage a property (dshea)
+- Fix the botched helperization of StorageChecker (dshea)
 - Disable tmpfs in the GUI (#1039511) (mkolman)
 - Don't crash on NTP lookup without network (#1026079) (mkolman)
+- Don't rely on Gtk being importable for exception handling (vpodzime)
+- Support rnotes in SVG format (#1034407). (clumens)
+- Fix a couple warnings from -Werror=format-security (#1036989). (clumens)
+- Use abstract base classes for mixins. (dshea)
+- Display free space remaining in containers (#1035832). (clumens)
 - Make sure url and mirrorlist are not set at once (#1026834) (mkolman)
 - if rootfs is btrfs, add rootflags=subvol to kernel parameters (gene)
+- add ro to bootloader kernel parameters (gene)
+- Added missing entries to POTFILES.in (dshea)
+- Add a check that files with translatable strings are in POTFILES.in (dshea)
+- Fix the handling of renames in the pylint git hook. (dshea)
+- Remove startup-id from AnacondaBaseWindow. (dshea)
 
-* Wed Dec 04 2013 Brian C. Lane <bcl@redhat.com> - 20.25.14-1
+* Wed Dec 04 2013 Brian C. Lane <bcl@redhat.com> - 21.12-1
 - Handle cancelation of device resize in the custom spoke. (#1027947) (dlehman)
 - Disallow /boot on lvm until grub2 fully supports it. (#1036705) (dlehman)
 - Disallow /boot on btrfs subvolume until grubby supports it. (#864198)
   (dlehman)
-- Fix AttributeError in TUI (#1037626) (mkolman)
-- New Version - 20.25.13 (bcl)
-
-* Mon Dec 02 2013 Brian C. Lane <bcl@redhat.com> - 20.25.13-1
+- Remove an empty initialize function. (clumens)
+- Move PathDict into pyanaconda/ui/__init__.py. (clumens)
+- Add one more directory for ignoring test log files (dshea)
+- Defer translation of device_type_name (dshea)
+- Disable pylint errors about gobject-introspection methods (dshea)
+- Remove unused variables (dshea)
+- Document the instl.multilib boot option (vpodzime)
+- Minor tweak of our driver disk documentation (vpodzime)
+- network: GUI, don't ask for wifi secrets upon Configure (#1033073) (rvykydal)
+- network: GUI, add support for virtual devices removing (#1030870) (rvykydal)
+- network: fix naming of slave ifcfg files from kickstart (#1036047) (rvykydal)
+- network: GUI, handle virtual devices (bond, vlan, team) properly (#1036047)
+  (rvykydal)
+- Change how we test if the GUI is available in the anaconda script. (clumens)
+- Update boot-options.txt. (amulhern)
+- Omit /dev/sr* from list-harddrives (#1032500) (sbueno+anaconda)
+- Fix EditTUISpoke to operate only on visible entries (vpodzime)
 - Don't try to investigate empty string for unicode chars (#1035799) (vpodzime)
+- Fix issues reported by the check_pw_visibility test (vpodzime)
+- Add check testing visibility of password entries (vpodzime)
+- Put tests of .glade files into a separate directory (vpodzime)
+- Save a reference to the imported Xkl module for get_current_layout (dshea)
+- Fix the Makefile.am subdirs for widget data. (dshea)
+- Fix some pylint warnings. (clumens)
+- Switch to libtimezonemap for the timezone map. (dshea)
+- Set the _config_dialog property during __init__. (dshea)
+- Fix handling of long release ids (mkolman)
+- Store older valid packages in separate folder (mkolman)
+- Fetch older valid releases (mkolman)
+- Import Xkl only when really needed (vpodzime)
+- Global screenshot support (#1025038) (mkolman)
+- Require new version of python-blivet (vpodzime)
+- Hide password characters in iSCSI login fields (#1034202) (vpodzime)
+- Use format names instead of types in the resize dialog (vpodzime)
 - Do not write out the vconsole.keymap boot option (#1035316) (vpodzime)
 
-* Wed Nov 27 2013 Brian C. Lane <bcl@redhat.com> - 20.25.12-1
+* Wed Nov 27 2013 Brian C. Lane <bcl@redhat.com> - 21.11-1
+- Use raid RAID level constants instead of mdraid RAID level constants.
+  (amulhern)
+- Use level objects instead of level integer codes. (amulhern)
 - clear software environment (#1029536) (bcl)
 - Update source on errors (#1030997) (bcl)
+- Fix errors in kickstart.py. (dshea)
+- Update gettext.txt (dshea)
+- Don't allow bootloader and /boot on iSCSI on s390 (#1034222) (vpodzime)
 - Round float values coming from the Gtk stack (#1013586) (vpodzime)
 - Generate missing machine-id (bcl)
 - Fix problems reported by pylint. (dshea)
 - Add HDD ISO support for TUI (#1000327) (mkolman)
+- Use a directory in build tree for pylint data. (dshea)
+- Remove MOSTLYCLEANDIRS from Makefile.am (dshea)
+- fixup spec for fedup (bcl)
 
-* Mon Nov 25 2013 Brian C. Lane <bcl@redhat.com> - 20.25.11-1
+* Mon Nov 25 2013 Brian C. Lane <bcl@redhat.com> - 21.10-1
+- Cleanup anaconda.spec.in (bcl)
 - Handle non-leaf btrfs volumes with mountpoints. (#1016959) (dlehman)
 - Use en_spec for blivet Size spec strings with constant components. (#1029616)
   (dshea)
-- Fix spoke sorting issues in text-mode. (#929177) (sbueno+anaconda)
+- The gui and tui subpackages cannot be noarch (vpodzime)
+- Cleanup unused and overly complicated stuff in isys (vpodzime)
 - DNFPayload: tweak to the API changes in dnf-0.4.8 (ales)
 - Don't use cached packages with different release id (mkolman)
 
-* Fri Nov 22 2013 Brian C. Lane <bcl@redhat.com> - 20.25.10-1
+* Fri Nov 22 2013 Brian C. Lane <bcl@redhat.com> - 21.9-1
+- Add a test for accesses of yum.preconf outside of _resetYum. (clumens)
 - Remove base_repo cache (#1011555) (bcl)
 - Make _yum.preconf setup atomic (#1028245) (bcl)
 - Remove threading from getBaseRepo handling (#1011555) (bcl)
+- If there are incomplete spokes, let the user know which (#1032801). (clumens)
 - tui: show Processing while source is busy (bcl)
 - tui: wait for threads before entering source and software (#1032823) (bcl)
 - clear errors when metadata is ok in tui source spoke (#1006570) (bcl)
+- Fix parallel pylint in distcheck. (dshea)
 
-* Wed Nov 20 2013 Brian C. Lane <bcl@redhat.com> - 20.25.9-1
+* Wed Nov 20 2013 Brian C. Lane <bcl@redhat.com> - 21.8-1
 - Fix geolocation on live installs (mkolman)
-- Use timing decorator for more actions (vpodzime)
-- A nice decorator making Anaconda's GUI more responsive (#1032026) (vpodzime)
-- Short-circuit layouts matching (vpodzime)
+- Ignore the pylint warning on importing GraphicalUserInterface. (clumens)
+- Fall back to text mode if GUI is not available (vpodzime)
+- Get rid of unused isys.isCapsLockEnabled function (vpodzime)
+- Don't rely on having zenity and require it only for GUI (vpodzime)
+- No longer need the Gconf2 package (vpodzime)
+- Split out anaconda's user interfaces into separate packages (vpodzime)
+- Do not include tzmapdata into the main package (vpodzime)
+- Create directories for stubs if they don't exist (vpodzime)
+- Do not try to fetch our own packages that will be built (vpodzime)
 - Remove the unused flags import from installclass.py. (clumens)
+- Fix logging of pylint-one output (bcl)
 - Do yum lock logging only with inst.debug or loglevel=debug (vpodzime)
 - Don't panic on installclasses failing with inst.debug (vpodzime)
-- Make thread manager operations atomic (#1029898) (mkolman)
 
-* Fri Nov 15 2013 Brian C. Lane <bcl@redhat.com> - 20.25.8-1
+* Mon Nov 18 2013 Brian C. Lane <bcl@redhat.com> - 21.7-1
+- Expand the use of ANACONDA_WIDGETS_DATADIR. (dshea)
+- Make thread manager operations atomic (#1029898) (mkolman)
+- Run pylint in multiple processes (vpodzime)
+- Fix how "changed" signal is emitted on the TreeSelection (vpodzime)
 - Pass biosdevname boot option to installed system (#1023609) (rvykydal)
+- network: update required NetworkManager version (team support) (rvykydal)
+- Use timing decorator for more actions (vpodzime)
+- Add test for the have_word_match function (vpodzime)
+- A nice decorator making Anaconda's GUI more responsive (vpodzime)
+- Short-circuit layouts matching (vpodzime)
 - Enforce upper bound for resize. (#1027947) (dlehman)
 - Fix some pylint problems in network.py. (clumens)
+- Add an updates location for the AnacondaWidgets overrides (dshea)
 - Fix typo (#1003591) (rvykydal)
 - network: call GDBus proxy methods like python (rvykydal)
 - network: add team support for kickstart %%pre phase (#1003591) (rvykydal)
@@ -335,61 +1697,95 @@ update-desktop-database &> /dev/null || :
 - network: support for adding team devices (#1003591) (rvykydal)
 - network: display team devices in status (#1003591) (rvykydal)
 - network: add team support to kickstart (#1003591) (rvykydal)
-- network kickstart: add support for devices configured in %%pre (#1019796)
-  (rvykydal)
-- Don't show language twice for keyboard layouts (#1021907) (petersen)
+- Initialize the AddLayouts dialog in advance in the KeyboardSpoke (vpodzime)
+- Add function to map functions on items in the main thread (vpodzime)
+- Allow having unique thread names with given prefix (vpodzime)
 - Remove an unused and non-working leftover function resetResolve (vpodzime)
 - Always center dialogs shown on top of lightbox (vpodzime)
 - Set spokes' distribution and beta warning only once (vpodzime)
-
-* Tue Nov 12 2013 Brian C. Lane <bcl@redhat.com> - 20.25.7-1
 - use deepcopy on ksdata method (#1028243) (bcl)
 - Change source spoke proxy handling to use local copy (#967805) (bcl)
-- Add tmpfs support (#918621) (mkolman)
+- Apply a little tweak to the VNC password length message. (clumens)
 - Match layouts with stripped accents in AddLayout dialog (vpodzime)
 - Sort layout descriptions properly (#1026238) (vpodzime)
 - Make AddLayout dialog persistent (vpodzime)
 - Use Sphinx syntax in the iutil module (vpodzime)
-- Fix issues in the datetime_spoke.glade file (#1028630) (vpodzime)
+- Warn if vnc passwd is longer than 8 chars (hamzy)
+- Don't try to unicode unicode strings (#1029109) (vpodzime)
+- Add tmpfs support (#918621) (mkolman)
+- Added a few things that autoscan complained about (dshea)
+- Actually use the config header we generate (dshea)
+- Redirect pylint stderr to stdout (dshea)
+- Fix the handling of files generated for xgettext (dshea)
+- Use gettext to process glade files. (dshea)
+- Always use $prefix in directory names. (dshea)
+- Pass --enable-gtk-doc to configure in distcheck (dshea)
+- Fix the liveinst install/uninstall hooks (dshea)
+- Clean up after intltool (dshea)
+- Add missing files to dist (dshea)
 - DNFPayload: tweak to the API changes in dnf-0.4.7. (ales)
 - Add tests for iutil (mkolman)
-- Remove duplicate definition of the regions GtkListStore (vpodzime)
+
+* Fri Nov 08 2013 Brian C. Lane <bcl@redhat.com> - 21.6-1
+- Fix typos in translation functions (dshea)
 - Put the cityCompletion back on the list of widgets (vpodzime)
+- Do not translate strings defined at the module or class level. (clumens)
+- Fix a couple places where we're doing %% inside of _(). (clumens)
+- Add a custom pylint module to check i18n problems. (clumens)
+- Remove an unused import. (clumens)
 - Provide our own sorting functions for regions and timezones (#1025029)
   (vpodzime)
 - Set locale for our process (vpodzime)
 - Translate timezones in GUI (vpodzime)
-- Fix the selection of default groups (#1023263) (dshea)
+- network gui: add apply tooltip to Configure button (#1018471) (rvykydal)
+- Make dialog return code checking more robust (amulhern)
+- Show last 4 bytes of wwid (#1024966) (jstodola)
+- Handle focus changes of MountpointSelectors from outside (#975838) (vpodzime)
+- network: do not crash when device for network --device is not found
+  (#1023829) (rvykydal)
 - Log continuing from hub if there are no spokes (vpodzime)
-- Updates to boot-options.txt document (#1026448) (amulhern)
-- No longer install anaconda user documentation (#1026448) (amulhern)
+- Updates to boot-options.txt document (#1026449) (amulhern)
+- No longer install anaconda user documentation (#1026449) (amulhern)
 
-* Fri Nov 01 2013 Brian C. Lane <bcl@redhat.com> - 20.25.6-1
+* Fri Nov 01 2013 Brian C. Lane <bcl@redhat.com> - 21.5-1
+- Fix spoke sorting issues in text-mode. (#929177) (sbueno+anaconda)
 - Send the continue click after the queue is empty (#1025347) (bcl)
 - No longer use summary screen visit to decide whether bootloader has been
-  configured (#1025802) (amulhern)
-- Remove the bootloader line from the interactive kickstart file (#1025802)
+  configured (#1025811) (amulhern)
+- Remove the bootloader line from the interactive kickstart file (#1025811)
   (amulhern)
-- Set bootloader default location to mbr in constructor (#1025802) (amulhern)
+- Set bootloader default location to mbr in constructor (#1025811) (amulhern)
+- Remove column titles from the software spoke. (dshea)
+- Fix the selection of default groups (#1023263) (dshea)
+- Use the default yscale for the HubWindow alignment (dshea)
 - Fix kickstart block device resolution. (#1022206) (dlehman)
 - Specify query territory when getting language native name (vpodzime)
+- Get rid of trailing whitespace (vpodzime)
+- Export the right classes from the tui.spokes package (vpodzime)
+- Define newLayoutStore before it is used by the filter (vpodzime)
 
-* Wed Oct 30 2013 Brian C. Lane <bcl@redhat.com> - 20.25.5-1
+* Wed Oct 30 2013 Brian C. Lane <bcl@redhat.com> - 21.4-1
 - Fix up a couple more pylint errors. (clumens)
 - Add check for Linux HFS+ ESP on Mac (#1010495) (bcl)
 - Update bootDrive info when storage config updated in text-mode. (#861018)
   (sbueno+anaconda)
-- Revert "Don't show language twice for keyboard layouts (#1021907)" (vpodzime)
-- Ignore SIGINT (#1024793) (amulhern)
+- Remove the special handling for en (dshea)
+- Ignore SIGINT (#1024822) (amulhern)
 - Don't show language twice for keyboard layouts (#1021907) (petersen)
 - Make Software spoke ready even if there is no repo (#1010348) (vpodzime)
 - Use decorator for methods that invalidate base repo cache (vpodzime)
 - Use cache for base repo if possible (vpodzime)
 - Make sure to actually set the autopart flag when needed. (#1023554) (dlehman)
+- Fix Gtk errors about list store columns (dshea)
+- Fix the layout up and down button sensitivies. (dshea)
 - Fix the Gkbd spec string for layouts with no variant (dshea)
+- pylint wants regexes with backslashes to be specified with 'r'. (clumens)
+- Add ack flag checking to makebumpver (bcl)
+- Correctly accept 'sshd' boot arg as alias for 'inst.sshd' (#924157) (wwoods)
+- Only eject CDROM devices we're actually using (#949919) (wwoods)
 - mem may not exist when it's printed out in these error messages. (clumens)
 
-* Fri Oct 25 2013 Brian C. Lane <bcl@redhat.com> - 20.25.4-1
+* Fri Oct 25 2013 Brian C. Lane <bcl@redhat.com> - 21.3-1
 - Reset _proxyChange when a change is triggered (bcl)
 - Setup No Update checkbox correctly (#1016801) (bcl)
 - Fall back to closest mirror in source (#1016801) (bcl)
@@ -403,39 +1799,79 @@ update-desktop-database &> /dev/null || :
   (amulhern)
 - Avoid configure-event loops. (#1021511) (dshea)
 
-* Wed Oct 23 2013 Brian C. Lane <bcl@redhat.com> - 20.25.3-1
+* Wed Oct 23 2013 Brian C. Lane <bcl@redhat.com> - 21.2-1
 - remove signal disconnect (#996899) (bcl)
+- Re-saved every glade file with glade-3.16.0 (dshea)
+- Fix pylint errors in network.py. (clumens)
 - Always use decimal notation for Size specs (dshea)
+- network kickstart: add support for devices configured in %%pre (#1019796)
+  (rvykydal)
+- network gui: make Configure button insensitive when no ap is selected
+  (#1015212) (rvykydal)
+- Encode possible unicode objects before calling str() on them (vpodzime)
+- Fix a typo in function documentation (vpodzime)
 - Use more general status for installations from media (#1017703) (vpodzime)
 
-* Mon Oct 21 2013 Brian C. Lane <bcl@redhat.com> - 20.25.2-1
+* Mon Oct 21 2013 Brian C. Lane <bcl@redhat.com> - 21.1-1
 - Adds additional debug logging to yumpayload.py. (amulhern)
 - Handle invalid JSON in geoloc (#1021410) (dshea)
 - Revert "Only prompt for LUKS password if the user has chosen to configure
   automatically." (amulhern)
+- Add context support to check_accelerators (dshea)
+- Added translation contexts to the TUI. (dshea)
+- Added translation contexts to the GUI. (dshea)
+- Add support for context-based translations (dshea)
 - Reset checks on both password fields. (#1020580) (dshea)
 - Fix swaps added to fstab for noformat (gene)
 - Don't update hub's continue button and label for every spoke (#1020373)
   (vpodzime)
+- Add storage tests. (clumens)
+- Add option to select all hard drives in text mode. (#965580)
+  (sbueno+anaconda)
 - BootLoaderError should not reset storage (#1019541) (bcl)
 - Only prompt for LUKS password if the user has chosen to configure
   automatically. (amulhern)
+- Remove an unused string (dshea)
+- Translate AM and PM (dshea)
+- Translate strings marked as translatable (dshea)
 - network gui spoke: use GDBus to obtain list of settings (#1018467) (rvykydal)
+- network: look for device settings also based on DEVICE value (#1017788)
+  (rvykydal)
 - Fix liveinst to work with livemedia-creator (#1009711) (bcl)
+- Remove the button-label property on SpokeWindow. (clumens)
+- Log entering/exiting spokes and hubs in the GUI. (clumens)
+- Escape text inserted into markup strings (dshea)
+- Move markup out of translatable strings (dshea)
+- Move formating markup out of python where possible (dshea)
+- Use explicit children to set label attributes (dshea)
+- Turn on the image on the "Add a disk..." button. (dshea)
 
-* Wed Oct 16 2013 Brian C. Lane <bcl@redhat.com> - 20.25.1-1
-- New transifex branch for f20 (bcl)
-- Fix python-blivet buildrequires for new f20-branch version. (dlehman)
+* Wed Oct 16 2013 Brian C. Lane <bcl@redhat.com> - 20.26-1
+- Install bootloader to loop device in disk image installations. (#1019502)
+  (dlehman)
+- Don't try to configure a bootloader for s390 disk image installs. (#1019502)
+  (dlehman)
+- Fix initramfs generation for disk image installations. (#1019502) (dlehman)
 - Save mountpoints specified for existing btrfs volumes. (#892747) (dlehman)
+- Add a command line option for disabling friendly multipath names. (#977815)
+  (dlehman)
+- Remove en (dshea)
+- "Fix" the zSeries device filter "label" (dshea)
+- Replace placeholders with the strings from python (dshea)
+- Add and fix keyboard accelerators (dshea)
+- Check for labels with use_underline and no accelerator (dshea)
+- Support checking the translation of plural strings (dshea)
+- Specify a node id in check_accelerator exceptions (dshea)
 - BTRFS cannot hold swap, no need to care about fstab swaps (vpodzime)
+- Add ANACONDA_INSTALL_CLASSES to testenv.sh. (clumens)
+- Put a version on the DNF requirement. (clumens)
+- Revert "For now, ignore checking dnfpayload.py with pylint." (clumens)
 - Fix the alignment of the Network Time switch (#1019301) (dshea)
 - Tell blivet which swaps should appear in the fstab (#1011391) (vpodzime)
 - Put only newly created or reformated swaps to the new root (vpodzime)
 - Make code to get new devices reusable as property (vpodzime)
 - Grab journal only from the last boot (vpodzime)
 - DNFPayload: allow enable/disable calls for repos that do not exist. (ales)
-- network: look for device settings also based on DEVICE value (#1017788)
-  (rvykydal)
 - Add shell spoke to s390x installations (vpodzime)
 - Put TUI spokes in common categories (vpodzime)
 - MountpointSelector is a widget, set its property properly (#1013612)
@@ -1010,2042 +2446,4 @@ update-desktop-database &> /dev/null || :
   (mkolman)
 
 * Tue Jul 09 2013 Brian C. Lane <bcl@redhat.com> - 20.1-1
-
-* Thu May 23 2013 Brian C. Lane <bcl@redhat.com> - 19.30-1
-- Fix software selection in text UI. (#965974) (sbueno+anaconda)
-- Don't call _update_summary from within _add_disk_overview. (clumens)
-- getDisks should not return a list that has duplicates in it. (clumens)
-- Fix the rescan button (#929299). (clumens)
-- Let checkbox disable updates-testing (#962522) (bcl)
-- disable updates when method is set in ks (#952791) (bcl)
-- Fix string formatting on text UI storage spoke. (#965460) (sbueno+anaconda)
-
-* Tue May 21 2013 Brian C. Lane <bcl@redhat.com> - 19.29-1
-- Handle empty text in simpleline (bcl)
-- Fixup TUI source to work with kickstart (bcl)
-- Add missing disk_selection XML (#962012,#962631) (bcl)
-- Add ability for users to specify an installation source repo in text UI.
-  (sbueno+anaconda)
-- Add the ability to select software in text UI. (sbueno+anaconda)
-- Add 'refresh' option in TUI; lock users out of threads that aren't ready
-  (sbueno+anaconda)
-- Add 'software' category to TUI summary hub (sbueno+anaconda)
-- Only try to activate layouts if runtime system can be changed (vpodzime)
-- Be more defensive in handling layouts from kickstart (#963103) (vpodzime)
-- Return all layouts the XklWrapper knows about (#883555) (vpodzime)
-- Fix issue where FS selection not applied in text UI. (#964069)
-  (sbueno+anaconda)
-
-* Thu May 16 2013 Brian C. Lane <bcl@redhat.com> - 19.28-1
-- Remove testing leftover (#963503) (rvykydal)
-
-* Wed May 15 2013 Brian C. Lane <bcl@redhat.com> - 19.27-1
-- Partial fix for screen resize problems (#869364) (clumens)
-- Remove an extra call to page clicked handler from refresh. (#959722)
-  (dlehman)
-- Always run through the full storage spoke. (#960732) (dlehman)
-- Update apply button as appropriate after invoking dialogs. (#960254)
-  (dlehman)
-- Don't allow setting btrfs subvolumes' size. (#959723) (dlehman)
-- Drop btrfs-specific raid level "single" for non-btrfs. (#959688) (dlehman)
-- Update btrfs volume label when changing volume name. (#959727) (dlehman)
-- Don't allow setting labels for btrfs subvolumes. (#960601) (dlehman)
-
-* Wed May 15 2013 Brian C. Lane <bcl@redhat.com> - 19.26-1
-- Pressing Delete on custom part should remove the selected mountpoint.
-  (clumens)
-- Use the same text formatting on the langsupport spoke as on the welcome
-  spoke. (clumens)
-- Remove the now-unused LanguageMixIn. (clumens)
-- Do not BuildRequire python-bugzilla on RHEL (#953182) (dcantrell)
-- Don't require network configuration in Live DVD (#962485) (rvykydal)
-- Set default FS choice to LVM in text mode (#962600) (sbueno+anaconda)
-- Move udev rules generation to pre-trigger (#958924) (bcl)
-- Suggest names for btrfs mountpoints (bcl)
-- Use a method to reset current_selector (#959707) (bcl)
-- Fix non-default language being hidden in welcome spoke (mkolman)
-- Mark placeholder text in add addtnl keyboard screen as translatable.
-  (sbueno+anaconda)
-- Mark language search string translatable. (#955229) (sbueno+anaconda)
-- Remove the get_current_layout_name function (#895766) (vpodzime)
-- Add support for the realm command (mkolman)
-- Revert "Add support for the realm command" (mkolman)
-- Add support for the realm command (mkolman)
-- Support for getting NTP servers from DHCP (#862755) (mkolman)
-
-* Thu May 09 2013 Brian C. Lane <bcl@redhat.com> - 19.25-1
-- Change the buttons on the quit dialog. (clumens)
-- Add FONT=latarcyrheb-sun16 to /etc/vconsole.conf (vpodzime)
-- Use ntpdate instead of rdate (#950267) (vpodzime)
-- Add layouts with a country if not added with a language (#960569) (vpodzime)
-- Fixup xconf keymap code for text/dirinstall (bcl)
-- Bump pykickstart to 1.99.30 for liveimg support (bcl)
-- Add kickstart liveimg install command (bcl)
-- Make sure all threads are done before install (bcl)
-- Make sure stage1_disk isn't empty (#950487) (bcl)
-- Add /boot/efi to suggested mountpoints (#960677) (bcl)
-- Add extlinux command-line option. (mattdm)
-- Add extlinux as a bootloader type. (mattdm)
-- Bump the pykickstart requirement for the extlinux patches. (clumens)
-- Revert "Busy cursor when applying changes in the custom spoke" (mkolman)
-- Revert "Context manager for doing things with busied cursor" (mkolman)
-- Use the F19 bootloader class from pykickstart, for --extlinux (mattdm)
-- Transform bootloader --extlinux to extlinux command-line option (mattdm)
-- Rework the layout of the storage spoke for low resolution setups. (clumens)
-- Fix lower resolution display problems on the filter spoke. (clumens)
-- Don't show iscsi passwords when focused, either.  Enjoy typing blind.
-  (clumens)
-- Add a couple more things to .gitignore. (clumens)
-- Remove the bootloader class's obsoletes attribute. (clumens)
-- Disable sort indicators on the filter UI. (clumens)
-- Remove the Viewport from the disk shopping cart. (clumens)
-- Cleaning up some of the TUI storage code (sbueno+anaconda)
-- Add ability in TUI for users to select partitioning scheme. (sbueno+anaconda)
-- Use the firmware-provided language if it's something we support. (pjones)
-- Use systemd-localed for writing out xorg conf file (#958714) (vpodzime)
-- Busy cursor when applying changes in the custom spoke (vpodzime)
-- Make sure the "unbusy cursor" is used for the exception window (vpodzime)
-- Context manager for doing things with busied cursor (vpodzime)
-- Revert "Add signal handlers for controlling password entry visibility."
-  (#958608). (clumens)
-- Force a password to be set if option checked in TUI. (#927956)
-  (sbueno+anaconda)
-- Fix a minor display issue in TUI. (sbueno+anaconda)
-- hostname has dropped -v option (bcl)
-- Only override proxy and noverifyssl if specified (#880482) (bcl)
-
-* Fri May 03 2013 Brian C. Lane <bcl@redhat.com> - 19.24-1
-- Fix check for early exit from on_container_changed. (dlehman)
-- Add ability to manipulate container sizes directly. (dlehman)
-- Don't lock users who chose custom storage out. (dlehman)
-- Don't allow unhiding of hidden disks during disk image installs. (#956020)
-  (dlehman)
-- Add layout indicator to the LUKS passphrase dialog (vpodzime)
-- Add layout indicator to the BaseWindow (vpodzime)
-- LayoutIndicator widget (vpodzime)
-- self._password is set to None not "" initially (#958723) (vpodzime)
-- Use constants for protocol's order instead of magic numbers (vpodzime)
-- Support setting the name of a btrfs subvol (#892363). (clumens)
-- If there are errors processing the kickstart file early on, just print them.
-  (clumens)
-- Stop defining _, N_, and P_ all over the place. (clumens)
-- Fix a probably rare traceback in resizing from the custom part UI. (clumens)
-- Add methods to do some hiding/showing that we do several different places.
-  (clumens)
-- Make it more obvious which fields on custom part are editable (#958251).
-  (clumens)
-- Clean up some of the get_object usage in custom.py. (clumens)
-- Streamline DatetimeSpoke's timezone updating (#953311) (vpodzime)
-- Allow setting timezone on the map without signal (vpodzime)
-- Sensitivity of the date&time settings doesn't depend on timezone (vpodzime)
-- Give the RAID level label on custom a mnemonic widget. (clumens)
-- Give the hostname entry a keyboard shortcut. (clumens)
-
-* Mon Apr 29 2013 Brian C. Lane <bcl@redhat.com> - 19.23-1
-- Only check mandatory spokes in automated install (#956960,#895258) (bcl)
-- Add scratch-bumpver target (bcl)
-- Add Driver Update Disk repo handling to Anaconda (bcl)
-- Add Driver Update Disk support to anaconda-dracut (bcl)
-- Port driver update utilities from loader (bcl)
-- Fix a typo. (clumens)
-- Do not translate a blank window name. (clumens)
-- Add a separator under the default language on the welcome screen. (clumens)
-- Move the selected language to the top of the list on the welcome screen.
-  (clumens)
-- Remove the unused LanguageSpoke. (clumens)
-- Add the "Add FCoE" dialog (#903122). (clumens)
-- Allow enabling /etc/anaconda.repos.d repos like the docs say (#955724).
-  (clumens)
-- Move where the password quality checker is created (#956049). (clumens)
-- Allow multiple disk selection with Shift-click (#864707) (vpodzime)
-- Select all disks in the box with advanced storage as well (vpodzime)
-- Don't change DiskOverview's background on 'chosen' changed (vpodzime)
-- Fix number of arguments for languageGroups (liveDVD class) (#957038)
-  (rvykydal)
-- Apply some minor padding fixes on the container editing dialog. (clumens)
-- If no root password was given, lock root's account (#927922). (clumens)
-- Remove some unneeded boxes and alignments in the NTP config dialog. (clumens)
-- Default to using the iscsi discovery credentials for login, if provided.
-  (clumens)
-- langsupport spoke: keep data.lang.lang first in status of spoke (rvykydal)
-- Unpack property value returned by GDBus before using it (#956614) (rvykydal)
-- Don't traceback when no activated devices were found for ks network default
-  (#956614) (rvykydal)
-- Ask about VNC also in connecting state, not only connected (#952801)
-  (rvykydal)
-
-* Wed Apr 24 2013 Brian C. Lane <bcl@redhat.com> - 19.22-1
-- Container management improvements. (dlehman)
-- Include swap-related disk space needs in storage options dialogs. (#951269)
-  (dlehman)
-- Show the summary screen before the luks passphrase dialog. (dlehman)
-- Add language support spoke (#912364) (rvykydal)
-- Add kickstart lang --addsupport option (#912364) (rvykydal)
-- Add network --ipv6gateway kickstart option (#905226) (rvykydal)
-- Remove pre-18.0 history from anaconda.spec. (clumens)
-- Add free space information to DiskOverviews (#949746). (clumens)
-- Raise exception if our module fails to be imported (vpodzime)
-- Fix exception handling in rescue mode (vpodzime)
-- Select all disks when Ctrl+A is pressed (#864707) (vpodzime)
-- DiskOverview needs to grab focus if clicked (vpodzime)
-
-* Mon Apr 22 2013 Brian C. Lane <bcl@redhat.com> - 19.21-1
-- Set seen for lang from option & use constant for default (mkolman)
-- Hook the Geolocation module to Anaconda (mkolman)
-- Add geolocation module (mkolman)
-- Add logging to exception handling (vpodzime)
-- Run exception handling in the main thread also in TUI (vpodzime)
-- Update network ksdata with cmdline options (#893784) (rvykydal)
-- Return network devices actually activated (instead of just active) (#949002)
-  (rvykydal)
-- Don't traceback if we can't find PermHwAddr when looking for slaves (#949341)
-  (rvykydal)
-- Add support for iSCSI iface binding. (rvykydal)
-- Fix a traceback when handling node login authentication. (clumens)
-- Add a requirement on python-IPy now. (clumens)
-- Display individual buttons on the filter UI instead of a combo. (clumens)
-- Hook up authentication for iSCSI discovery and node login. (clumens)
-- When the clear button is clicked on the filter spoke, clear out the fields.
-  (clumens)
-- Remove the extra "Target LUN" search option. (clumens)
-- If all iSCSI nodes have been logged into, leave the dialog. (clumens)
-- Populate the port combo on the filter spoke's search page. (clumens)
-- Hook up filtering for iSCSI devices. (clumens)
-- Add initial iSCSI support to the advanced storage UI. (clumens)
-- Add a generic function to FilterPage for setting up a GtkComboBoxText.
-  (clumens)
-- self.disks -> self.pages in filter UI refresh method. (clumens)
-- Add a button to bring up the Add Additional dialogs. (clumens)
-- Remove pixmaps no longer needed by newui. (clumens)
-- Add a checkmark on a DiskOverview when it is selected. (clumens)
-- Make a couple UI modifications to the resize slider. (clumens)
-- Make several changes to how addons are displayed (#873498). (clumens)
-- Allow clicking on environment and addon text to toggle them (#928010).
-  (clumens)
-- Fix scrolling problems on the environment side of software selection
-  (#928008). (clumens)
-- Handle quit messages on the text progress UI hub (#895756). (clumens)
-- If there's an error while in text mode, display it. (clumens)
-- Force sizes on the network toolbar buttons (#951580). (clumens)
-- Disable the "Closest mirror" option if there's no fastestmirror plugin
-  (#876135). (clumens)
-- Move text UI summary hub setup into the setup method (#927315, #950956).
-  (clumens)
-- Bring the text storage spoke a little more in line with the graphical one.
-  (clumens)
-- Make a home directory for the user by default (#950792). (clumens)
-- Add some padding under the ransom notes on the progress hub. (clumens)
-- Remove a lot of ancient crud from the installclasses. (clumens)
-- Set the default fs type on RHEL (#951088). (clumens)
-- Add a Spoke.changed attribute. (clumens)
-- Display device names on MountpointSelectors (#888872). (clumens)
-- Add signal handlers for controlling password entry visibility. (clumens)
-- Ransom notes can be either PNGs or JPGs. (clumens)
-- dracut/parse-kickstart: handle network --mtu (wwoods)
-- Exclude a couple more password variables from dumps (bcl)
-- Enlightbox dialogs in the custom spoke (vpodzime)
-- Create and use GtkWindowGroup for our windows (vpodzime)
-- We can import Gtk globally now (vpodzime)
-- Handle both types of data we can get from libxklavier (#950921) (vpodzime)
-
-* Tue Apr 16 2013 Brian C. Lane <bcl@redhat.com> - 19.20-1
-- Fix two more syntax errors in the custom spoke. (#952662) (dlehman)
-
-* Mon Apr 15 2013 Brian C. Lane <bcl@redhat.com> - 19.19-1
-- Show device size with full precision to avoid spurious resize. (#951276)
-  (dlehman)
-- Fix another typo (old_fstype->old_fs_type). (#951593) (dlehman)
-- Fix typo encryption_changed->changed_encryption. (#950700) (dlehman)
-- Remove some remnants of old multipath code. (#951259) (dlehman)
-- Protect the block device containing the stage2 image. (dlehman)
-- Clarify code for iutil.get_active_console() etc. (wwoods)
-
-* Thu Apr 11 2013 Brian C. Lane <bcl@redhat.com> - 19.18-1
-- Revert "Revert "Don't emit "gfxterm" in grub2 configs (#821355)"" (pjones)
-- Make "s" a hotkey for "Save Changes" on Advanced User Configuration. (pjones)
-- Clean up tracebacks saved in pstore space (#950709) (pjones)
-- Move anaconda-yum to /usr/libexec/anaconda/ (bcl)
-- Cleanup: remove dead upgrade code (wwoods)
-- Fix console= persistence, remove serial (#928269) (wwoods)
-- Revert "Don't emit "gfxterm" in grub2 configs (#821355)" (pjones)
-- Disable grub2-mkconfig's submenus by default. (pjones)
-- Don't emit "gfxterm" in grub2 configs (#821355) (pjones)
-- updates to boot-options.txt (wwoods)
-- flags.py: remove unused flags (wwoods)
-- remove flags.virtpconsole (wwoods)
-- Call os.chdir("/") after calling os.chroot (vpodzime)
-
-* Tue Apr 09 2013 Brian C. Lane <bcl@redhat.com> - 19.17-1
-- Pass open file to execWithRedirect for vncpasswd (#948638) (bcl)
-- Fix ip= saving in parse-kickstart (hamzy)
-- Fix initial raid level when switching to a raid-capable device type.
-  (dlehman)
-- The raid level combo cannot be not sensitive for preexisting devices.
-  (dlehman)
-- Make sure fstype combo is not sensitive for btrfs devices. (dlehman)
-- Add an entry to the raid level combo for btrfs' single. (dlehman)
-- Clean up _save_right_side and adapt to changes in blivet.devicefactory.
-  (dlehman)
-- Remove anaconda's udev rules. (dlehman)
-- Add requires for some things that aren't strictly required by blivet.
-  (dlehman)
-- Parent's finalize method needs self (vpodzime)
-- Use Sphinx syntax for docstrings (vpodzime)
-- Use None for unbounded size requests. (dlehman)
-- Disable yum lock debugging for the final release. (clumens)
-- The source spoke should display something nicer than "Not ready" (#948112).
-  (clumens)
-- Don't run storage execution in an endless loop (#948331, #948285). (clumens)
-- If an incorrect source is given for a ks install, don't fallback (#948212).
-  (clumens)
-- Fix a bug when creating a new mountpoint with no given size (#948228).
-  (clumens)
-- memInstalled has moved (#947261). (clumens)
-- Correctly report an error if OSError is hit when setting up the source
-  (#947634). (clumens)
-- Add anaconda-yum to %%files (bcl)
-
-* Thu Apr 04 2013 Brian C. Lane <bcl@redhat.com> - 19.16-1
-- Modify LocaledWrapper to use our safe_dbus module (#928287) (vpodzime)
-- Add module providing safe DBus operations (vpodzime)
-- Define a DEFAULT_DBUS_TIMEOUT constant and use it (vpodzime)
-- Execute the yum transaction in another process (bcl)
-- Add anaconda-yum (bcl)
-- Add execReadlines utility (bcl)
-- Use namedtuple instead of our magic tuples (vpodzime)
-- Tell python-meh architecture of the anaconda package (vpodzime)
-- Add release number to the result of getAnacondaVersion (vpodzime)
-- Fix _isys.so location in the updates.img (vpodzime)
-- Network spoke: Fix reading of device type from combobox (#947120) (rvykydal)
-
-* Tue Apr 02 2013 Brian C. Lane <bcl@redhat.com> - 19.15-1
-- Fix two small problems with the UID/GID spin buttons (#929173, #929138).
-  (clumens)
-- The Update Settings button should only be sensitive if you change something.
-  (clumens)
-- Move datetime spoke initialization into its own thread, too. (clumens)
-- Make it more clear nothing will happen immediately on custom storage
-  (#883195). (clumens)
-- Replace the custom part size spinner with an entry. (clumens)
-- Add a factory class for our various communications queues. (clumens)
-- Make exception handling in the rescue mode work (#926913) (vpodzime)
-
-* Thu Mar 28 2013 Brian C. Lane <bcl@redhat.com> - 19.14-1
-- Handle the end of the %%addon section (vpodzime)
-- Don't allow setting a mountpoint for an fstype we cannot mount. (dlehman)
-- Fix a bug I introduced with 3c78c1a5c. (clumens)
-- Get rid of the customization expanders on custom partitioning. (clumens)
-- Translate the "Create a new volume group..." text (#892782). (clumens)
-- Move the Desired Capacity label and spinner into its own row (#907883,
-  #904999). (clumens)
-- move Xorg test up so we might start vnc instead (hamzy)
-- Set word wrapping on the label telling you how to switch layouts (#924885).
-  (clumens)
-- gtk_thread_wait -> gtk_action_wait in custom.py (#926926). (clumens)
-- Support multiple values for kicstart network --namserver= in dracut (#917481)
-  (rvykydal)
-- get_widget -> get_object (#927898). (clumens)
-- THREAD_* constants are in pyanaconda, not pykickstart. (clumens)
-- Network spoke: fix model access thinko in Add device dialog (rvykydal)
-- Use constants for thread names (mkolman)
-- Move network connection timeout from network to constants (mkolman)
-- udev-settle.service is now systemd-udev-settle.service (wwoods)
-- Add boot-options.txt (wwoods)
-
-* Fri Mar 22 2013 Brian C. Lane <bcl@redhat.com> - 19.13-1
-- Set Tip text on the create user spoke. (dcantrell)
-- Use space instead of underscore when user uses the timezone name (#924352)
-  (msivak)
-- Use only self.data in TUI timezone spoke's status (msivak)
-- Use the named tuple in root password dialog (#924138) (msivak)
-- Add message instructing users they can type to search for language.
-  (sbueno+anaconda)
-- Don't unbusy the cursor until the first action is ready to display. (clumens)
-- Move custom storage setup into its own thread. (clumens)
-- When you turn off NTP, clear the warning along the bottom of the screen.
-  (clumens)
-- If the disk has no serial number, don't give the DiskOverview a popup.
-  (clumens)
-- Reorder the columns on the shopping cart so name is next to description.
-  (clumens)
-- Add device node names to the resize dialog as a new column. (clumens)
-- Use an emblem for indicating spokes have not been completed. (clumens)
-- If you remove all the disks in the shopping cart, disable the buttons.
-  (clumens)
-- Apply a style to the network spoke's toolbar. (clumens)
-- Add a little more space between the updates checkbox and the add repo stuff.
-  (clumens)
-- Remove the partition scheme expanders. (clumens)
-- Don't error out if a ks %%include is missing when looking for sshpw
-  (#923627). (clumens)
-- Do not guess username immediately when user clears it (#924184) (msivak)
-- Do not require password when no user is requested (#924150) (msivak)
-- Refresh the checkboxes on AdvancedUser dialog properly (#924257) (msivak)
-- Allow setting the default GID of the new user. (msivak)
-- Add call to new-kernel-pkg --rpmposttrans (#922988) (bcl)
-- Make our gtk_* decorators safer and more intelligent (vpodzime)
-- Add method for checking if in main thread to the ThreadManager (vpodzime)
-- Port the mandatory logic for User and Password spokes from GUI to TUI
-  (msivak)
-- Use only self.data to determine completeness in User spoke (msivak)
-- Make firstboot kickstart command aware of initial-setup (msivak)
-- Add command and data updates to AnacondaKSHandler's __init__ (msivak)
-
-* Tue Mar 19 2013 Brian C. Lane <bcl@redhat.com> - 19.12-1
-- _model -> model in filter.py. (clumens)
-- Add some documentation to FilterPage. (clumens)
-- Add the advanced storage UI and hook it up. (clumens)
-- Don't wrap the DO creation in gtk_thread_wait. (clumens)
-- Add a button to the specialized window to bring up the add dialog. (clumens)
-- Filter out multipath devices from the getDisks results. (clumens)
-- Reduce duplicated code between the GUI and TUI. (clumens)
-- Set the horizontal and vertical scales to what we want. (clumens)
-- Move DiskOverview creation out into its own method. (clumens)
-- Add a slot on the storage spoke for display of advanced storage. (clumens)
-- Log the actual exception for getPackage (bcl)
-- Add the addon repos from a repo's treeinfo file (bcl)
-- Disable failed repos, not remove them (bcl)
-- Add repo addon to source spoke (bcl)
-- Remove the previous addon repo code and UI (bcl)
-- Addon repo glade changes (bcl)
-- Enable updates repo by default (bcl)
-- Adjust _getTreeInfo so that proxy_url can be passed (bcl)
-- Add enable flag to RepoData object (bcl)
-- Modify repo interface in packaging (bcl)
-- Change the source DiskOverview to a label (bcl)
-- Display the reason for payloadInstallHandler error (bcl)
-
-* Mon Mar 18 2013 Brian C. Lane <bcl@redhat.com> - 19.11-1
-- Don't create temporary lists if not needed (vpodzime)
-- Fix reclaiming disk space for non-us installations. (rvykydal)
-- Allow for raising thread exceptions when threadMgr.get is called (bcl,
-  clumens). (clumens)
-- Hook up the new refresh dialog. (clumens)
-- Add a dialog prompting the user to refresh anaconda's view of storage.
-  (clumens)
-- Add a refresh button to the custom partitioning toolbar. (clumens)
-- Add a reset button to the bottom right of the custom spoke. (clumens)
-- Hook up the new action summary dialog. (clumens)
-- Add a summary screen of actions to be performed on all disks. (clumens)
-- Catch error when incorrect nfs address entered (sbueno+anaconda)
-- Use GDBus also for connection settings update. (rvykydal)
-- Network spoke: improve message format parametrization for translators
-  (rvykydal)
-- Don't set ibft device renaming for dracut, let it just do its job (#828505)
-  (rvykydal)
-- Mark Timezone selection as firstboot spoke (msivak)
-- Add user creation spoke to TUI (msivak)
-- Refactor TUI password spoke to use the declarative EditTUISpoke (msivak)
-- Use guess_username from pyanaconda.users in gui.spokes.UserSpoke (msivak)
-- Add declarative EditTUISpoke (msivak)
-- Allow modyfying exit question in TUI (msivak)
-- Return False from TUI.run() if it was exited prematurely (msivak)
-- Add guess_username function to users.py (msivak)
-- Mark incomplete mandatory spokes in text mode (msivak)
-- Network spoke: move formatting parameters out of translation function
-  (rvykydal)
-- Network spoke: add keyboard accelerator to add device combobox (#906263)
-  (rvykydal)
-- Network spoke: don't decorate add_device_dialog (#906263) (rvykydal)
-- Don't pass undefined stdout from execWithCapture. (rvykydal)
-- Network spoke: import network module instead of list of too many functions
-  (rvykydal)
-- Vlan support: kickstart (#906272) (rvykydal)
-- Vlan support: generate kickstart (#906272) (rvykydal)
-- Vlan support: GUI - hub status information (#906272) (rvykydal)
-- Network spoke: check whether added network device is already in list
-  (#906272) (rvykydal)
-- Vlan support: GUI - add "Vlan ID" and "Parent" to vlan tab (#906272)
-  (rvykydal)
-- Return correct nm_device_setting_value for bonds and vlans (#906272)
-  (rvykydal)
-- Vlan support: GUI - show vlan devices (#906272) (rvykydal)
-- Vlan support: GUI - add "Parent" and "Vlan ID" info (glade) (#906272)
-  (rvykydal)
-- Vlan support: GUI - add vlan device (glade) (#906272) (rvykydal)
-- Show that password was set by kickstart in TUI (msivak)
-- Add settable quit message to TUI (msivak)
-- Check _current_action for not being None before using it (vpodzime)
-
-* Mon Mar 11 2013 Brian C. Lane <bcl@redhat.com> - 19.10-1
-- Bonding support: GUI - hub status information (#906263) (rvykydal)
-- Bonding support: GUI - generate kickstart network command for bonds (#906263)
-  (rvykydal)
-- Bonding support: GUI - add device dialog (#906263) (rvykydal)
-- Bonding support: GUI - add device dialog (glade) (#906263) (rvykydal)
-- Bonding support: GUI - device list, configuration and adding bond (#906263)
-  (rvykydal)
-- Bonding support: GUI - Slaves line in Wired tab (glade) (#906263) (rvykydal)
-- Crypt the root we get from the user (#918991). (jkeating)
-- Adapt to the new libxklavier's behaviour (vpodzime)
-- We use python-meh's interfaces instead of Anaconda's (vpodzime)
-- Redraw screen in case of valid input and nothing new scheduled (vpodzime)
-- Fix two places where we are locking up the main thread (#886680). (clumens)
-- Log when we acquire and release the _yum_lock (dlehman, clumens). (clumens)
-- Do not fail when the logging stream cannot be opened (in initial-setup..)
-  (msivak)
-- Mark DateTime spoke as usable for Firstboot (msivak)
-- Fix a missing import and move the addon KS output template (msivak)
-- Make the TUI mainloop more resistant to screen implementation errors (msivak)
-- Teach TUI how to react on async events (msivak)
-- Could not load UI file advanced_user.glade (hamzy)
-- Don't try to remove the timer when it's None (DatetimeSpoke) (vpodzime)
-- Log failed imports in the collect functions (vpodzime)
-- remove the remnants of sparc support (dennis)
-- Remove installmethod.py (dead code) (wwoods)
-- Make default media eject behavior match old behavior (wwoods)
-- Silence "cp: cannot stat '/etc/cmdline'..." error message (wwoods)
-
-* Fri Mar 01 2013 Brian C. Lane <bcl@redhat.com> - 19.9-1
-- Behave nice when root password is set by kickstart (msivak)
-- Password spoke is mandatory if the created user is not an admin (msivak)
-- Use the user data provided by kickstart (msivak)
-- Add the User creation spoke including the Advanced dialog (msivak)
-- Bonding support: kickstart (rvykydal)
-- Condense some duplicated and overly wordy code in custom.py. (clumens)
-- Add a new allMembers property that returns a list of pages and members.
-  (clumens)
-- All Pages have a title, so get rid of the getattr games. (clumens)
-- Allow more than one Page to be expanded at a time. (clumens)
-- Get rid of the currentPage method. (clumens)
-- Promote page._members to page.members. (clumens)
-- Require passing the title to a Page's constructor. (clumens)
-- Pressing F12 should do the same thing as clicking "Done" (#840998). (clumens)
-- A bunch more "install" -> "installation" changes. (clumens)
-- When the user clicks "Reclaim Space", go back to the hub (#911792). (clumens)
-- Modify the logic that makes the reclaim button sensitive (#911793). (clumens)
-- Add a free space line under every disk in the reclaim dialog. (clumens)
-- Remove the initial sentence from the top of the reclaim dialog (#911793).
-  (clumens)
-- Fix a traceback in verifying optical media on the source spoke. (clumens)
-- Revert "Hook up the "Remove Packages" button on the dep solving error
-  screen." (#905899). (clumens)
-- Don't display "(null)" as a MountpointSelector's mountpoint. (clumens)
-- dracut: add anaconda-pre-shutdown.sh to fix eject (#809920) (wwoods)
-- Continue booting when checkisomd5 is aborted (#891551) (bcl)
-- Fix ksdevice=<MAC> - instead of renaming the device to ksdev0 just use it
-  (rvykydal)
-- Add pigz to initrd.img (wwoods)
-- Use %%_prefix macro value when calling configure in makeupdates (vpodzime)
-- Try to import modules the standard way first in collect (msivak)
-
-* Thu Feb 21 2013 Brian C. Lane <bcl@redhat.com> - 19.8-1
-- Add more stuff to the exception reporting skip list. (clumens)
-- Compare Sizes to Sizes in the reclaim dialog (#913484). (clumens)
-- The disk cart summary does not need a mnemonic. (clumens)
-
-* Wed Feb 20 2013 Brian C. Lane <bcl@redhat.com> - 19.7-1
-- Fix RAID level test (bcl)
-- unpack product.img to /updates (#911873) (bcl)
-- If you attempt to search on the network device pane, don't crash. (clumens)
-- Don't treat the _ in x86_64 as a mnemonic. (clumens)
-- If you set_markup, the label forgets set_use_underline from glade. (clumens)
-- Don't try to update spokes that are indirect. (clumens)
-- If you cannot reclaim more space, don't show the reclaim radio (#911791).
-  (clumens)
-- Swap the order of the part scheme combo and encryption checkbox. (clumens)
-- Fix for the addons kickstart support (vpodzime)
-- kickstart.py needs udev that now lives in blivet (vpodzime)
-- Refactor pieces of the Datetime spoke and move some parts to kickstart.py
-  (vpodzime)
-- Set ONBOOT=no for default autoconnections (#905918, #886090) (rvykydal)
-- Don't use "type" to name a variable. (rvykydal)
-- Update all spokes on a Hub when spoke is exited (msivak)
-- Wait for continueButton in KS mode if the user changed anything (msivak)
-- Fix up word wrap on the DetailedErrorDialog. (clumens)
-- Display storage warnings, similar to how errors are displayed (#909410).
-  (clumens)
-- Fix reprompting and screen redrawing on invalid input (vpodzime)
-- Refresh addons_paths once we know if gui or tui takes place (vpodzime)
-- Fixup anaconda.spec (bcl)
-
-* Thu Feb 14 2013 Brian C. Lane <bcl@redhat.com> - 19.6-1
-- fix uuid reference in parse-kickstart (bcl)
-- Fixup kickstart script logging (bcl)
-- Tell libreport the crash happened in Anaconda (#885690) (vpodzime)
-- Restore older behavior regarding ks argument without a file name (#910550).
-  (clumens)
-- Move the encryption checkbox to the dialog (bcl)
-- re-fetch metadata when proxy settings change (bcl)
-- Apply some fixes to the spec file (#909592, metherid (clumens)
-- install -> installation in a couple user-visible strings. (clumens)
-- Restore support for partial kickstart files (#887254). (clumens)
-- Get rid of packagesSeen. (clumens)
-- Remove debugging print (DatetimeSpoke) (vpodzime)
-- Honor modules' __all__ when doing collect (msivak)
-- Use ksdata.addons instead of ksdata.addon and add ADDON_PATHS to sys.path
-  (vpodzime)
-- Remove unused modules (dbus) and stuff from network.py (rvykydal)
-- Replace get_NM_connection() using new nm module. (rvykydal)
-- Replace get_NM_settings_value() using new nm module (rvykydal)
-- Replace nmIsConnected() using new nm module (rvykydal)
-- Replace hasActiveNetDev() using new nm module (rvykydal)
-- Replace getDevicesProperies() using new nm module (rvykydal)
-- Replace getIPAddresses() using new nm module (rvykydal)
-- Replace getMacAddress() using new nm module (rvykydal)
-- Replace isWirelessDevice() using new nm module (rvykydal)
-- Replace getLinkStatus() using new nm module (rvykydal)
-- Replace getActiveNetDevs() using new nm module (rvykydal)
-- Replace getDevices() using new nm module (rvykydal)
-- Move NM dbus calls to separate module. (rvykydal)
-- Move networking functions from isys to network module. (rvykydal)
-- Remove unused stuff from network.py (rvykydal)
-- Remove unused networking stuff from isys (rvykydal)
-- Network spoke: remove unused NM path and interface constants (rvykydal)
-- Add 'eject' to the anaconda initramfs (wwoods)
-- Ensure hookdir exists before creating eject script (wwoods)
-- remove anaconda-cleanup-initramfs.service (wwoods)
-- Add dracut/save-initramfs.sh (wwoods)
-- Bring back the askmethod parameter (#889887). (clumens)
-- Add a new selectorFromDevice method to the accordion. (clumens)
-- The storage logger is now the blivet logger. (dlehman)
-- DeviceFactory has moved from blivet to blivet.devicefactory. (dlehman)
-
-* Fri Feb 08 2013 Brian C. Lane <bcl@redhat.com> - 19.5-1
-- Add --dirinstall command (bcl)
-- Convert the mount point entry to one containing a drop down. (clumens)
-- Move the Modify SW button into a link in the text. (clumens)
-- Rework all the dialogs after you click Done on the storage spoke (#903501).
-  (clumens)
-- Overrides for the Gdk have _2BUTTON_PRESS defined (vpodzime)
-- Add entries with completions to the comboboxes (DatetimeSpoke) (vpodzime)
-- Make the custom partitioning bullet points take up less horizontal space.
-  (clumens)
-- Don't say you can reuse existing mountpoints unless there are some. (clumens)
-- Point gobject-introspection at our updates directory for overrides. (clumens)
-
-* Mon Feb 04 2013 Brian C. Lane <bcl@redhat.com> - 19.4-1
-- Remove libcurl requirement from configure.ac. (dlehman)
-- DMI_CHASSIS_VENDOR has moved into blivet. (dlehman)
-
-* Fri Feb 01 2013 Brian C. Lane <bcl@redhat.com> - 19.3-1
-- unpack product.img to correct location (#869098) (bcl)
-- Fix including _isys.so and isys/__init__.py in updates.img (vpodzime)
-- Fix typo "DHCPV6" (rvykydal)
-- Don't crash on wireless connections created in Live CD desktop (#895736)
-  (rvykydal)
-- Adapt ifcfg -> ksdata mapping to NM change from IPADDR to IPADDR0. (rvykydal)
-- Fix static and dhcp of network --ipv6 command (set IPV6_AUTOCONF=no)
-  (rvykydal)
-- NM defaults to IPV6_AUTOCONF=yes (rvykydal)
-- Fix up spacing on installation options dialog buttons a little bit. (clumens)
-- Ignore double clicks on the DiskOverviews (#902467). (clumens)
-- When the user creates a new mountpoint, display it by default (#886039).
-  (clumens)
-- Add device node name information to the storage spoke and disk cart
-  (#902617). (clumens)
-- Do not include disks that have 0 size (#903131, #904977). (clumens)
-- Preserve the state of the Customize... expanders on custom storage (#883134).
-  (clumens)
-- Make it a little more clear what's happening on the disk selection spoke
-  (#903498). (clumens)
-- Move Xorg to vt7 (bcl)
-- Network: read ipv6 configuration type from NM settings instead of ifcfg file
-  (rvykydal)
-- Don't fail on missing ifcfg file when setting default ONBOOT (#904817)
-  (rvykydal)
-- Don't fail on invalid network --device kickstart specification. (rvykydal)
-- Ignore ipv6 for a device (IPV6INIT=no) only for noipv6 option. (rvykydal)
-- Network: fix disabling of ipv6 (noipv6 option) (rvykydal)
-- Stop writing /etc/sysconfig/network (#895900) (rvykydal)
-- We dont create missing ifcfg files on our own in anaconda anymore. (rvykydal)
-- Use NM dbus interface to modify ifcfg configuration (#893892) (rvykydal)
-- Document FileSystemSpaceChecker. (clumens)
-- Add the customization category to POTFILES.in. (clumens)
-- Add a license and overview to the g-i overrides file. (clumens)
-- Create/clarify some documentation in the custom widgets. (clumens)
-- Condense string formatting in a couple custom widgets. (clumens)
-- Remove the widget-specific TODO list. (clumens)
-- Add selinux to the list of parameters we pass on (#895860). (clumens)
-- Display error status messages in a darker red color. (clumens)
-- Add newline at the end of xorg.conf generated from ksdata (vpodzime)
-- Move pyanaconda.packaging.get_mount_* into blivet.util. (dlehman)
-- Remove obsolete references to simpleFilter. (dlehman)
-- Remove the storage module and replace it with blivet. (dlehman)
-- Move tsort, platform, and baseudev into storage. (dlehman)
-- Start laying groundwork for splitting storage out of pyanaconda. (dlehman)
-- Remove anaconda flag checking from OpticalDevice.eject. (dlehman)
-- Remove unused functions and move storage-specific utils to storage. (dlehman)
-- Remove installclass arch filtering. (dlehman)
-- Handle sending program output to tty5 through the logging setup. (dlehman)
-- Use dumpe2fs output to determine dirty fs. (dlehman)
-- Remove filesystem migration code. (dlehman)
-- Use threadMgr.wait to check threads (bcl)
-- Add error reporting to threadMgr (bcl)
-
-* Fri Jan 25 2013 Brian C. Lane <bcl@redhat.com> - 19.2-1
-- Use only one large grid for the hubs. (clumens)
-- Indicate nothing will happen until "Begin Installation" is clicked (#883195).
-  (clumens)
-- Exit anaconda correctly on SIGTERM (vpodzime)
-- Move communication module to pyanaconda/ui (vpodzime)
-- Function getDefaultHostname was renamed some time ago. (rvykydal)
-- Use constant for default hostname ("localhost.localdomain" currently)
-  (rvykydal)
-- Make update_hostname function do just one thing - update ksdata. (rvykydal)
-- Rename wait_for_dhcp pieces to say what they actually do (rvykydal)
-- Initialize network synchronously (#902090) (rvykydal)
-- xgettext wants "utf-8", not "utf8".  Python doesn't seem to care. (clumens)
-- On the storage spoke, only show the summary button if a disk is selected.
-  (clumens)
-- Add text letting people know they can use existing filesystems (#883150).
-  (clumens)
-- Default to mirrored RAID instead of striped (#888867). (clumens)
-- Replace the RAID level checkboxes with a single combo box. (clumens)
-- Don't allow mountpoints to start with /proc or /sys either. (clumens)
-- Add 'nmcli dev list' output to data gathered after crash (vpodzime)
-- Add lsblk output to data gathered after crash (#879940) (vpodzime)
-- Cleanup some trailing whitespace on otherwise empty lines (vpodzime)
-- Refactor and cleanup exception handling pieces (vpodzime)
-- Exception handling for text mode (#865325) (vpodzime)
-- python-meh's saveExceptionWindow no longer uses the accountManager (vpodzime)
-- Enable line wrapping in a couple more places (#901551). (clumens)
-- Support /boot on RAID metadata version 1.2 (#896163). (clumens)
-- Don't check memory for rescue mode (#895948). (clumens)
-- Split __init__ and setup in TUI screens so we can set the environment and
-  search paths (msivak)
-- Add a requirement on device-mapper-multipath (#895973) (msivak)
-- Update default fs type code (#855401). (clumens)
-- Display the background gradient image from a map signal handler. (clumens)
-- Remove the old cmdline and script interfaces. (clumens)
-- anaconda-cleanup doesn't use an interface at all. (clumens)
-- Remove the old text mode UI. (clumens)
-- Move constants_text out of the textw directory. (clumens)
-- Remove more references to system-config-*. (clumens)
-- Add device NM_DEVICE_TYPE_ETHERNET to isys (#893892) (rvykydal)
-- Dump missing ifcfg ifles only for ethernet devices (#893892) (rvykydal)
-- Take over dhcp connection by NM for network root (eg nfs) (#883451, #893656)
-  (rvykydal)
-- Use DEFAULT_LANG instead of magic value "en_US.UTF-8" (vpodzime)
-- fixup spec with 19.1 commits (bcl)
-
-* Mon Jan 14 2013 Brian C. Lane <bcl@redhat.com> - 19.1-1
-- Rework the reclaim dialog to have a resize slider. (clumens)
-- g_type_init call is no longer needed (bcl)
-
-* Fri Jan 11 2013 Brian C. Lane <bcl@redhat.com> - 18.40-1
-- Prepare structures to save spoke completenes for firstboot and GIE (msivak)
-- Do not call exit at the end of GUI interface, just quit the main loop
-  (msivak)
-- Improve handling of .py and .pyc equivalence while collecting classes
-  (msivak)
-- Set default language to en_US.UTF-8 (#891379) (msivak)
-- Set the local hostname during installation (vpodzime)
-- Refactor and cleanup our localization module (vpodzime)
-- Network spoke: use correct state value to display device status. (rvykydal)
-- drop fcoe-utils dependency for s390x (rhbz#894025) (sbueno+anaconda)
-- More TODO list wrangling. (clumens)
-- On storage, remove the "Continue" button and make "Done" do it all (#882737).
-  (clumens)
-- getLUKSPassphrase is no longer used, so kill it. (clumens)
-- "Hub" shouldn't be in the title for any text mode hub. (clumens)
-- Do not lightbox any dialogs on the custom storage spoke (#875291). (clumens)
-- Revert "Do not lightbox the Add Mountpoint dialog (#875291)." (clumens)
-- Don't allow changing a VG name to empty in the VG editor (#892395). (clumens)
-- Check country_layouts is not None when using it (#893026) (vpodzime)
-- Don't redownload payload from closest mirror only if we actually have some
-  (#892665) (rvykydal)
-- Remove some modules obsoleted by the packaging module. (dlehman)
-- Prefer country over language when returning default layout (#867110)
-  (vpodzime)
-- Fix Quit button in standalone network spoke (#892120) (rvykydal)
-- Network spoke: add sanity check for hostname setting (#856456) (rvykydal)
-- Network spoke: add hostname setting (#856456) (rvykydal)
-- Fix completeness check for md fwraid arrays. (#892621) (dlehman)
-- Fix handling of failure to create a new container. (#892046) (dlehman)
-- Force disk selection for interactive installs. (#888293) (dlehman)
-- Mark another string for translation (#892760). (clumens)
-- Do not lightbox the Add Mountpoint dialog (#875291). (clumens)
-- Strip out pango markup before attempting to match languages (#892463).
-  (clumens)
-- Mark the live progress hub message for translation (#892069). (clumens)
-- Allow deleting whole disks using the reclaim dialog (#880686). (clumens)
-- Don't allow mountpoints to start with /dev (#891447). (clumens)
-- Disable the configure button for pre-existing devices (#888296). (clumens)
-- Add keyboard mnemonics to the spoke selectors, too. (clumens)
-- Add keyboard accelerators to a whole lot of widgets (#864964). (clumens)
-- Try fallback if none exactly matching language is found (#891487) (vpodzime)
-- Only skip welcome screen for ks installs (#891755) (bcl)
-- protect getDirSize from vanishing files (#891759) (bcl)
-- start vnc without ip address (#832510) (bcl)
-- Update physical device's sysfs path for btrfs (sub)volumes. (#891443)
-  (dlehman)
-- Wrap text on the updates checkbox to fix screen placement (#888880).
-  (clumens)
-- The return value from execWithRedirect is an int (#891313). (clumens)
-- Add placeholder names to a couple strings (#890157). (clumens)
-- Fix multiple copies of spokes appearing from update image (msivak)
-- Import pyanaconda.addons in the anaconda script (vpodzime)
-- Update the API which controls where should spokes be displayed (msivak)
-- Update the way we look for glade files, spokes, hubs and categories (msivak)
-- Make screenshot routines reusable in Firstboot (msivak)
-- Do not fail when missing directories are present in addon paths (msivak)
-- Pass addons paths to user interfaces (msivak)
-- hook up help window close button (#889570) (bcl)
-- add setKeyboardCheckButton to list of things to translate (#889352) (bcl)
-- Mark for translation and show translated some more GUI elements (#877658)
-  (vpodzime)
-- Translate storage errors (#877658) (vpodzime)
-- Don't allow changing the boot disk from inside the custom spoke. (#889585)
-  (dlehman)
-- Add help text and a help button to the custom storage spoke. (#889570)
-  (dlehman)
-- Allow /boot on btrfs subvol if using grub2. (#888603,868465) (dlehman)
-- Don't keep old device name when switching to btrfs in custom. (dlehman)
-- Fix container member set management for md arrays. (#889101) (dlehman)
-- Include incomplete devices when listing dependant devices. (#889330)
-  (dlehman)
-- Use systemd to run checkisomd5 (#874486) (harald)
-- fixup direct nfs iso url handling (#879187) (bcl)
-- fixup nfs repo install code (#879187) (bcl)
-
-* Wed Dec 19 2012 Brian C. Lane <bcl@redhat.com> - 18.39-1
-- Add more yum locking to yumpayload (#860022) (bcl)
-- The percent bar can go in the same column as the space label. (clumens)
-- Don't resize NTFS partitions to smaller than the filesystem on them
-  (#885912). (clumens)
-- Remove some unused error handling code from old UI. (clumens)
-- Don't generate ifcfg files for non-existing devices in parse-kickstart
-  (#886647) (rvykydal)
-- Encode unicode strings returned by pytz.country_timezones() (#887236)
-  (vpodzime)
-- Always set passphrase for newly encrypted devices. (#888560) (dlehman)
-- Handle edit of preexisting encrypted lv. (#885378) (dlehman)
-- Raise DeviceError instead of ValueError from device ctor. (#888089) (dlehman)
-- Set line wrap on the info bar (#888112). (clumens)
-- Don't crash when vg edit triggers spurious change event. (#883699) (dlehman)
-- Add handling for incomplete lvm/md devices. (#876441) (dlehman)
-- Fallback to mdN if no name was found for incomplete md array. (#873224)
-  (dlehman)
-- Add product.py to POTFILES (#858628). (clumens)
-- Sort categories in GUI alphabetically (msivak)
-- Fix typo in variable name (msivak)
-- Collect addon paths properly (msivak)
-- Move the import constants line below setupPythonUpdates (msivak)
-- Only close AddLayout dialog on double-click if something is selected
-  (#887371) (vpodzime)
-- Add warning to keyboard spoke on live installations (#886463) (vpodzime)
-- Split ksdata execute and setup methods for addons (msivak)
-- Add support for KS %%addon section and the API+code to use it (msivak)
-- Import collected modules only once (msivak)
-- Update run-spoke to use paths (msivak)
-- Export QuitDialog and it's message string (msivak)
-- Update the hack we use to preload AnacondaWidgets - we need to load the
-  typelib not just the .so file (msivak)
-- Add FirstbootMixIn (msivak)
-- Move the path definitions to Interface and pass it to the Hubs from there
-  (msivak)
-- Make TUI ready for getting spokes from multiple directories (msivak)
-- Make GUI more reusable and support multiple directories for spokes and
-  categories (msivak)
-- Modify collect so it works with directories with missing __init__.py (msivak)
-- Split completed and mandatory attributes (msivak)
-- Move info about possible actions below the free space info (vpodzime)
-- Fix a couple pylint errors (#867125). (clumens)
-- Fix an undefined variable error (#867129). (clumens)
-- The fs type combo should be sensitive when reformat is checked (#887201).
-  (clumens)
-- Remove idiomatic, hard to translate text (#865598). (clumens)
-- Activate default layout when it is changed (#882440) (vpodzime)
-- Validate and correct vg names as needed. (dlehman)
-- Don't allow resize of devices with no/unrecognized formatting. (#869841)
-  (dlehman)
-- Add keyboard dracut setup args (#875567) (vpodzime)
-- recheck software when source changes (#875599) (bcl)
-- Include the new lib directory in the package (#886319, #886470). (clumens)
-- Add a gradient background to spoke headers (mizmo, clumens). (clumens)
-- Only allow changing filesystem type if the reformat combo is checked
-  (#885906). (clumens)
-- It's possible for mountpoint to be None (#885279). (clumens)
-- Explicitly set True/False in the bootloader setting (#885381). (clumens)
-
-* Tue Dec 11 2012 Brian C. Lane <bcl@redhat.com> - 18.38-1
-- In interactive installs, default to bootloader in the MBR (#885284).
-  (clumens)
-- Make sure software selection is checked against filesystem space. (#853636)
-  (dlehman)
-- Update default install size and disk space estimate. (dlehman)
-- Add checkbox for setting language default layout (#866887) (vpodzime)
-- Change testing area label to something more appropriate (KeyboardSpoke)
-  (vpodzime)
-- Fix getting country layout variants (vpodzime)
-- Wait for slower dhcp before running vnc server (#868777) (rvykydal)
-- Network spoke: fix NMClient signal callback arguments (#885488) (rvykydal)
-- Add logging for networking and improve logging of ifcfg files (rvykydal)
-- Honor user request via UI to not install a bootloader. (#885240) (dlehman)
-- Handle partition removals regardless of deepcopy. (#884896) (dlehman)
-- Default to partitions for /boot* instead of just /boot/efi. (#884606)
-  (dlehman)
-- Fix a logic error in ActionDestroyFormat.obsoletes. (#885004) (dlehman)
-- Take device type into account when making the config button sensitive
-  (#885051). (clumens)
-- Hide VG-related widgets when displaying a non-LV mountpoint first (#885131).
-  (clumens)
-- Install default system for %%packages --default (#869978) (bcl)
-- Fix a typo in the live cd completion text (#884373). (clumens)
-- Do not allow deleting or editing a protected device in custom part (#884599).
-  (clumens)
-- If path doesn't exist, don't traceback.  Return None. (clumens)
-- Add/remove the HDISO source from protectedDevSpecs (#882147). (clumens)
-- Put the bad VG name into the error message (#884359). (clumens)
-- Use updated connection settings object for default auto config files
-  (#883383) (rvykydal)
-
-* Wed Dec 05 2012 Brian C. Lane <bcl@redhat.com> - 18.36-1
-- Call udev_settle from inside udev_trigger. (dlehman)
-- Prevent enabling the encryption checkbutton erroneously. (dlehman)
-- Make sure Storage is initialized before refreshing the custom spoke.
-  (dlehman)
-- Fix initialization of Storage.roots to use a list. (#884270) (dlehman)
-- Don't allow reformat without setting a mountpoint. (#883076) (dlehman)
-- Fix check for toggled encryption checkbutton. (#882722) (dlehman)
-- Make sure FS minSize is never greater than its currentSize. (#876547)
-  (dlehman)
-- When considering whether anything can be shrunk, throw out protected devs.
-  (clumens)
-- In the UI, mark the HDISO source device as protected (#879610). (clumens)
-- update mdraid superBlock space calculation (#883483) (bcl)
-- Remove resetResolver function, we don't need it anymore (#868695) (rvykydal)
-- Network spoke: improve logging. (rvykydal)
-- Unify writeNetworkConf with other modules (rename, put in ks.execute)
-  (rvykydal)
-- Fix network command --onboot and --activate options. (rvykydal)
-- Fix two calls of self.window.set_info (#883632) (vpodzime)
-- Use BaseWindow.set_warning and set_error in GUIObject's methods (vpodzime)
-
-* Tue Dec 04 2012 Brian C. Lane <bcl@redhat.com> - 18.35-1
-- Fix a bug when switching back to an HDISO install source (#879612). (clumens)
-- Lower case the DONE button on media check. (clumens)
-- Change mirrorlist checkbox text (#883191). (clumens)
-- Change the bootloader button to indicate you can also not install one.
-  (clumens)
-- Stop writing /etc/sysconfig/keyboard (#871543) (mschmidt)
-- Stop writing /etc/sysconfig/i18n (#871543) (mschmidt)
-- Write /etc/hostname (#871543) (mschmidt)
-- Correct doing string substitution for encryption. (clumens)
-- Add install.py to POTFILES.in so a lot more strings can be translated.
-  (clumens)
-- Only instantiate main line action objects when they are needed. (clumens)
-- Add a category to POTFILES.in so "USER SETTINGS" gets translated. (clumens)
-- Make sure product info and spoke titles are translated throughout. (clumens)
-- Substitute on new_install_name when it's needed, not at the top of custom.py.
-  (clumens)
-- Compare the protocol combox box on position, not text. (clumens)
-- When we retranslate the welcome window, inform glibc. (clumens)
-- Add gettext checks to widgets/configure.ac. (clumens)
-- The initial welcome screen is the only one that needs to do retranslation.
-  (clumens)
-- Remove the generic retranslate method from the python portion of the UI.
-  (clumens)
-- Do not allow manipulating protected devices in the reclaim dialog (#882147).
-  (clumens)
-- ISOImage needs to look at /run/install/source for the mounted image
-  (#879142). (clumens)
-- Minor TODO list update. (clumens)
-- Get rid of the unneeded action1. (clumens)
-- Do not list some layouts twice (#882526) (vpodzime)
-- Check if the given NTP server is a valid hostname (#865869) (vpodzime)
-- Improve and document network.sanityCheckHostname (vpodzime)
-- don't write network settings on image install (bcl)
-
-* Sat Dec 01 2012 Brian C. Lane <bcl@redhat.com> - 18.34-1
-- remove extra space in custom.py (bcl)
-
-* Fri Nov 30 2012 Brian C. Lane <bcl@redhat.com> - 18.33-1
-- Escape single percent signs in RPM changelog entries. (dcantrell)
-- Fixes for PkgWrangler review. (dcantrell)
-- Don't let defaults override user-specified container settings. (#879702)
-  (dlehman)
-- Fix partition allocation when enabling container encryption. (#879702)
-  (dlehman)
-- Remove partitions from all appropriate DiskLabel instances. (#870586)
-  (dlehman)
-- Add a way for users to set the names of lvm and md devices. (dlehman)
-- Update the RAID-specific UI after changing the device's disk set. (dlehman)
-- Correctly handle the default vg not having been instantiated yet. (dlehman)
-- Drop requested container disks that don't have enough space. (#873293)
-  (dlehman)
-- Don't allow LVM disk set selection via configure button. (dlehman)
-- Try to add new device to an existing container if disks are full. (dlehman)
-- Fix code to lock encryption checkbutton for LV in existing VG (#877871)
-  (dlehman)
-- Add support for changing a new LV's VG. (dlehman)
-- Fix check for in-use LV name to include VG name. (#875477) (dlehman)
-- Remove the automatic show_all from those info_bar related functions.
-  (clumens)
-- Add set_info, set_error, set_warning functions to the BaseWindow object.
-  (clumens)
-- set_info functions may not be called from outside the main thread (#873600).
-  (clumens)
-- Test if path is valid before using it (NTPConfigDialog) (vpodzime)
-
-* Wed Nov 28 2012 Brian C. Lane <bcl@redhat.com> - 18.32-1
-- Bootloader checking should work in terms of self.stage1/2_ attrs (#880277).
-  (clumens)
-- Catch OverflowError in manual partitioning. (sbueno+anaconda)
-- Do not accept tabs in the keyboard layout test box (#897312). (clumens)
-- Wait for slower dhcp for payload setup and hostname setting (#873468)
-  (rvykydal)
-
-* Mon Nov 26 2012 Brian C. Lane <bcl@redhat.com> - 18.31-1
-- Rename icons for liveinst (conflict with redhat-logos) (#878037) (rvykydal)
-- Rework actions in the resize dialog to avoid shortcomings (#866209, #867770).
-  (clumens)
-- Check that everything's a GDK window before attempting to manipulate it.
-  (clumens)
-- On live installs, the progress hub should have a Quit button (#854904).
-  (clumens)
-- If no bootloader is to be installed, pop up a warning. (clumens)
-- Escape ampersands in spoke status text. (clumens)
-- Allow not setting any boot device via the UI (#867469). (clumens)
-- Allow specifying whether the URL you've given is a mirrorlist or not
-  (#868558). (clumens)
-- Prevent false positives when checking for encryption change. (dlehman)
-- Don't add incomplete VGs to the LVM reject filter. (#878225) (dlehman)
-- Show device names for devices in the Unknown page/subsection. (#855646)
-  (dlehman)
-- Add a page to the custom RHS notebook for uneditable devices. (#875942)
-  (dlehman)
-- Fix error in iutil.execCapture when fatal and non-zero exit (stefw)
-- Allow iutil.execWithCapture to work without a chroot (stefw)
-- Handle hd iso leavings by dracut (#876897) (jkeating)
-- show error when rsync fails (#868755) (bcl)
-
-* Mon Nov 19 2012 Brian C. Lane <bcl@redhat.com> - 18.30-1
-- only raise rsync error on error 12 (#868755) (bcl)
-- Dump default auto connection's ifcfg file instead of writing a new one
-  (#870922) (rvykydal)
-- Number timezones starting with 1 (#859342) (msivak)
-- only call bootloader.check() if bootloader is setup (#875278) (bcl)
-- Fix operator precedence when checking for the presence of transifex-client.
-  (clumens)
-- Make the custom and keyboard toolbar buttons larger (mizmo). (clumens)
-- More changes to leave the spoke via a glib idle call, not calling directly.
-  (clumens)
-- Hide the custom addon button. (clumens)
-- Enable verbose yum logging once more (jkeating)
-- rm transifex-client buildreq; check and install only if needed (sbueno)
-- Handle nfsiso leavings by dracut (#876223) (jkeating)
-- Prevent some raid-related tracebacks. (#874034) (dlehman)
-- Don't try to save changes to a locked luks device. (#876180) (dlehman)
-- Keyboard test layout padding fix (mizmo). (clumens)
-- Correct colors for selected items in mountpoint selector widget (mizmo).
-  (clumens)
-- Include hidden disks in the storage spoke's list of devices (#875475).
-  (clumens)
-- Make the DetailedErrorDialog taller by default (#874620). (clumens)
-- If there's only a Quit button, don't make it secondary. (clumens)
-- Handle package dependency errors on kickstart installs too (#865073).
-  (clumens)
-- Remove iso-codes dependency, libxklavier has it fixed now (vpodzime)
-- Rework custom partitioning alignment too (mizmo). (clumens)
-- Attempt to fix the shrunken storage UI (mizmo). (clumens)
-- Do not allow TreeView search in AddLayout dialog (#876131) (vpodzime)
-- DiskOverview widget selection color correction (mizmo). (clumens)
-- Use the main loop to control displaying the resize dialog. (clumens)
-- Use ksdata to set default runlevel (jkeating)
-- Execute xconfig data (#874868) (jkeating)
-- Write out xconfig data when executed (jkeating)
-- Code cleanups (jkeating)
-- Link to the correct default target (jkeating)
-- Add a mapping of old run level to new systemd target (jkeating)
-
-* Mon Nov 12 2012 Brian C. Lane <bcl@redhat.com> - 18.29-1
-- Quit after handling transaction errors. (clumens)
-- Add a function to display relevant transaction errors (#873106). (clumens)
-- Don't decorate error dialogs. (clumens)
-- Fix error handling when new device ends up with size 0. (dlehman)
-- Explicitly request all free space when no size given in custom. (#872833)
-  (dlehman)
-- Disable the language spoke off the first hub, for now (#874263). (clumens)
-- Wrap text on install options dialogs (#874265). (clumens)
-- Encode unicode strings from XklWrapper (#873762) (vpodzime)
-- New version (out of order) (bcl)
-- Network spoke: fix traceback (number of callback parameters) (#875393)
-  (rvykydal)
-- Adjust right margin for MountpointSelector (mizmo). (clumens)
-- Fix introspection warnings for widgets (stefw)
-
-* Fri Nov 09 2012 Brian C. Lane <bcl@redhat.com> - 18.28-1
-- Show NFS as the source if dracut left it for us (#875235) (jkeating)
-- Convert the accordion Button to a LinkButton (mizmo). (clumens)
-- Buttons shouldn't scream at people (#868536, mizmo). (clumens)
-- Don't attempt to handle exceptions when NFS mounts fail. (clumens)
-- If there's an error setting up the source, display it as the status.
-  (clumens)
-- Add logging around the messages that can be processed by the hub. (clumens)
-- You can't reformat a btrfs volume/subvolume. (dlehman)
-- Always account for device removals in their containers. (dlehman)
-- Fix container member management for md devices. (dlehman)
-- Use a more robust method for removing previous autopart. (#868589) (dlehman)
-- Post-custom sanity check determines storage spoke completeness. (#868925)
-  (dlehman)
-- Fix detection of inactive md arrays. (#873031) (dlehman)
-- Vastly simplify the process for applying changes from custom spoke. (dlehman)
-- Clean up container disk set and encryption change handling. (#874714)
-  (dlehman)
-- Honor kickstart bootloader --location=none. (#871143) (dlehman)
-- Use original raid level and disk set when reverting a device. (dlehman)
-- Set raid level based on defined volume for not-yet-btrfs mounts. (dlehman)
-- Network spoke: improve status info (shorten) (rvykydal)
-- Network spoke: update list of connected devices in hub status (rvykydal)
-- Network spoke: Add "Connecting..." state to status (#868704) (rvykydal)
-- Network spoke: Update status of networking in hub (#868704) (rvykydal)
-- check for small grub2 embed space (#737508) (bcl)
-- Set SpokeSelector's tooltip to spoke's status (vpodzime)
-- Don't let mount/umount block python threads (#873600). (clumens)
-- Fix makeupdates to correctly detect and include changes in isys. (clumens)
-- Update pot file with proper lower cased buttons (#868536, mizmo). (clumens)
-- Default to LVM on text installs too (#874586). (clumens)
-- Remove network enablement in anaconda from rescue mode (#873854) (rvykydal)
-- Add very basic U-Boot support for ARM platforms (dmarlin)
-- Fix test for changed disk set for partitions. (#873994) (dlehman)
-- Add support for preexisting whole-disk formatting. (#870476) (dlehman)
-- There is no Storage.destroyFormat method. (dlehman)
-- Move DEVICE_TYPE constants into storage and use them everywhere. (dlehman)
-- A device scheduled for reformat is not unused. (dlehman)
-- Catch the right exception when settin up raid options ui. (#873486) (dlehman)
-- Network spoke: Use connection state that triggered a callback (bug #871429)
-  (rvykydal)
-- Use sr_Latn_RS instead of sr_RS (vpodzime)
-
-* Wed Nov 07 2012 Brian C. Lane <bcl@redhat.com> - 18.27-1
-- Mark more UI strings with N_ (#874276). (clumens)
-- Pressing Enter on the passphrase dialog should continue (#788556). (clumens)
-- Pressing Enter should activate the rightmost button on the detailed dialog.
-  (clumens)
-- Pressing enter on a MountpointSelector should display it on the RHS
-  (#873352). (clumens)
-- Make language groups work again (#873865) (jkeating)
-- Update payload if slower dhcp succeeds in network pre-hub spoke (#873468)
-  (rvykydal)
-- Fix group access after parsing btrfs subvol list output. (#868468) (dlehman)
-- Account for autopart swap size when checking free space. (dlehman)
-- ignoredisk.onlyuse contains names, not StorageDevice instances. (#873463)
-  (dlehman)
-- Correctly handle toggle of encryption state for devices. (#873445) (dlehman)
-- Handle changes to encryption state of container members. (#873445) (dlehman)
-- Change custom spoke to apply encryption to PVs, not LVs. (dlehman)
-- Widen the sidebar on custom partitioning (mizmo). (clumens)
-- Fix spacing and padding on SpokeSelectors (mizmo). (clumens)
-- Set the font globally (mizmo). (clumens)
-- Handle if we get something other than a .treeinfo file (#872012). (clumens)
-- If repo metadata fetching fails, set an info error message (#873605).
-  (clumens)
-- Enable yum langpacks plugin to get conditional packages (#868869) (jkeating)
-- Base whether an add-on is selected on the selectedGroups, not ksdata
-  (#873092). (clumens)
-- Add UTC and GMT-X timezones (#863199) (vpodzime)
-- TimezoneMap should handle "" timezone (vpodzime)
-- raise error on rsync failure (#868755) (bcl)
-- exclude bind mounts from rsync (#871637) (bcl)
-- Fix up the InstallOptions3Dialog.refresh arguments (#873392). (clumens)
-- Mark strings at the top of spokes with N_; translate later with _ (#872791).
-  (clumens)
-- Do not decorate the dialog that appears when you click on storage info bar.
-  (clumens)
-- You have to give "raise" an exception if you're outside a handler (#872874).
-  (clumens)
-- Prompt for encryption passphrase in reclaim path. (#869391) (dlehman)
-- Prevent user from hitting save without entering a passphrase. (#869391)
-  (dlehman)
-- Font and padding updates for the network spoke (mizmo). (clumens)
-- Fix alignment on the Add and Configure Mount Point dialogs. (clumens)
-- Network spoke: activate wifi connection after setting secrets (#871132)
-  (rvykydal)
-- Fix nfsiso as stage2 (#871554) (jkeating)
-- Fix traceback when saving changes to an existing partition. (#872446)
-  (dlehman)
-- Some more stuff for the mangleMap (#866730) (vpodzime)
-- Handle locale's encoding and script in a better way (vpodzime)
-- Use both language and country to guess layout (#861061) (vpodzime)
-- Fix remaining issues with md fwraid. (#872739) (dlehman)
-- Do not return None from Size.__str__ (#869405) (vpodzime)
-- Add a platform weight for ARM images (dmarlin)
-- Remove a bunch of stuff from the TODO list. (clumens)
-- Don't decorate the main exception window. (clumens)
-- Move the custom partitioning's Apply Changes button. (clumens)
-- Indent partition type options under the expander further. (clumens)
-- Left align the Label label, and indent the custom options further. (clumens)
-- Lots of custom partitioning UI changes (mizmo). (clumens)
-- Update fonts on the welcome language spoke (rlerch). (clumens)
-- Lots of storage spoke font and spacing changes (mizmo). (clumens)
-- Set the background of the custom partitioning accordion back to white
-  (mizmo). (clumens)
-- Set the Local Standard Disks background back to white (mizmo). (clumens)
-- Reorder Device Type options in custom part to match the Partition Type combo.
-  (clumens)
-- Use the same terminology for partitions as is in use on the custom spoke.
-  (clumens)
-- livecd specific code has moved (bcl)
-- Add progress percentage info to liveinst (bcl)
-
-* Thu Nov 01 2012 Brian C. Lane <bcl@redhat.com> - 18.23-1
-- Update parsing of 'btrfs subvol list' to match its new output. (#868468)
-  (dlehman)
-- Add a way to select the default device type. (dlehman)
-- Enable specification of disk(s) for individual mountpoints. (#870569)
-  (dlehman)
-- Improve management of complex devices in custom spoke. (#865199) (dlehman)
-- Save btrfs subvols' requested size. (dlehman)
-- Reclaim extra set member growth evenly across members. (dlehman)
-- Give lvmpv a slightly more realistic minimum size. (dlehman)
-- Fix required space calculation for lvm. (dlehman)
-- Don't filter disks when scanning storage after autopart fails. (#866717)
-  (dlehman)
-- Fix detection of partitioned md devices. (#866519) (dlehman)
-- Correct handling of disks with hidden formats. (#866519) (dlehman)
-- Revert "Fall back to lvm autopart if the default fails." (dlehman)
-- Revert the default autopart type to lvm. (#870207) (dlehman)
-- Apparently necessary kpartx changes (#867593) (dlehman)
-- Mark a few more important strings for translation. (clumens)
-- If lang= was provided on the command line, set the installation language.
-  (clumens)
-- Make the decision to skip the welcome screen more complicated. (clumens)
-- Set a translation domain before loading a glade file. (clumens)
-- Don't decorate the NTP config dialog. (clumens)
-- Mark properties in existing glade files as translatable. (clumens)
-- Widget properties exposed via glade need to be marked as translatable.
-  (clumens)
-- Network spoke: don't try to call replace on None (traceback) (#869106)
-  (rvykydal)
-- Fix nfsiso repo selection (#871648) (jkeating)
-
-* Wed Oct 31 2012 Brian C. Lane <bcl@redhat.com> - 18.22-1
-- Revert "Update parsing of 'btrfs subvol list' to match its new output.
-  (#868468)" (dlehman)
-- Pass RAID level to btrfs volume constructor. (#866101) (dlehman)
-- Fix a traceback when removing non-existing partitions in custom. (#869839)
-  (dlehman)
-- Update parsing of 'btrfs subvol list' to match its new output. (#868468)
-  (dlehman)
-- Remove the word "review" from the label on the custom checkbutton. (#871109)
-  (dlehman)
-- Require that the root filesystem be created by anaconda. (#871104) (dlehman)
-- On error, reset the RHS to what it used to be (#869422). (clumens)
-- Don't prompt when in cmdline mode (#869685) (jkeating)
-- Force a root password to be set (#869675) (jkeating)
-- Network spoke: fix hostname handling in standalone spoke (#868535) (rvykydal)
-- Network spoke: fix config info update after switching device OFF and ON
-  (#871429) (rvykydal)
-- Network spoke: connected requires activated (not active) connection (#871129)
-  (rvykydal)
-- Blank out passphrases from /root/anaconda-ks.cfg (#868519). (clumens)
-- Setup package repo in the background (#870552) (jkeating)
-- check disklabels when calculating free space (#863892) (bcl)
-- updateBaseRepo does not need a storage argument. (clumens)
-- Fix up calling superclass setup methods in packaging (#870556). (clumens)
-- Fix a race condition with kickstarts (#868834) (jkeating)
-- run checkisomd5 from anaconda-diskroot (#848764) (bcl)
-- skip luks passphrase in exception dump (#868509) (bcl)
-- Replace ' ' with '_' when looking for ifcfg files (#869106) (rvykydal)
-- Remove storageComplete, which was only called from dispatch.py. (clumens)
-- Remove dispatch.py and its associated test case. (clumens)
-- Use a slightly different method to get supported languages (#858801, tagoh).
-  (clumens)
-- Fix problems when changing things in the software spoke (#868742, #869424).
-  (clumens)
-- Network spoke: fix callback arguments for device add/remove. (rvykydal)
-- display storage errors in text mode storage spoke (bcl)
-- only clear errors if re-running the check (#868707) (bcl)
-- set boot flag and name for EFI partition (#866106) (bcl)
-- clear pmbr_boot on EFI systems (#844551) (bcl)
-- Lots of UI layout tweaks (mizmo). (clumens)
-- /etc/sysconfig/keyboard doesn't support vconsole.xyz options. (notting)
-
-* Thu Oct 25 2012 Brian C. Lane <bcl@redhat.com> - 18.21-1
-- Add PowerNV as a recognized PPC platform (nacc)
-- anaconda should print unknown platform information (hamzy)
-- Toggle chosen property on focus change (MountpointSelector) (vpodzime)
-- Lock source spoke while depsolving (#867591) (jkeating)
-- In custom part, don't display mountpoints without associated disks (#865942).
-  (clumens)
-- Tie "Reclaim Space" button sensitivity to how much space the user freed
-  (#869375). (clumens)
-
-* Tue Oct 23 2012 Brian C. Lane <bcl@redhat.com> - 18.20-1
-- Add dialog for configuring layout switching options (vpodzime)
-- Initialize layout switching if needed (vpodzime)
-- Save layout switching configuration (vpodzime)
-- Add support for layout switching options to XklWrapper (vpodzime)
-- We need to set _root in two places for a MountpointSelector. (clumens)
-- Correctly destroy the deletion confirmation dialog. (clumens)
-- Don't set self.data.method.url until after checking for a protocol (#869102).
-  (clumens)
-- Fix an undetected bug when setting up an HTTPS method. (clumens)
-- YabootSILOBase objects don't have an encrypted_password parameter (#869016).
-  (clumens)
-- rprivate -> make-rprivate (#869246). (clumens)
-- If NFS is selected in the source spoke, the URL must contain a colon
-  (#869103). (clumens)
-- Modify behavior when leaving the reclaim storage dialog (#864128, #867770,
-  #868903). (clumens)
-- Set the status text in the SpokeSelector widget differently now. (clumens)
-- Use the correct font for each language on the welcome screen (#868836,
-  tagoh). (clumens)
-- Everywhere we make a MountpointSelector, give it a _root attr (#868702).
-  (clumens)
-- payloadInstallHandler should only optionally take a package argument
-  (#868542). (clumens)
-- Add a reformat checkbutton to indicate a desire to reformat the device.
-  (dlehman)
-
-* Fri Oct 19 2012 Brian C. Lane <bcl@redhat.com> - 18.19-1
-- Reset the comps to empty along with everything else in yum. (clumens)
-- Hook up the "Remove Packages" button on the dep solving error screen.
-  (clumens)
-- If nothing's changed in the software spoke, don't redo dep solving. (clumens)
-- skip vnc prompt with text mode and kickstart (bcl)
-- Use correct name for MD RAID device description text. (dlehman)
-- Fix selector management after a reformat action is scheduled. (dlehman)
-- Aqcuire yum lock before doing the work of _yumCacheDirHack. (#858993)
-  (dlehman)
-- Reset error list on success of doKickstartStorage. (dlehman)
-- Tighten up management of passphrases across Storage resets. (#865364)
-  (dlehman)
-- Do not count not-yet-created filesystems as free space. (#866895) (dlehman)
-- Remove any preexisting autopart layout before space check. (#866895)
-  (dlehman)
-- Apply disk selections to the devicetree before the space check. (#866895)
-  (dlehman)
-- Update free space totals before refresh after removing a device. (dlehman)
-- Log exceptions raised from PartitionDevice constructor. (dlehman)
-- Fix size specs for PartitionFactory. (dlehman)
-- Reinitialize disks after removing the last partition from custom spoke.
-  (dlehman)
-- Refactor shouldClear slightly. (dlehman)
-- Use correct means for getting device type in the custom spoke. (dlehman)
-- Repopulate the RHS after editing a device. (dlehman)
-- Don't bother resizing a container that has just been emptied. (dlehman)
-- Don't allow implicit fstype change via mountpoint. (#866953) (dlehman)
-- Set up devices before trying to decrypt them. (#865247, #867533) (dlehman)
-- Don't short-circuit devicetree populate based on clearpart setting. (dlehman)
-- Keep hostname when updating ksdata after GUI network configuration (#866516)
-  (rvykydal)
-- don't save system time on s390 (#867856) (dan)
-- Network spoke: make Configure button insensitive when running nmce (#865931)
-  (rvykydal)
-
-* Wed Oct 17 2012 Brian C. Lane <bcl@redhat.com> - 18.18-1
-- remove firewall.py from POTFILES.in (bcl)
-- Add missing pieces for kickstart's encryption cipher option. (dlehman)
-- update to use firewalld (#815540) (bcl)
-- Fix a typo in method name (#863765) (msivak)
-- Add missing import (#867296) (msivak)
-- There is no anaconda object available in writeSysconfigKernel (vpodzime)
-
-* Tue Oct 16 2012 Brian C. Lane <bcl@redhat.com> - 18.17-1
-- Add an error handler for fatal package installation errors (#865291).
-  (clumens)
-- Modify the status test for the software selection spoke. (clumens)
-- Various layout and font improvements to the keyboard spoke (mizmo, rlerch).
-  (clumens)
-- Just return the size string uppercased (#867074). (clumens)
-- Revert "Use a capital "B" in the size module (#859932)." (clumens)
-- Revert "Fix one more reference to bits (#859932)." (clumens)
-- Fix padding around the addons view in the software spoke. (clumens)
-- The Unknown page selectors/devices have no root. (dlehman)
-- Avoid using mount --move on shared paths (#853508) (jkeating)
-- Revert "Release Gdk lock in exception handling" (msivak)
-- Make all Gtk calls from inside of it's main loop (and thread) (msivak)
-- Remove Gdk thread initialization, introduce new helper functions and make
-  exception handler be called by Gtk only once (msivak)
-- Fix threading initialization (msivak)
-- Do not remove the layout if it was added back (#865830) (vpodzime)
-- Release Gdk lock in exception handling (vpodzime)
-- Configure new-kernel-pkg to keep tboot configuration on updates (#742885)
-  (pjones)
-- Honor the nompath option. (dlehman)
-- Validate lv names. (dlehman)
-- Add support for specifying encryption cipher mode via kickstart. (dlehman)
-- Acquire the yum lock before accessing YumBase.repos. (#858993) (dlehman)
-- Remove the entry on the resize dialog's combo boxes. (clumens)
-- disks_free -> disks_size (#863647). (clumens)
-- Fix one more reference to bits (#859932). (clumens)
-- Fix a traceback in media check (#865897). (clumens)
-- Add support for deleting an entire root via the existing ConfirmDeleteDialog.
-  (clumens)
-- Don't traceback when removing a mountpoint with no expanded selector
-  (#862746). (clumens)
-- Remove the code for removing an entire Root all at once. (clumens)
-- Yet more TODO list updates. (clumens)
-- Don't display "None" in the name of a root. (clumens)
-- Fix configuration of protected wireless connections (#855526) (rvykydal)
-- Fix graphical kickstart with %%packages data (jkeating)
-- Add password validation to text password spoke (jkeating)
-- Make use of the validatePassword routine from users.py (jkeating)
-- Add a password verification method to users.py (jkeating)
-- Always honor the 'nokill' flag (vpodzime)
-- Fall back to lvm autopart if the default fails. (#864708) (dlehman)
-- Special boot devices are handled the same whether they exist or not.
-  (dlehman)
-- Fix a bug allocating fixed-size partitions. (dlehman)
-- Clean up size sets immediately after allocation run. (#864771) (dlehman)
-- Make sure partition base sizes are adequate for their formatting. (dlehman)
-- Don't fail to account for all set members' growth. (dlehman)
-- Remove some extra calls to show_first_mountpoint. (dlehman)
-- Show the correct raid options for btrfs. (dlehman)
-- Support change of raid level in custom spoke. (dlehman)
-- Use devicetree as partition list source instead of parted. (#864718)
-  (dlehman)
-- Use Storage convenience methods to schedule reclaim actions. (dlehman)
-- Pass disk list when trying to recover from device type change failure.
-  (dlehman)
-- Fill in missing parts of the disabled raid features dict. (dlehman)
-- Clear errors when entering or leaving the custom spoke. (dlehman)
-- Hook up signal handler for raid feature checkbuttons. (dlehman)
-- Raise MDRaidError instead of ValueError from devicelibs.mdraid. (dlehman)
-- Minimum we have to do with HW clock (vpodzime)
-- Check X layouts specified in kickstart for validity (vpodzime)
-- Work with VConsole keymap and X layouts separately (vpodzime)
-- Add class wrapping systemd-localed functionality (vpodzime)
-- Don't write XkbVariants if none are specified (vpodzime)
-- Add comment to the begining of generated xorg.conf file (vpodzime)
-- Don't display "None" for NIC vendors and products NM can't identify (#859540)
-  (rvykydal)
-
-* Thu Oct 11 2012 Brian C. Lane <bcl@redhat.com> - 18.16-1
-- Don't try to load ifcfg files for wifi devices (#865355) (vpodzime)
-- Rewrite isWirelessDevice to Python and DBus calls (#862801) (vpodzime)
-- Use a capital "B" in the size module (#859932). (clumens)
-- The environment window needs a vertical scroll bar (#865066). (clumens)
-- liveinst should recognize inst.updates too (#865398). (clumens)
-- Improve validation of device edit requests. (dlehman)
-- Fix listing of subvolumes for existing btrfs volumes. (dlehman)
-- Remove overzealous correction of device type for /boot*. (#863574) (dlehman)
-- Pad filesystem minimum sizes to ensure other OS can still run. (dlehman)
-- Handle encrypted partitions in size set classes. (dlehman)
-- Don't set mountpoints of "(null)" in mountpoint selectors. (dlehman)
-- Prevent crash trying to populate raid options on a one-disk system. (dlehman)
-- Rework type combos and don't offer RAID on one-disk systems. (dlehman)
-- Bundle more of data/ in updates.img (jkeating)
-- Revive reipl (#860244) (jkeating)
-
-* Wed Oct 10 2012 Brian C. Lane <bcl@redhat.com> - 18.15-1
-- add noverifyssl to anaconda-dracut (#852229) (bcl)
-- Don't crash when running anaconda a second time (jkeating)
-- Handle ssh prompt in new tmux world (jkeating)
-- Add a service to run anaconda directly on the tty (jkeating)
-- Add a script to attach to anaconda's tmux (jkeating)
-- Add ARM-OMAP class to create a uboot partition to support the boot-loader.
-  (dmarlin)
-- Avoid a loop of storage spoke executions during kickstart (#865048).
-  (clumens)
-- Correct lookup of raid.XX "mountpoints" for kickstart installs (#864764).
-  (clumens)
-- Change language matching on the welcome screen back around. (clumens)
-- Another attempt at fixing the squished screen bug (#849211). (clumens)
-- Fix a stupid typo in the disk shopping cart (#864842). (clumens)
-- Reorder the buttons and labels on the bottom left of the storage spoke.
-  (clumens)
-- Modify the DetailedErrorDialog buttons. (clumens)
-- Sync up hidden/unhidden disks between the UI and storage module (#864180).
-  (clumens)
-- When handling a storage error, reload self.disks (#862972). (clumens)
-- Fix sshd bringup when also using a kickstart file (#863441) (jkeating)
-- Require root password spoke be visited (#859069) (jkeating)
-- add some thread logging (bcl)
-- Reword the description on the resize dialog (#863577). (clumens)
-- Present an error message if no disks are detected (#864093). (clumens)
-- When changing environments, don't explicitly exclude groups (#863886).
-  (clumens)
-- Fix marking the "Modify Software Selection" button as sensitive in one case.
-  (clumens)
-
-* Mon Oct 08 2012 Brian C. Lane <bcl@redhat.com> - 18.14-1
-- Add UI support for encrypted automatic partitioning. (dlehman)
-- Add support to the custom spoke for encrypted block devices. (dlehman)
-- Add a page for decrypting existing LUKS devices. (dlehman)
-- Add a dialog for collecting a passphrase for newly encrypted devices.
-  (dlehman)
-- Add a property that provides a list of all selectors in the accordion.
-  (dlehman)
-- Handle luks formats during populate if they have a passphrase set. (dlehman)
-- Add encryption support to the device factory classes. (dlehman)
-- s/dev/disk in the disk shopping cart. (clumens)
-- Set a default payload in InstallOptions1Dialog (#863582). (clumens)
-- Pass disks into the SelectedDisksDialog (#863588). (clumens)
-
-* Fri Oct 05 2012 Chris Lumens <clumens@redhat.com> - 18.13-1
-- Make sure packages anaconda requires are installed. (clumens)
-- Add method returning current activated X layout (vpodzime)
-- Fix a deadlock when trying to add a keyboard layout (#862612). (clumens)
-- ntfsresize uses SI (MB) while the rest of us use IEC (MiB). (#862109)
-  (dlehman)
-- Remove empty extended partitions after removing a logical partition.
-  (dlehman)
-- Handle all logical/extended partitions in unusedDevices. (dlehman)
-- Update autopart/custom setting before moving to reclaim dialog. (#863225)
-  (dlehman)
-- Raise an exception early in newDevice if no disks were specified. (#858139)
-  (dlehman)
-- Fix a regression in BTRFSVolumeDevice.listSubVolumes. (#862742) (dlehman)
-- Fix behavior of resolveDevice when devspec is a device name. (dlehman)
-- Prevent BTRFS volumes from ever having the name None. (dlehman)
-- Prevent negative free value for filesystems. (#861812) (dlehman)
-- Don't show extended partitions that contain logical partitions. (#862971)
-  (dlehman)
-- Delete ts data instead of trying to undo dep installs. (#851114) (dlehman)
-- Change the manglings for a couple locales (petersen). (clumens)
-- Hook up the "Modify Software Selection" button on install opts dialogs.
-  (clumens)
-- More TODO list updates. (clumens)
-- Add a label to the resize dialog for how much space is required. (clumens)
-- Add a column to the disk shopping cart for setting the boot device (#860430).
-  (clumens)
-- Rework the disk shopping cart link a little bit. (clumens)
-- Do not use constant value in SoftwareSpoke's completed property (vpodzime)
-- Pull in existing swaps and bootloader devices whenever there are mounts.
-  (dlehman)
-- Revert broken logic for newly formatted devices in unusedDevices. (dlehman)
-- Add an apply button to the device/mountpoint configuration options. (dlehman)
-- Don't base StorageSpoke.ready on storage execute thread presence. (#861574)
-  (dlehman)
-- Prevent systemd timeout waiting for encryption passphrase. (#861123)
-  (dlehman)
-- Fix traceback when switching device type to lvm. (#860990) (dlehman)
-- Fix error handling in the add mountpoint dialog. (#860992) (dlehman)
-- Allow xfs /boot. (dlehman)
-- Fix makeupdates to work for glade files in subdirs of spokes/ or hubs/.
-  (dlehman)
-- Fix parsing of NFS method strings (#860966) (jkeating)
-- Make the URL entry sensitive for NFS installs, too (#863014). (clumens)
-- Add in a locale mapping to avoid incorrect system settings (#858591).
-  (clumens)
-
-* Wed Oct 03 2012 Brian C. Lane <bcl@redhat.com> - 18.12-1
-- copy-logs changed names (bcl)
-- Reference correct UI button name (#862409) (jkeating)
-- Don't echo vnc password to the screen (#862593) (jkeating)
-- Make the log copy script the last one to run (jkeating)
-- Copy ks script logs into the install root as well (jkeating)
-- Create ks script logs outside of chroot (jkeating)
-- Don't look for ifcfgs of wireless devices (#860791) (rvykydal)
-- doAutoPartition should raise errors instead of handle them. (clumens)
-- In the install options dialogs, call out how much space is on selected disks.
-  (clumens)
-- In order to display the resize prompt dialog, we need to compare Sizes to
-  Sizes. (clumens)
-- Use a better starting value for required space than 0. (clumens)
-- Default to CLEARPART_TYPE_NONE (#855976). (clumens)
-- Remove some unused clearpart-related settings. (clumens)
-- Hook up the new resize dialog. (clumens)
-- Add a resize dialog. (clumens)
-- Require the hostname package (#862419) (jkeating)
-
-* Tue Oct 02 2012 Chris Lumens <clumens@redhat.com> - 18.11-1
-- Use gdk_threaded() when running AddLayout dialog (vpodzime)
-- Work the anaconda object into the VNC test (jkeating)
-- Use askvnc spoke to change vnc password (jkeating)
-- Fix logic error in vnc password length check (jkeating)
-- Allow vncpassword spoke text to be configurable (jkeating)
-- Don't ask for VNC if we can't do it (jkeating)
-- Skip VNC prompt if text is requested in kickstart (jkeating)
-- KEYTABLE is now vconsole.keymap (#859298) (bcl)
-- The partitionErrorHandler text needs a 's' in the format string (#861376).
-  (clumens)
-- Fix a problem with storage error handling (#861376). (clumens)
-- Fix bootloader setup on s390. (#857940) (dlehman)
-- Make Keboard and Welcome spokes runtime-system friendly (vpodzime)
-- Make DateTime spoke runtime-system friendly (vpodzime)
-- Add a guard for testing if we can modify runtime system (vpodzime)
-- Bring back prompt for VNC (jkeating)
-- Add standalone spoke to prompt for VNC (jkeating)
-- Fail on incomplete ksdata when in cmdline mode (jkeating)
-- Add a flag attribute to handle cmdline mode (jkeating)
-- fix libuser setup (#855481) (bcl)
-- Remove obsolete requirement on comps-extras. (notting)
-
-* Wed Sep 26 2012 Chris Lumens <clumens@redhat.com> - 18.10-1
-- isys.mount needs to be told when something should be mounted NFS (#860273).
-  (clumens)
-- Disks with new disklabels don't count as new devices in custom. (dlehman)
-- Fix thread synchronization issue going from storage to custom. (#860495)
-  (dlehman)
-- Treat disks with unrecognized or no formatting as empty. (#858862) (dlehman)
-- Improve management of mountpoint selectors in the custom spoke. (dlehman)
-- Improve handling of existing devices when refreshing the custom spoke.
-  (dlehman)
-- Apply custom changes not involving actions to the main devicetree. (dlehman)
-- Add a mountpoint entry to the device options area. (dlehman)
-- Move mountpoint validation out of the add mountpoint dialog. (dlehman)
-- Only run the storage sanity check if we've run autopart. (dlehman)
-- Add a method to reset a device to its original state. (dlehman)
-- Make a copy of the original format instead of just storing another ref.
-  (dlehman)
-- Reformatting effectively removes a device from an existing Root. (dlehman)
-- Fix test for whether to create biosboot during autopart. (#853628) (dlehman)
-- Close AddLayout dialog on double-click (vpodzime)
-- Remove useless handler of Cancel button (AddLayout dialog) (vpodzime)
-- Don't rely on having some month and year selected (#859185) (vpodzime)
-- Add debug option to bumpver (bcl)
-- Raise an error if bootDrive is invalid (jkeating)
-- Handle automated installs (jkeating)
-- Handle errors from text storage execute (jkeating)
-- Fix ready and completed properties for text storage (jkeating)
-- Use ksdata to determine text password completeness (jkeating)
-
-* Tue Sep 25 2012 Chris Lumens <clumens@redhat.com> - 18.9-1
-- And remove compssort.py from POTFILES.in, too. (clumens)
-- Select a default environment (#858180). (clumens)
-- Remove compssort.py. (clumens)
-- Don't attempt to catch and re-raise a SystemError from AnacondaThread.run.
-  (clumens)
-- Add a progress message for quitting the installer. (clumens)
-- GUI error handling dialogs need to be protected from threading deadlocks.
-  (clumens)
-- Initialize gdk threading as well. (clumens)
-- Handle --ignoremissing in _applyYumSelections (#859021). (clumens)
-- Fix the destination path for anaconda.xlog (#860041). (clumens)
-- Hide the ISO install source if you've nuked all possible drives (#858088).
-  (clumens)
-- Don't write out /etc/sysconfig/clock anymore (#859217). (clumens)
-- Index the exn mapping by string, not by object. (clumens)
-- Don't write HOSTNAME=HOSTNAME=myhostnamehere (#859141). (clumens)
-- Close temp file before moving it (#858681) (vpodzime)
-- Update widget-specific TODO list. (clumens)
-- Don't use grey for the status text of a SpokeSelector (#855638). (clumens)
-- Fix a typo in makeupdates. (clumens)
-- UEFI paths must include a leading backslash on some machines. (#856938)
-  (pjones)
-- Read cmdline files from /run/install (jkeating)
-- Copy command line files prior to pivot (jkeating)
-- Grab the proxy username from the correct text entry (#858536). (clumens)
-- Remove our use of scsi_wait_scan (#858393). (clumens)
-- Don't overwrite the opts attribute on NFS installs (#858700). (clumens)
-- Change the keyboard shortcut for the updates checkbox. (clumens)
-- Add the storage category to POTFILES.in. (clumens)
-- Don't explicitly start the progress spinner in python code. (clumens)
-- Move the progress bar back down to the bottom of the progress hub. (clumens)
-- Remove a bunch of stuff from the TODO list for a change. (clumens)
-- Move check of new partition size against format limits. (dlehman)
-- Improve growth check when deciding where to allocate new partitions.
-  (dlehman)
-- Keep btrfs selectors' sizes in sync as volume size changes. (dlehman)
-- Allow specification of a label for new swap space via custom ui. (dlehman)
-- Don't allow stage2 as stage1 unless specified via location. (dlehman)
-- Remove reference to PartitioningWarning, which was removed last week
-  (#875931). (clumens)
-- Add a way to test exception handling (vpodzime)
-- Fix dumpState to work with the new python-meh (#856235) (vpodzime)
-
-* Fri Sep 14 2012 Chris Lumens <clumens@redhat.com> - 18.8-1
-- Make sure the InstallOptionsNDialogs get the correct space labels. (clumens)
-- Get rid of the big pause going from the storage spoke back to the hub.
-  (clumens)
-- Don't fail when making updates if the symlink already exists. (clumens)
-- Make sure to set the default TZ in ksdata so the completed method works.
-  (clumens)
-- Allow creation of biosboot and prepboot partitions in the custom spoke.
-  (dlehman)
-- Hide removable disks containing install media from the custom spoke.
-  (dlehman)
-- Make the minimum size for custom spoke partitions 1MB. (dlehman)
-- The return value of execWithRedirect is an integer. (dlehman)
-- Only include following free space in partitions' max size. (dlehman)
-- Handle btrfs volumes with a dataLevel of None. (dlehman)
-- Handle newDevice partitions smaller than the default of 500MB. (#853125)
-  (dlehman)
-- Add underlines to the expander and encryption checkbox in custom
-  partitioning. (clumens)
-- Remember to mark an environment as selected in the store. (clumens)
-- Rename the addon/environment store columns to make sense. (clumens)
-- Use slightly less confusing labels for the various back buttons. (clumens)
-- Add a property to SpokeWindow for setting the single button's label.
-  (clumens)
-- Rename the SpokeWindow's back button to just button. (clumens)
-- Use the blocking read to avoid busy wait in TUI progress (msivak)
-- Make progress hub spokes possible and move the root password there (msivak)
-- Don't let user hit Add button if no new layouts are selected (vpodzime)
-- Gtk.ListStore.iter_previous now returns new iterator (#849060) (vpodzime)
-- Write storage configs after payload install for live installs. (#856836)
-  (dlehman)
-- Update the pot file for various important string changes. (clumens)
-- Attempt to fix word wrapping issues with the betanag dialog (#853913).
-  (clumens)
-- CONTINUE -> BEGIN INSTALLATION (#856614). (clumens)
-- Language selection should work the same as keyboard selection (#854570).
-  (clumens)
-- Fix ransom notes cycling. (clumens)
-- Improve the clarity of the custom checkbutton label. (dlehman)
-- Add error handling around significant ui-initiated storage operations.
-  (dlehman)
-- Improve error granularity slightly in automatic partitioning. (dlehman)
-- Fix detection of preexisting md arrays again. (dlehman)
-- Handle changes to sizes of predefined devices in custom spoke. (dlehman)
-- Fix traceback when switching device type to BTRFS. (dlehman)
-- Validate mountpoints in the add-a-mountpoint dialog. (dlehman)
-- Tell 'lvm' that yes, we really, really want to remove PV (vpodzime)
-- Use 250ms interval for installation progress updating (vpodzime)
-- network spoke: hide for live CD and image installs (#854586) (rvykydal)
-- Fixed luks_add_key() (jsafrane)
-- Display a radio button next to the environment choices. (clumens)
-- Update TODO list. (clumens)
-- Set the busy spinning cursor while the UI is loading. (clumens)
-- network spoke: add "No network devices available" status (rvykydal)
-- network spoke: clear device info if no network devices are found (#853903)
-  (rvykydal)
-- fix root password setup (#855481) (bcl)
-- Rewrite expand_langs to return more items (vpodzime)
-- Don't try to setup X layouts in text installation (#852447) (vpodzime)
-- Add UTF-8 enconding suffix to our language strings (#854688) (vpodzime)
-- Require rsync (vpodzime)
-- Don't rely on chrony.conf file being available (#854899) (vpodzime)
-- Require chrony and rdate, because Anaconda needs them (#854899) (vpodzime)
-- Use the real path to dracut-lib.sh (#851362) (jkeating)
-- fixup live install (#853988, #854962) (bcl)
-- Only check media if we really want it (#853404) (jkeating)
-- Fix thinko in anaconda arg handling portion of multilib patch. (dlehman)
-- Honor kickstart and command line switches to enable multilib. (dlehman)
-- Quitting the live installer shouldn't reboot the system (#854904). (clumens)
-- The kickstart language-related command is "lang", not "language". (clumens)
-- Fix btrfs/lvm/raid kickstart installs (#853649). (clumens)
-- Store "en" as the default, not "en_US". (clumens)
-- Mark ksdata.*.execute invocations as another step (vpodzime)
-- Reorder and comment options passed to rsync (vpodzime)
-- Fix bug in writing keyboard configuration files (vpodzime)
-- network spoke: require connection only for url and nfs methods (#853899)
-  (rvykydal)
-- Drop the addBase handling in anaconda - if you want a group, list a group.
-  (notting)
-- Don't depend on storage or instClass in EFIGRUB (pjones)
-- Use self.stage1_device where appropriate in EFIGRUB. (pjones)
-- Explicitly disable the rootpw lock (#853788) (jkeating)
-- require nm-connection-editor (#854586) (bcl)
-- Include packaging log in exception reports. (dlehman)
-- Add Kazakh as a valid translation. (clumens)
-- Deselect any existing environment when selecting a new one (#851510).
-  (clumens)
-- Use chvt command for tty switching (vpodzime)
-- Use the disk's serial number instead of index as an ID. (clumens)
-- Use the disk's ID for deleting from the shopping cart, not an index
-  (#853798). (clumens)
-- Use the F18_Partition class (#853593). (clumens)
-- Remove anaconda.instLanguage object and language module (vpodzime)
-- Remove lang-table and localeinfo.py (vpodzime)
-- parse-kickstart: handle 'network --ipv6=auto ...' (wwoods)
-- parse-kickstart: set IPV6INIT=yes when using ipv6 (#830434) (wwoods)
-- Make TUI password spoke behave the same as it's GUI counterpart (msivak)
-- Remove ROOT_PATH/etc/localtime before symlinking timezone (vpodzime)
-- Continue post-installation steps even if writing NTP configuration fails
-  (vpodzime)
-- update transifex.txt for newui (bcl)
-- Handle invalid spoke input (#853253) (jkeating)
-- Remove unnecessary (and broken) import (#853576) (jkeating)
-- Destroy the Add Mountpoint dialog when escape is pressed (#853058). (clumens)
-- Keep the current spoke on top of the hub. (clumens)
-- And then fix an assortment of non-packaging pylint errors, too. (clumens)
-- Fix problems in the packaging module that pylint detected. (clumens)
-- Update runpylint to find newui modules correctly. (clumens)
-- Prevent duplicate mountpoint creation. (dlehman)
-- If there's only one disk, select it by default. (dlehman)
-- Evaulate growth potential for all reqs, even when allocating a fixed req.
-  (dlehman)
-- Do not honor partitions' disk attr when reallocating them. (dlehman)
-- Set size is a safe max size for partitions. (dlehman)
-- Set the ANACONDA udev property in the post-switchroot udevdb. (dlehman)
-- Calculate size func kwargs at call time to pick up changes. (dlehman)
-- Add support md devices and btrfs raid features in the custom spoke. (dlehman)
-- Move the BTRFS options to last and remove unsupported options. (dlehman)
-- Remove "Technology" ComboBoxes from device options for now. (dlehman)
-- Tweak setContainerMembers to work with a defined md array. (dlehman)
-- Add support for named md devices. (dlehman)
-- Make sure a disk is partitioned before treating it as such. (#849707)
-  (dlehman)
-- Setup python path /after/ we've done updates (jkeating)
-- Fix a string substitution think-o (jkeating)
-- We now BuildRequires python-babel as well. (clumens)
-- Update TODO list. (clumens)
-- Only show groups in the UI if they have members that install by default
-  (default or manadtory packages). (notting)
-- Symlink /run/initramfs/inst.{updates,product} to /tmp (jkeating)
-- Use shutil.move for replacing old config with the new one (vpodzime)
-- Honor user's choice on NTP (ON/OFF) (vpodzime)
-- Don't crash if someone gives us bad timezone (vpodzime)
-- Use expand_langs to find matching language (LanguageSpoke) (vpodzime)
-- Move expandLangs to localization module (vpodzime)
-- Use Gtk.main_level() to check if main loop is already running (vpodzime)
-- Move setup from ImagePayload to LiveImagePayload. (clumens)
-- Avoid duplicates in the packages property. (clumens)
-- Set a progress message when liveinst starts installing software. (clumens)
-- Fix default definitions of some payload class methods. (clumens)
-- Add a spaceRequired property for LiveImagePayload. (clumens)
-- getDirSize should stay on a single filesystem, not look at submounts.
-  (clumens)
-- Don't look for existing installations on live devices. (clumens)
-- We don't need image_file in the live payload. (clumens)
-- Now that we're using rsync, the livecd and rootfs do not have to match.
-  (clumens)
-- Disable software selection and source spokes on live installs. (clumens)
-- Fix args to LiveImagePayload.setup (#852272). (clumens)
-- require anaconda-widgets (bcl)
-- Handle already mounted optical devices (#851274) (jkeating)
-- Return full device object of selected optical drive (jkeating)
-- Add a method to determine if device is mounted (jkeating)
-- anaconda-cleanup: fix DeviceTree args (bcl)
-- Unset install_device if repo setup fails (jkeating)
-- _peopleRepositoriesFilter -> _peopleRepositoriesFilterEntry (#852182).
-  (clumens)
-- on_*_changed callbacks take one argument, not two. (clumens)
-- Use the correct icon size constant. (clumens)
-- remove dead code (setMethodstr, expandFTPMethod) (wwoods)
-- parse-kickstart: update some TODO comments (wwoods)
-- parse-kickstart: simplify logging (wwoods)
-- enable fastestmirror yum plugin (#849797) (bcl)
-- networking: remove Network() object (rvykydal)
-- networking: use ksdata.network.hostname instead of actual installer hostname
-  (rvykydal)
-- networking: consolidate writing/copying of configuration files (rvykydal)
-- networking: 70-persistent-net.rules doesn't exist anymore. (rvykydal)
-- networking: disable ipv6 directly in installed system config file (rvykydal)
-- networking: mirror end-of-installation network config tweaks in ksdata.
-  (rvykydal)
-- networking: write configuration in doInstall (rvykydal)
-- Add mounts before swaps so the default selection is a mount. (dlehman)
-- Use MB if a new mountpoint size does not include a unit spec. (#850839)
-  (dlehman)
-- Correctly handle partitions with sizes smaller than 500MB. (#850839)
-  (dlehman)
-- Don't include removed devices in Storage.unusedDevices. (dlehman)
-- Handle SameSizeSet growth trimming when all members are too large. (dlehman)
-- Add several missing yum lock aqcuisitions. (#851212) (dlehman)
-- Offer completions for new mountpoints. (dlehman)
-- Add old_source checking for closest mirror and url methods too (#851336).
-  (clumens)
-- Revert "Only use mounted media that has repodata" (jkeating)
-- Only use mounted media that has repodata (jkeating)
-- _bootloaderClass -> bootloaderClass for some platforms (#848173). (clumens)
-- Make the storage info bar clickable to reveal error messages. (clumens)
-- Move the software-specific error message out of the DetailedErrorDialog
-  class. (clumens)
-- Add a gui password spoke (jkeating)
-- Put traceback reports on a diet. (clumens)
-
-* Wed Aug 22 2012 Chris Lumens <clumens@redhat.com> - 18.7-1
-- Do another _main_window -> main_window change. (clumens)
-- Mark the storage category title for translation. (clumens)
-- _actions should be set up in the __init__ method. (clumens)
-- Don't require hfs-tools on RHEL (#849987). (clumens)
-- dracut: remove workarounds for broken splitsep() (wwoods)
-- dracut: update Requires: in spec (wwoods)
-- Use ksdata.timezone and timezone module instead of anaconda.timezone
-  (vpodzime)
-- Remove the last usage of the system-config-date in Anaconda (vpodzime)
-- Add support for swap --hibernation on LVM (vpodzime)
-- Don't rely on selection staying selected when doing crazy things to it
-  (vpodzime)
-- Replace nonexisting icon with an existing one (DatetimeSpoke) (vpodzime)
-- integer out of range for L format code (hamzy)
-- Network spoke: use chr() instead of str() to convert dbus.Byte (#849395)
-  (rvykydal)
-- verify package checksums against metadata (bcl)
-- use F18_PartData for hibernation flag support. (bcl)
-- fix Gtk import in software.py (bcl)
-- dracut: fix rd.neednet use in parse-kickstart (#849672) (wwoods)
-- parse-anaconda-net: Add missing semicolon for dhclient.conf (bcl)
-- anaconda-modprobe: fix .ko removal (bcl)
-- Only devices that already exist may be ISO install sources (#849482).
-  (clumens)
-- Use python-meh's MainExceptionWindow's main_window property (vpodzime)
-- dracut: fix syntax error in parse-kickstart (wwoods)
-- Show fstype as "Unknown" for devices with unrecognised formatting. (dlehman)
-- BTRFS magic for custom spoke. (dlehman)
-- The device type of preexisting devices cannot be changed. (dlehman)
-- Revert old hack that disabled btrfs in the old ui. (dlehman)
-- Use correct device instance when updating selector w/ new device. (dlehman)
-- Fix a traceback when clicking on the summary in custom spoke. (dlehman)
-- Move device size calculation and setting into DeviceFactory. (dlehman)
-- Stop pretending btrfs subvols can have a size. (dlehman)
-- Fix a typo in StorageDevice._setSize. (dlehman)
-- dracut: add info about special variables to README (wwoods)
-- dracut: fix invalid use of 'eth0' (wwoods)
-- dracut: drop upgrade-specific hack (wwoods)
-- dracut: set "$netif" correctly in initqueue/online scripts (wwoods)
-- dracut: fix old-style static ip=xxx gw=yyy... (wwoods)
-- dracut: import anaconda-lib.sh in pre-udev hook (wwoods)
-- dracut: fix set_neednet so network comes up (#849672) (wwoods)
-- dracut: drop save_netinfo (wwoods)
-- move anaconda-modprobe to pre-udev hook, silence modprobe errors (wwoods)
-- parse-kickstart: fix crash with PXE + ks=file: (#844478) (wwoods)
-- parse-kickstart: clarify/refactor Network handling (wwoods)
-- Actually create default ifcfg files (#849012) (rvykydal)
-- Don't fail on write of nonexisting IfcfgFile(SimpleConfigFile) (#849012,
-  #849095) (rvykydal)
-- If dracut left the DVD mounted, don't try to remount it (#849152). (clumens)
-- Add support for most device editing functions. (dlehman)
-- Various fixes, cleanups, and added logging for the custom spoke. (dlehman)
-- Work around some signal handling issues in the custom spoke. (dlehman)
-- Make choosing an auto-selected page after refresh slightly less fallible.
-  (dlehman)
-- Raise an exception if a new device ends up with size 0. (dlehman)
-- Split out logic to determine container based on factory and/or device.
-  (dlehman)
-- Allow adding disks to a container's disk set. (dlehman)
-- Allow passing a device into newDevice for adjustment. (dlehman)
-- Add PartitionFactory class so partitions don't need a separate code path.
-  (dlehman)
-- Add a convenience method for scheduling resize actions. (dlehman)
-- Return early from doKickstartStorage if there are no disks selected.
-  (dlehman)
-- Remove isomd5sum-static from build requires (vpodzime)
-- Don't rely on having some network devices available (vpodzime)
-- Enlightbox mainExceptionWindow (vpodzime)
-- Put mainExceptionWindow in a WindowGroup (vpodzime)
-- Bump required yum version to get the environment code. (notting)
-- Add a flag so we don't get spurious 'change' events from the treeview while
-  we're setting up the UI. (notting)
-- Wire in the new environment logic through the UI. (notting)
-- Add a local method for exposing group visibility from the comps file.
-  (notting)
-- Add methods to yumpayload for handling environments. (notting)
-- Add some nicer wording to the column heads in the software selection UI.
-  (notting)
-- Rename 'description' to 'groupDescription'. (notting)
-- dracut: add README (wwoods)
-
-* Thu Aug 16 2012 Chris Lumens <clumens@redhat.com> - 18.6-1
-- Remove linuxrc.s390 (dcantrell)
-- Source in url-lib.sh if we don't have it (#847831) (jkeating)
-- parse-kickstart: add proc_cmdline (fix init_logger()) (wwoods)
-- Remove the data/bootdisk directory tree. (clumens)
-- Remove duplicate boot disk setting code (#848841). (clumens)
-- Force authconfig to be installed on the target system (#848803). (clumens)
-
-* Wed Aug 15 2012 Chris Lumens <clumens@redhat.com> - 18.5-1
-- Mark/unmark some strings for translation, as appropriate. (clumens)
-- Save the distro label into the right variable for retranslation. (clumens)
-- Add custom widget files to POTFILES.in. (clumens)
-- Fix attribution on common UI code. (clumens)
-- don't set armMachine in class definition (bcl)
-- libudev now has a version of .1 (hamzy)
-- Load anaconda-lib.sh if necessary (jkeating)
-- Use shell code to work around missing basename (jkeating)
-- Enable text mode once again! (jkeating)
-- Update text prompt to include c for continue (jkeating)
-- Don't continue if incomplete spokes exist (jkeating)
-- Return a bool for timezone completed property (jkeating)
-- Add a text progress hub to do the install (jkeating)
-- text based storage spoke. (jkeating)
-- Allow updating tmux.conf via makeupdates. (clumens)
-- Prevent yum messages from showing on tty (jkeating)
-- Remove unused imports from the installclasses. (clumens)
-- NoSuchGroup is provided by packaging now.  yuminstall is on the way out.
-  (clumens)
-- Set transaction color in case of multilib install. (clumens)
-- Add selinux-specific RPM macro setup. (clumens)
-- Add the user-agent to urlgrabber from the old yuminstall.py. (clumens)
-- Fix inheritance problems with the gui *Spoke classes. (clumens)
-- Only setup python-meh when doing graphical installs (jkeating)
-- Call the correct method to schedule the screen (jkeating)
-- Add a missing import of os (jkeating)
-- Don't display indirect spokes in the hub (jkeating)
-- Revert "Remove unncessary __init__ definition. (clumens)" (jkeating)
-- Honor displayMode from kickstart files (jkeating)
-- Merge master into newtui (jkeating)
-- Remove the base_tests file for now (jkeating)
-- Remove unused import of UIObject (jkeating)
-- Fix up detailederror for new common UI code (jkeating)
-- Translate the base text hub class (jkeating)
-- Translate the base tui class strings (jkeating)
-- Remove unncessary __init__ definition. (clumens) (jkeating)
-- Translate some strings in the base tui spokes classes (jkeating)
-- Always use collect directly from common (jkeating)
-- Add comment headers to the new files (jkeating)
-- Ad source files to POTFILES.in (msivak)
-- Merge remote-tracking branch 'origin/master' into newtui (msivak)
-- import localization stuff and use it to translate more strings (msivak)
-- finish renaming _mainloop (msivak)
-- Fix naming for data attribute and move the NormalSpoke.__init__ under the
-  proper class (msivak)
-- Improve documentation and add licensing headers (msivak)
-- Add translations to the simpleline framework (msivak)
-- Add translations to Password Spoke (msivak)
-- Add elementary timezone spoke (msivak)
-- Pass screen args argument to prompt and input methods + fix for run-text-
-  spoke (msivak)
-- Merge master into newtui (msivak)
-- Add automake files for TUI (msivak)
-- add couple of tests and fix write method of widget (newline added unwanted
-  space) (msivak)
-- add couple of tests and support for them (msivak)
-- add documentation and comments to TUI classes (msivak)
-- Add documentation to the simpleline library for TUI (msivak)
-- Add the new Summary hub and Password TUI spokes + tools to test TUI stuff
-  (msivak)
-- Fix bits and pieces to make TUI hub and spoke model work + example Hub and
-  Password spoke (msivak)
-- Create common abstract classes usable for all types of UI (msivak)
-- Create the base classes for TUI Hub and Spoke model (msivak)
-- Make collect and part of UserInterface setup more generic (msivak)
-- Text based UI framework core (msivak)
-
-* Mon Aug 13 2012 Chris Lumens <clumens@redhat.com> - 18.4-1
-- dracut: fix inst.ks.sendmac (#826657) (wwoods)
-- dracut: suppress ks errors from missing %%include (wwoods)
-- dracut: add comment to run_kickstart() (wwoods)
-- Remove unused writeKS methods. (clumens)
-- Only show unused devices that haven't been removed/deleted. (dlehman)
-- Don't unexpand already-expanded pages when trying to expand them again.
-  (dlehman)
-- Make parents of hidden devices appear to be leaves. (dlehman)
-- Remove the right device name from the lvm filter when unhiding device.
-  (dlehman)
-- Take configured filesystems into account when checking package space.
-  (dlehman)
-- Make sure the ksdata autopart type matches the storage one. (dlehman)
-- Base auto-generated name prefixes on productName, not device type. (dlehman)
-- Remove shrink code that was a workaround for the old ui flow. (dlehman)
-- Remove old ui progress args from devicelibs.btrfs. (dlehman)
-- Make sure we allocate partitions and grow lvm as needed in kickstart.
-  (dlehman)
-- Streamline autopart request setup slightly. (dlehman)
-- Make it possible to call setUpBootLoader safely at any time. (dlehman)
-- Move setup of new partition weight arg to Storage.newPartition. (dlehman)
-- Use a copy of the main Storage instance during custom partitioning. (dlehman)
-- Track requested sizes of btrfs subvols. (dlehman)
-- Add a method to retrieve a devicetree device by id number. (dlehman)
-- Fix DiskLabel so it can be deep-copied. (dlehman)
-- Add a method to produce a deep copy of a Storage instance. (dlehman)
-- Fix subtraction for Size. (dlehman)
-- Add support for creating device based on a top-down specification. (dlehman)
-- Add size-set managers to keep a set of growable requests in sync. (dlehman)
-- Add a function to estimate required disk space for an md array. (dlehman)
-- Add a method to estimate disk space needs for a new logical volume. (dlehman)
-- Add a convenience method for new btrfs subvols and drop subvol size args.
-  (dlehman)
-- Use the UEFI shim to load grub. (pjones)
-- Check that Gtk.main is not already running before starting another one
-  (vpodzime)
-- With tmux, we no longer need to start up a shell during VNC installs.
-  (clumens)
-- We no longer need getkeymaps, mapshdr, or readmap. (clumens)
-- Remove the last references to isysLoadKeymap. (clumens)
-- remove Security class (bcl)
-- replace lokkit for selinux settings (#815540) (bcl)
-- tests: Add tests for new SimpleConfigFile features (bcl)
-- tests: cleanup whitespace in simpleconfig_test.py (bcl)
-- simpleconfig: rewrite to better support commented config files (bcl)
-- If the anaconda process crashes, don't delete its window. (clumens)
-- On interactive installs, default the root account to locked. (clumens)
-- Make the keyboard layout test a big text area instead of a single line.
-  (clumens)
-- Remove our loadKeymap code from isys (vpodzime)
-- Replace system-config-keyboard with our methods using ksdata.keyboard
-  (vpodzime)
-- A little fix of newui -> master merge (iscsi offload devices) (rvykydal)
-- Require new version of python-meh (vpodzime)
-- Modify kernelPackages to select the right kernel for ARM systems. (dmarlin)
-- ARM: clean up the kernel selection to be consistent with the rest of the code
-  (dennis)
-- add command line option to set the arm platform. (dennis)
-- Add support to determine the ARM processor variety and select the correct
-  kernel to install. (dmarlin)
-- TODO list updates. (clumens)
-- Sent pot file updates to the master branch in transifex, not f17. (clumens)
-
-* Fri Aug 03 2012 Chris Lumens <clumens@redhat.com> - 18.3-1
-- New graphical user interface.
-- Removed loader.
-
-* Wed Apr 18 2012 Brian C. Lane <bcl@redhat.com> - 18.2-1
-- Fixes from F17 branch
+- bump major version number
diff --git a/anaconda/configure b/anaconda/configure
index aae4f15..7e98043 100755
--- a/anaconda/configure
+++ b/anaconda/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for anaconda 20.25.16.
+# Generated by GNU Autoconf 2.69 for anaconda 21.48.21.
 #
 # Report bugs to <anaconda-devel-list@redhat.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='anaconda'
 PACKAGE_TARNAME='anaconda'
-PACKAGE_VERSION='20.25.16'
-PACKAGE_STRING='anaconda 20.25.16'
+PACKAGE_VERSION='21.48.21'
+PACKAGE_STRING='anaconda 21.48.21'
 PACKAGE_BUGREPORT='anaconda-devel-list@redhat.com'
 PACKAGE_URL=''
 
@@ -632,11 +632,11 @@ ac_includes_default="\
 #endif"
 
 gt_needs=
-ac_header_list=
 enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+LIBOBJS
 subdirs
 IS_LIVEINST_ARCH_FALSE
 IS_LIVEINST_ARCH_TRUE
@@ -646,21 +646,6 @@ LIBARCHIVE_LIBS
 LIBARCHIVE_CFLAGS
 RPM_LIBS
 RPM_CFLAGS
-LIBNM_GLIB_LIBS
-LIBNM_GLIB_CFLAGS
-LIBNL_LIBS
-LIBNL_CFLAGS
-NETWORKMANAGER_LIBS
-NETWORKMANAGER_CFLAGS
-GDK_LIBS
-GDK_CFLAGS
-GTK_X11_LIBS
-GTK_X11_CFLAGS
-GLIB_LIBS
-GLIB_CFLAGS
-XCOMPOSITE_LIBS
-XCOMPOSITE_CFLAGS
-X11_CFLAGS
 PYTHON_LIBS
 PYTHON_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -675,12 +660,7 @@ PYTHON_EXEC_PREFIX
 PYTHON_PREFIX
 PYTHON_VERSION
 PYTHON
-LIBOBJS
-ALLOCA
 XMKMF
-ZLIB_LIBS
-AUDIT_LIBS
-X11_LIBS
 POSUB
 LTLIBINTL
 LIBINTL
@@ -855,22 +835,6 @@ PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 PYTHON_CFLAGS
 PYTHON_LIBS
-X11_CFLAGS
-X11_LIBS
-XCOMPOSITE_CFLAGS
-XCOMPOSITE_LIBS
-GLIB_CFLAGS
-GLIB_LIBS
-GTK_X11_CFLAGS
-GTK_X11_LIBS
-GDK_CFLAGS
-GDK_LIBS
-NETWORKMANAGER_CFLAGS
-NETWORKMANAGER_LIBS
-LIBNL_CFLAGS
-LIBNL_LIBS
-LIBNM_GLIB_CFLAGS
-LIBNM_GLIB_LIBS
 RPM_CFLAGS
 RPM_LIBS
 LIBARCHIVE_CFLAGS
@@ -1415,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures anaconda 20.25.16 to adapt to many kinds of systems.
+\`configure' configures anaconda 21.48.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1489,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of anaconda 20.25.16:";;
+     short | recursive ) echo "Configuration of anaconda 21.48.21:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1485,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
@@ -1547,31 +1511,6 @@ Some influential environment variables:
   PYTHON_CFLAGS
               C compiler flags for PYTHON, overriding pkg-config
   PYTHON_LIBS linker flags for PYTHON, overriding pkg-config
-  X11_CFLAGS  C compiler flags for X11, overriding pkg-config
-  X11_LIBS    linker flags for X11, overriding pkg-config
-  XCOMPOSITE_CFLAGS
-              C compiler flags for XCOMPOSITE, overriding pkg-config
-  XCOMPOSITE_LIBS
-              linker flags for XCOMPOSITE, overriding pkg-config
-  GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
-  GLIB_LIBS   linker flags for GLIB, overriding pkg-config
-  GTK_X11_CFLAGS
-              C compiler flags for GTK_X11, overriding pkg-config
-  GTK_X11_LIBS
-              linker flags for GTK_X11, overriding pkg-config
-  GDK_CFLAGS  C compiler flags for GDK, overriding pkg-config
-  GDK_LIBS    linker flags for GDK, overriding pkg-config
-  NETWORKMANAGER_CFLAGS
-              C compiler flags for NETWORKMANAGER, overriding pkg-config
-  NETWORKMANAGER_LIBS
-              linker flags for NETWORKMANAGER, overriding pkg-config
-  LIBNL_CFLAGS
-              C compiler flags for LIBNL, overriding pkg-config
-  LIBNL_LIBS  linker flags for LIBNL, overriding pkg-config
-  LIBNM_GLIB_CFLAGS
-              C compiler flags for LIBNM_GLIB, overriding pkg-config
-  LIBNM_GLIB_LIBS
-              linker flags for LIBNM_GLIB, overriding pkg-config
   RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
   RPM_LIBS    linker flags for RPM, overriding pkg-config
   LIBARCHIVE_CFLAGS
@@ -1645,7 +1584,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-anaconda configure 20.25.16
+anaconda configure 21.48.21
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1920,60 +1859,6 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -2065,6 +1950,114 @@ fi
 
 } # ac_fn_c_check_header_mongrel
 
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
+
 # ac_fn_c_find_intX_t LINENO BITS VAR
 # -----------------------------------
 # Finds a signed integer type with width BITS, setting cache variable VAR
@@ -2140,122 +2133,11 @@ $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_find_intX_t
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_member
-
-# ac_fn_c_find_uintX_t LINENO BITS VAR
-# ------------------------------------
-# Finds an unsigned integer type with width BITS, setting cache variable VAR
-# accordingly.
-ac_fn_c_find_uintX_t ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
-$as_echo_n "checking for uint$2_t... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-     # Order is important - never check a type that is potentially smaller
-     # than half of the expected target width.
-     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
-	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  case $ac_type in #(
-  uint$2_t) :
-    eval "$3=yes" ;; #(
-  *) :
-    eval "$3=\$ac_type" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       if eval test \"x\$"$3"\" = x"no"; then :
-
-else
-  break
-fi
-     done
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_find_uintX_t
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by anaconda $as_me 20.25.16, which was
+It was created by anaconda $as_me 21.48.21, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2536,9 +2418,6 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
 fi
 
 gt_needs="$gt_needs "
-as_fn_append ac_header_list " stdlib.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_header_list " sys/param.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2607,7 +2486,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3122,7 +3001,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='anaconda'
- VERSION='20.25.16'
+ VERSION='21.48.21'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3289,6 +3168,47 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -4233,6 +4153,65 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -11987,6 +11966,7 @@ CC="$lt_save_CC"
 
 
 
+
 # Check for the intltool programs
 # These checks and subsitutions are adapted IT_PROG_INTLTOOL provided in
 # intltool.m4, but without the parts where it breaks gettext.
@@ -12092,13 +12072,6 @@ INTLTOOL_DESKTOP_RULE='%.desktop:  %.desktop.in  $(INTLTOOL_MERGE) $(wildcard $(
 
 
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
@@ -12122,15 +12095,14 @@ $as_echo "$USE_NLS" >&6; }
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -12245,15 +12217,14 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -12323,15 +12294,14 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -12415,6 +12385,7 @@ fi
   prefix="$acl_save_prefix"
 
 
+
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -12425,21 +12396,21 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -12449,11 +12420,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
+    [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -12478,23 +12449,26 @@ if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -12514,12 +12488,14 @@ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if ${acl_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -12702,7 +12678,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -13231,15 +13207,19 @@ if eval \${$gt_func_gnugettext_libc+:} false; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
@@ -13297,14 +13277,16 @@ else
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
@@ -13319,14 +13301,16 @@ rm -f core conftest.err conftest.$ac_objext \
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
@@ -13350,15 +13334,17 @@ if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-            am_save_LIBS="$LIBS"
+                  am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
+
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13367,6 +13353,7 @@ else
 #include <string.h>
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -13383,7 +13370,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -13402,7 +13390,27 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -13421,7 +13429,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -13435,8 +13444,8 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
+    result |= 16;
+  return result;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -13553,7 +13562,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -13951,6 +13960,7 @@ else
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -13959,11 +13969,14 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
@@ -13979,6 +13992,7 @@ rm -f core conftest.err conftest.$ac_objext \
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -13987,19 +14001,22 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -14117,148 +14134,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 
 
-
-
-# Checks for libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGetWindowAttributes in -lX11" >&5
-$as_echo_n "checking for XGetWindowAttributes in -lX11... " >&6; }
-if ${ac_cv_lib_X11_XGetWindowAttributes+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XGetWindowAttributes ();
-int
-main ()
-{
-return XGetWindowAttributes ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_X11_XGetWindowAttributes=yes
-else
-  ac_cv_lib_X11_XGetWindowAttributes=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XGetWindowAttributes" >&5
-$as_echo "$ac_cv_lib_X11_XGetWindowAttributes" >&6; }
-if test "x$ac_cv_lib_X11_XGetWindowAttributes" = xyes; then :
-  X11_LIBS=-lX11
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "*** libX11 not usable.
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5
-$as_echo_n "checking for audit_open in -laudit... " >&6; }
-if ${ac_cv_lib_audit_audit_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-laudit  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char audit_open ();
-int
-main ()
-{
-return audit_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_audit_audit_open=yes
-else
-  ac_cv_lib_audit_audit_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_open" >&5
-$as_echo "$ac_cv_lib_audit_audit_open" >&6; }
-if test "x$ac_cv_lib_audit_audit_open" = xyes; then :
-  AUDIT_LIBS=-laudit
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "*** libaudit not usable.
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
-$as_echo_n "checking for zlibVersion in -lz... " >&6; }
-if ${ac_cv_lib_z_zlibVersion+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char zlibVersion ();
-int
-main ()
-{
-return zlibVersion ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_zlibVersion=yes
-else
-  ac_cv_lib_z_zlibVersion=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5
-$as_echo "$ac_cv_lib_z_zlibVersion" >&6; }
-if test "x$ac_cv_lib_z_zlibVersion" = xyes; then :
-  ZLIB_LIBS=-lz
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "*** libz not usable.
-See \`config.log' for more details" "$LINENO" 5; }
-fi
+# Also update in gettextver in anaconda.spec.in
 
 
 # Checks for header files.
@@ -14455,284 +14331,7 @@ else
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_working_alloca_h=yes
-else
-  ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-				    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_alloca_works=yes
-else
-  ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_c_stack_direction=0
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
-  return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_stack_direction=1
-else
-  ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-for ac_header in sys/types.h netinet/in.h arpa/nameser.h netdb.h resolv.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>   /* inet_ functions / structs */
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#  include <arpa/nameser.h> /* DNS HEADER struct */
-#endif
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
-$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-if ${ac_cv_header_sys_types_h_makedev+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-int
-main ()
-{
-return makedev(0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_header_sys_types_h_makedev=yes
-else
-  ac_cv_header_sys_types_h_makedev=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
-$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
-
-if test $ac_cv_header_sys_types_h_makedev = no; then
-ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-
-$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
-
-fi
-
-
-
-  if test $ac_cv_header_sys_mkdev_h = no; then
-    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-
-$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
-
-fi
-
-
-  fi
-fi
-
-for ac_header in argz.h arpa/inet.h fcntl.h inttypes.h libintl.h limits.h \
-                  malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h \
-                  string.h strings.h sys/ioctl.h sys/mount.h sys/param.h \
-                  sys/socket.h sys/time.h sys/vfs.h syslog.h termios.h \
-                  unistd.h utime.h wchar.h
+for ac_header in fcntl.h stdlib.h string.h sys/time.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -14752,111 +14351,6 @@ done
 
 
 # Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-$as_echo "#define uid_t int" >>confdefs.h
-
-
-$as_echo "#define gid_t int" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
-case $ac_cv_c_int32_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int32_t $ac_cv_c_int32_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 if test "x$ac_cv_type_pid_t" = xyes; then :
 
@@ -14890,28 +14384,6 @@ _ACEOF
 
 fi
 
-ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
-case $ac_cv_c_uint16_t in #(
-  no|yes) ;; #(
-  *)
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint16_t $ac_cv_c_uint16_t
-_ACEOF
-;;
-  esac
-
 ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
 case $ac_cv_c_uint32_t in #(
   no|yes) ;; #(
@@ -14926,34 +14398,6 @@ _ACEOF
 ;;
   esac
 
-ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
-case $ac_cv_c_uint64_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT64_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint64_t $ac_cv_c_uint64_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
-case $ac_cv_c_uint8_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT8_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint8_t $ac_cv_c_uint8_t
-_ACEOF
-;;
-  esac
-
 ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
 case $ac_cv_c_int64_t in #(
   no|yes) ;; #(
@@ -14967,106 +14411,6 @@ esac
 
 
 # Checks for library functions.
-for ac_header in unistd.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UNISTD_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5
-$as_echo_n "checking for working chown... " >&6; }
-if ${ac_cv_func_chown_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_chown_works=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-#include <fcntl.h>
-
-int
-main ()
-{
-  char *f = "conftest.chown";
-  struct stat before, after;
-
-  if (creat (f, 0600) < 0)
-    return 1;
-  if (stat (f, &before) < 0)
-    return 1;
-  if (chown (f, (uid_t) -1, (gid_t) -1) == -1)
-    return 1;
-  if (stat (f, &after) < 0)
-    return 1;
-  return ! (before.st_uid == after.st_uid && before.st_gid == after.st_gid);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_chown_works=yes
-else
-  ac_cv_func_chown_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-rm -f conftest.chown
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5
-$as_echo "$ac_cv_func_chown_works" >&6; }
-if test $ac_cv_func_chown_works = yes; then
-
-$as_echo "#define HAVE_CHOWN 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
-$as_echo_n "checking for error_at_line... " >&6; }
-if ${ac_cv_lib_error_at_line+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <error.h>
-int
-main ()
-{
-error_at_line (0, 0, "", 0, "an error occurred");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_error_at_line=yes
-else
-  ac_cv_lib_error_at_line=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-$as_echo "$ac_cv_lib_error_at_line" >&6; }
-if test $ac_cv_lib_error_at_line = no; then
-  case " $LIBOBJS " in
-  *" error.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS error.$ac_objext"
- ;;
-esac
-
-fi
-
 for ac_header in vfork.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
@@ -15280,408 +14624,7 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f conftest.sym conftest.file
-echo >conftest.file
-if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-struct stat sbuf;
-     /* Linux will dereference the symlink and fail, as required by POSIX.
-	That is better in the sense that it means we will not
-	have to compile and use the lstat wrapper.  */
-     return lstat ("conftest.sym/", &sbuf) == 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_lstat_dereferences_slashed_symlink=yes
-else
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-else
-  # If the `ln -s' command failed, then we probably don't even
-  # have an lstat function.
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-fi
-rm -f conftest.sym conftest.file
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
-
-test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
-
-cat >>confdefs.h <<_ACEOF
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-_ACEOF
-
-
-if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
-  case " $LIBOBJS " in
-  *" lstat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
- ;;
-esac
-
-fi
-
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
-
-
-
-  for ac_header in $ac_header_list
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-for ac_func in getpagesize
-do :
-  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-$as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  const char *cdata2;
-  int i, pagesize;
-  int fd, fd2;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    return 2;
-  if (write (fd, data, pagesize) != pagesize)
-    return 3;
-  close (fd);
-
-  /* Next, check that the tail of a page is zero-filled.  File must have
-     non-zero length, otherwise we risk SIGBUS for entire page.  */
-  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
-  if (fd2 < 0)
-    return 4;
-  cdata2 = "";
-  if (write (fd2, cdata2, 1) != 1)
-    return 5;
-  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
-  if (data2 == MAP_FAILED)
-    return 6;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data2 + i))
-      return 7;
-  close (fd2);
-  if (munmap (data2, pagesize))
-    return 8;
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    return 9;
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 10;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      return 11;
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    return 12;
-  if (read (fd, data3, pagesize) != pagesize)
-    return 13;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      return 14;
-  close (fd);
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-$as_echo "#define HAVE_MMAP 1" >>confdefs.h
-
-fi
-rm -f conftest.mmap conftest.txt
-
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_realloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *realloc ();
-#endif
-
-int
-main ()
-{
-return ! realloc (0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_realloc_0_nonnull=yes
-else
-  ac_cv_func_realloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
-if test $ac_cv_func_realloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" realloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define realloc rpl_realloc" >>confdefs.h
-
-fi
-
-
-for ac_func in dup2 fdatasync ftruncate getcwd gethostbyname gettimeofday \
-                lchown memmove memset mkdir mkfifo munmap realpath select \
-                setenv sethostname socket strcasecmp strchr strcspn strdup \
-                strerror strncasecmp strndup strrchr strstr strtol strtoul \
-                strverscmp uname utime wcwidth
+for ac_func in getcwd memset mkdir strchr strdup
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -16319,734 +15262,6 @@ $as_echo "no" >&6; }
 	fi
 fi
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
-$as_echo_n "checking for X11... " >&6; }
-
-if test -n "$X11_CFLAGS"; then
-    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 >= 1.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11 >= 1.3") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11 >= 1.3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$X11_LIBS"; then
-    pkg_cv_X11_LIBS="$X11_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 >= 1.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11 >= 1.3") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11 >= 1.3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 >= 1.3" 2>&1`
-        else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 >= 1.3" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$X11_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (x11 >= 1.3) were not met:
-
-$X11_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables X11_CFLAGS
-and X11_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables X11_CFLAGS
-and X11_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	X11_CFLAGS=$pkg_cv_X11_CFLAGS
-	X11_LIBS=$pkg_cv_X11_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCOMPOSITE" >&5
-$as_echo_n "checking for XCOMPOSITE... " >&6; }
-
-if test -n "$XCOMPOSITE_CFLAGS"; then
-    pkg_cv_XCOMPOSITE_CFLAGS="$XCOMPOSITE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite >= 0.4.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xcomposite >= 0.4.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XCOMPOSITE_CFLAGS=`$PKG_CONFIG --cflags "xcomposite >= 0.4.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$XCOMPOSITE_LIBS"; then
-    pkg_cv_XCOMPOSITE_LIBS="$XCOMPOSITE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite >= 0.4.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xcomposite >= 0.4.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XCOMPOSITE_LIBS=`$PKG_CONFIG --libs "xcomposite >= 0.4.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite >= 0.4.1" 2>&1`
-        else
-	        XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite >= 0.4.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XCOMPOSITE_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (xcomposite >= 0.4.1) were not met:
-
-$XCOMPOSITE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XCOMPOSITE_CFLAGS
-and XCOMPOSITE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XCOMPOSITE_CFLAGS
-and XCOMPOSITE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	XCOMPOSITE_CFLAGS=$pkg_cv_XCOMPOSITE_CFLAGS
-	XCOMPOSITE_LIBS=$pkg_cv_XCOMPOSITE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
-$as_echo_n "checking for GLIB... " >&6; }
-
-if test -n "$GLIB_CFLAGS"; then
-    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GLIB_LIBS"; then
-    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16.1" 2>&1`
-        else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLIB_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.16.1) were not met:
-
-$GLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-	GLIB_LIBS=$pkg_cv_GLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_X11" >&5
-$as_echo_n "checking for GTK_X11... " >&6; }
-
-if test -n "$GTK_X11_CFLAGS"; then
-    pkg_cv_GTK_X11_CFLAGS="$GTK_X11_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-x11-3.0 >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-x11-3.0 >= 3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_X11_CFLAGS=`$PKG_CONFIG --cflags "gtk+-x11-3.0 >= 3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GTK_X11_LIBS"; then
-    pkg_cv_GTK_X11_LIBS="$GTK_X11_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-x11-3.0 >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-x11-3.0 >= 3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_X11_LIBS=`$PKG_CONFIG --libs "gtk+-x11-3.0 >= 3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GTK_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-x11-3.0 >= 3.0" 2>&1`
-        else
-	        GTK_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-x11-3.0 >= 3.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_X11_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gtk+-x11-3.0 >= 3.0) were not met:
-
-$GTK_X11_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTK_X11_CFLAGS
-and GTK_X11_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTK_X11_CFLAGS
-and GTK_X11_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GTK_X11_CFLAGS=$pkg_cv_GTK_X11_CFLAGS
-	GTK_X11_LIBS=$pkg_cv_GTK_X11_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
-$as_echo_n "checking for GDK... " >&6; }
-
-if test -n "$GDK_CFLAGS"; then
-    pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gdk-3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GDK_LIBS"; then
-    pkg_cv_GDK_LIBS="$GDK_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gdk-3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs "gdk-3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-3.0" 2>&1`
-        else
-	        GDK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-3.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GDK_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gdk-3.0) were not met:
-
-$GDK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDK_CFLAGS
-and GDK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDK_CFLAGS
-and GDK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GDK_CFLAGS=$pkg_cv_GDK_CFLAGS
-	GDK_LIBS=$pkg_cv_GDK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORKMANAGER" >&5
-$as_echo_n "checking for NETWORKMANAGER... " >&6; }
-
-if test -n "$NETWORKMANAGER_CFLAGS"; then
-    pkg_cv_NETWORKMANAGER_CFLAGS="$NETWORKMANAGER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_NETWORKMANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.7.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$NETWORKMANAGER_LIBS"; then
-    pkg_cv_NETWORKMANAGER_LIBS="$NETWORKMANAGER_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_NETWORKMANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.7.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "NetworkManager >= 0.7.1" 2>&1`
-        else
-	        NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "NetworkManager >= 0.7.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$NETWORKMANAGER_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (NetworkManager >= 0.7.1) were not met:
-
-$NETWORKMANAGER_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables NETWORKMANAGER_CFLAGS
-and NETWORKMANAGER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables NETWORKMANAGER_CFLAGS
-and NETWORKMANAGER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	NETWORKMANAGER_CFLAGS=$pkg_cv_NETWORKMANAGER_CFLAGS
-	NETWORKMANAGER_LIBS=$pkg_cv_NETWORKMANAGER_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL" >&5
-$as_echo_n "checking for LIBNL... " >&6; }
-
-if test -n "$LIBNL_CFLAGS"; then
-    pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-1 >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-1 >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-1 >= 1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBNL_LIBS"; then
-    pkg_cv_LIBNL_LIBS="$LIBNL_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-1 >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-1 >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-1 >= 1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-1 >= 1.0" 2>&1`
-        else
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-1 >= 1.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libnl-1 >= 1.0) were not met:
-
-$LIBNL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBNL_CFLAGS
-and LIBNL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBNL_CFLAGS
-and LIBNL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS
-	LIBNL_LIBS=$pkg_cv_LIBNL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM_GLIB" >&5
-$as_echo_n "checking for LIBNM_GLIB... " >&6; }
-
-if test -n "$LIBNM_GLIB_CFLAGS"; then
-    pkg_cv_LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= 0.7.1 libnm-util >= 0.7.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnm-glib >= 0.7.1 libnm-util >= 0.7.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "libnm-glib >= 0.7.1 libnm-util >= 0.7.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBNM_GLIB_LIBS"; then
-    pkg_cv_LIBNM_GLIB_LIBS="$LIBNM_GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= 0.7.1 libnm-util >= 0.7.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnm-glib >= 0.7.1 libnm-util >= 0.7.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNM_GLIB_LIBS=`$PKG_CONFIG --libs "libnm-glib >= 0.7.1 libnm-util >= 0.7.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm-glib >= 0.7.1 libnm-util >= 0.7.1" 2>&1`
-        else
-	        LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm-glib >= 0.7.1 libnm-util >= 0.7.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNM_GLIB_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libnm-glib >= 0.7.1 libnm-util >= 0.7.1) were not met:
-
-$LIBNM_GLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBNM_GLIB_CFLAGS
-and LIBNM_GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBNM_GLIB_CFLAGS
-and LIBNM_GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	LIBNM_GLIB_CFLAGS=$pkg_cv_LIBNM_GLIB_CFLAGS
-	LIBNM_GLIB_LIBS=$pkg_cv_LIBNM_GLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RPM" >&5
 $as_echo_n "checking for RPM... " >&6; }
@@ -17297,7 +15512,7 @@ PACKAGE_RELEASE=$rel
 
 s_arch="`echo $build_cpu | sed -e s/i.86/i386/ -e s/powerpc.*/ppc/`"
 
- if test x$s_arch = xppc || test x$s_arch = xi386 || test x$s_arch = xx86_64; then
+ if test x$s_arch = xppc || test x$s_arch = xppc64 || test x$s_arch = xppc64le || test x$s_arch = xi386 || test x$s_arch = xx86_64; then
   IS_LIVEINST_ARCH_TRUE=
   IS_LIVEINST_ARCH_FALSE='#'
 else
@@ -17311,7 +15526,7 @@ fi
 subdirs="$subdirs widgets"
 
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/command-stubs/Makefile docs/Makefile dracut/Makefile pyanaconda/installclasses/Makefile data/liveinst/Makefile data/liveinst/console.apps/Makefile data/liveinst/gnome/Makefile data/liveinst/pam.d/Makefile data/pixmaps/Makefile data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/apps/Makefile data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/apps/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/256x256/Makefile data/icons/hicolor/256x256/apps/Makefile data/systemd/Makefile po/Makefile.in scripts/Makefile pyanaconda/Makefile pyanaconda/isys/Makefile pyanaconda/packaging/Makefile pyanaconda/ui/Makefile pyanaconda/ui/lib/Makefile pyanaconda/ui/gui/categories/Makefile pyanaconda/ui/gui/hubs/Makefile pyanaconda/ui/gui/spokes/Makefile pyanaconda/ui/gui/spokes/advstorage/Makefile pyanaconda/ui/gui/spokes/lib/Makefile pyanaconda/ui/gui/tools/Makefile pyanaconda/ui/gui/Makefile pyanaconda/ui/tui/hubs/Makefile pyanaconda/ui/tui/simpleline/Makefile pyanaconda/ui/tui/spokes/Makefile pyanaconda/ui/tui/tools/Makefile pyanaconda/ui/tui/Makefile data/post-scripts/Makefile tests/Makefile utils/Makefile utils/dd/Makefile"
+ac_config_files="$ac_config_files Makefile data/Makefile data/command-stubs/Makefile docs/Makefile dracut/Makefile pyanaconda/installclasses/Makefile data/liveinst/Makefile data/liveinst/console.apps/Makefile data/liveinst/gnome/Makefile data/liveinst/pam.d/Makefile data/systemd/Makefile data/help/Makefile data/help/en-US/Makefile po/Makefile.in scripts/Makefile pyanaconda/Makefile pyanaconda/version.py pyanaconda/isys/Makefile pyanaconda/packaging/Makefile pyanaconda/ui/Makefile pyanaconda/ui/categories/Makefile pyanaconda/ui/lib/Makefile pyanaconda/ui/gui/hubs/Makefile pyanaconda/ui/gui/spokes/Makefile pyanaconda/ui/gui/spokes/advstorage/Makefile pyanaconda/ui/gui/spokes/lib/Makefile pyanaconda/ui/gui/tools/Makefile pyanaconda/ui/gui/Makefile pyanaconda/ui/tui/hubs/Makefile pyanaconda/ui/tui/simpleline/Makefile pyanaconda/ui/tui/spokes/Makefile pyanaconda/ui/tui/tools/Makefile pyanaconda/ui/tui/Makefile data/post-scripts/Makefile tests/Makefile utils/Makefile utils/dd/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17847,7 +16062,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by anaconda $as_me 20.25.16, which was
+This file was extended by anaconda $as_me 21.48.21, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17913,7 +16128,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-anaconda config.status 20.25.16
+anaconda config.status 21.48.21
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18340,30 +16555,18 @@ do
     "data/liveinst/console.apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/liveinst/console.apps/Makefile" ;;
     "data/liveinst/gnome/Makefile") CONFIG_FILES="$CONFIG_FILES data/liveinst/gnome/Makefile" ;;
     "data/liveinst/pam.d/Makefile") CONFIG_FILES="$CONFIG_FILES data/liveinst/pam.d/Makefile" ;;
-    "data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;;
-    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-    "data/icons/hicolor/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/Makefile" ;;
-    "data/icons/hicolor/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/16x16/Makefile" ;;
-    "data/icons/hicolor/16x16/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/16x16/apps/Makefile" ;;
-    "data/icons/hicolor/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/Makefile" ;;
-    "data/icons/hicolor/22x22/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/apps/Makefile" ;;
-    "data/icons/hicolor/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/24x24/Makefile" ;;
-    "data/icons/hicolor/24x24/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/24x24/apps/Makefile" ;;
-    "data/icons/hicolor/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/32x32/Makefile" ;;
-    "data/icons/hicolor/32x32/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/32x32/apps/Makefile" ;;
-    "data/icons/hicolor/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/Makefile" ;;
-    "data/icons/hicolor/48x48/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/apps/Makefile" ;;
-    "data/icons/hicolor/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/256x256/Makefile" ;;
-    "data/icons/hicolor/256x256/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/256x256/apps/Makefile" ;;
     "data/systemd/Makefile") CONFIG_FILES="$CONFIG_FILES data/systemd/Makefile" ;;
+    "data/help/Makefile") CONFIG_FILES="$CONFIG_FILES data/help/Makefile" ;;
+    "data/help/en-US/Makefile") CONFIG_FILES="$CONFIG_FILES data/help/en-US/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "pyanaconda/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/Makefile" ;;
+    "pyanaconda/version.py") CONFIG_FILES="$CONFIG_FILES pyanaconda/version.py" ;;
     "pyanaconda/isys/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/isys/Makefile" ;;
     "pyanaconda/packaging/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/packaging/Makefile" ;;
     "pyanaconda/ui/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/Makefile" ;;
+    "pyanaconda/ui/categories/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/categories/Makefile" ;;
     "pyanaconda/ui/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/lib/Makefile" ;;
-    "pyanaconda/ui/gui/categories/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/gui/categories/Makefile" ;;
     "pyanaconda/ui/gui/hubs/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/gui/hubs/Makefile" ;;
     "pyanaconda/ui/gui/spokes/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/gui/spokes/Makefile" ;;
     "pyanaconda/ui/gui/spokes/advstorage/Makefile") CONFIG_FILES="$CONFIG_FILES pyanaconda/ui/gui/spokes/advstorage/Makefile" ;;
@@ -19707,7 +17910,7 @@ fi
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -19723,7 +17926,8 @@ fi
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -19734,12 +17938,12 @@ fi
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
diff --git a/anaconda/configure.ac b/anaconda/configure.ac
index 237228e..860d7fa 100644
--- a/anaconda/configure.ac
+++ b/anaconda/configure.ac
@@ -20,7 +20,7 @@
 m4_define(python_required_version, 2.5)
 
 AC_PREREQ([2.63])
-AC_INIT([anaconda], [20.25.16], [anaconda-devel-list@redhat.com])
+AC_INIT([anaconda], [21.48.21], [anaconda-devel-list@redhat.com])
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2 tar-ustar])
 
 AC_CONFIG_HEADERS([config.h])
@@ -37,6 +37,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+AC_PROG_MKDIR_P
 
 # Check for the intltool programs
 # These checks and subsitutions are adapted IT_PROG_INTLTOOL provided in
@@ -64,64 +65,26 @@ INTLTOOL_DESKTOP_RULE='%.desktop:  %.desktop.in  $(INTLTOOL_MERGE) $(wildcard $(
 AC_SUBST(INTLTOOL_DESKTOP_RULE)
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
-
-# Checks for libraries.
-AC_CHECK_LIB([X11], [XGetWindowAttributes],
-             [AC_SUBST(X11_LIBS, [-lX11])],
-             [AC_MSG_FAILURE([*** libX11 not usable.])])
-
-AC_CHECK_LIB([audit], [audit_open],
-             [AC_SUBST(AUDIT_LIBS, [-laudit])],
-             [AC_MSG_FAILURE([*** libaudit not usable.])])
-
-AC_CHECK_LIB([z], [zlibVersion],
-             [AC_SUBST(ZLIB_LIBS, [-lz])],
-             [AC_MSG_FAILURE([*** libz not usable.])])
+# Also update in gettextver in anaconda.spec.in
+AM_GNU_GETTEXT_VERSION([0.18.3])
 
 # Checks for header files.
 AC_PATH_X
-AC_FUNC_ALLOCA
-AC_HEADER_RESOLV
-AC_HEADER_MAJOR
-AC_CHECK_HEADERS([argz.h arpa/inet.h fcntl.h inttypes.h libintl.h limits.h \
-                  malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h \
-                  string.h strings.h sys/ioctl.h sys/mount.h sys/param.h \
-                  sys/socket.h sys/time.h sys/vfs.h syslog.h termios.h \
-                  unistd.h utime.h wchar.h],
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h],
                  [],
                  [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
                  [])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_INT32_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
-AC_CHECK_MEMBERS([struct stat.st_rdev])
-AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
 AC_TYPE_INT64_T
 
 # Checks for library functions.
-AC_FUNC_CHOWN
-AC_FUNC_ERROR_AT_LINE
 AC_FUNC_FORK
-AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
-AC_FUNC_MALLOC
-AC_FUNC_MMAP
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([dup2 fdatasync ftruncate getcwd gethostbyname gettimeofday \
-                lchown memmove memset mkdir mkfifo munmap realpath select \
-                setenv sethostname socket strcasecmp strchr strcspn strdup \
-                strerror strncasecmp strndup strrchr strstr strtol strtoul \
-                strverscmp uname utime wcwidth],
+AC_CHECK_FUNCS([getcwd memset mkdir strchr strdup],
                [],
                [AC_MSG_FAILURE([*** Required function $ac_func not found.])])
 
@@ -142,14 +105,6 @@ PKG_CHECK_MODULES([PYTHON], [python], [
 
 # Check for libraries we need that provide pkg-config scripts
 PKG_PROG_PKG_CONFIG([0.23])
-PKG_CHECK_MODULES([X11], [x11 >= 1.3])
-PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite >= 0.4.1])
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.1])
-PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0 >= 3.0])
-PKG_CHECK_MODULES([GDK], [gdk-3.0])
-PKG_CHECK_MODULES([NETWORKMANAGER], [NetworkManager >= 0.7.1])
-PKG_CHECK_MODULES([LIBNL], [libnl-1 >= 1.0])
-PKG_CHECK_MODULES([LIBNM_GLIB], [libnm-glib >= 0.7.1 libnm-util >= 0.7.1])
 PKG_CHECK_MODULES([RPM], [rpm >= 4.10.0])
 PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.0.4])
 
@@ -216,7 +171,7 @@ AC_CANONICAL_BUILD
 s_arch="`echo $build_cpu | sed -e s/i.86/i386/ -e s/powerpc.*/ppc/`"
 
 AM_CONDITIONAL(IS_LIVEINST_ARCH,
-  [test x$s_arch = xppc || test x$s_arch = xi386 || test x$s_arch = xx86_64])
+  [test x$s_arch = xppc || test x$s_arch = xppc64 || test x$s_arch = xppc64le || test x$s_arch = xi386 || test x$s_arch = xx86_64])
 
 AC_CONFIG_SUBDIRS([widgets])
 
@@ -230,30 +185,18 @@ AC_CONFIG_FILES([Makefile
                  data/liveinst/console.apps/Makefile
                  data/liveinst/gnome/Makefile
                  data/liveinst/pam.d/Makefile
-                 data/pixmaps/Makefile
-                 data/icons/Makefile
-                 data/icons/hicolor/Makefile
-                 data/icons/hicolor/16x16/Makefile
-                 data/icons/hicolor/16x16/apps/Makefile
-                 data/icons/hicolor/22x22/Makefile
-                 data/icons/hicolor/22x22/apps/Makefile
-                 data/icons/hicolor/24x24/Makefile
-                 data/icons/hicolor/24x24/apps/Makefile
-                 data/icons/hicolor/32x32/Makefile
-                 data/icons/hicolor/32x32/apps/Makefile
-                 data/icons/hicolor/48x48/Makefile
-                 data/icons/hicolor/48x48/apps/Makefile
-                 data/icons/hicolor/256x256/Makefile
-                 data/icons/hicolor/256x256/apps/Makefile
                  data/systemd/Makefile
+                 data/help/Makefile
+                 data/help/en-US/Makefile
                  po/Makefile.in
                  scripts/Makefile
                  pyanaconda/Makefile
+                 pyanaconda/version.py
                  pyanaconda/isys/Makefile
                  pyanaconda/packaging/Makefile
                  pyanaconda/ui/Makefile
+                 pyanaconda/ui/categories/Makefile
                  pyanaconda/ui/lib/Makefile
-                 pyanaconda/ui/gui/categories/Makefile
                  pyanaconda/ui/gui/hubs/Makefile
                  pyanaconda/ui/gui/spokes/Makefile
                  pyanaconda/ui/gui/spokes/advstorage/Makefile
diff --git a/anaconda/configure.ac.orig b/anaconda/configure.ac.orig
new file mode 100644
index 0000000..237228e
--- /dev/null
+++ b/anaconda/configure.ac.orig
@@ -0,0 +1,272 @@
+# configure.ac for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+m4_define(python_required_version, 2.5)
+
+AC_PREREQ([2.63])
+AC_INIT([anaconda], [20.25.16], [anaconda-devel-list@redhat.com])
+AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2 tar-ustar])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_DEFINE_UNQUOTED([BUILD_DATE], ["`date +%m%d%Y`"], [Date of anaconda build])
+AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
+
+# Checks for programs.
+AC_PROG_AWK
+AC_PROG_GREP
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+
+# Check for the intltool programs
+# These checks and subsitutions are adapted IT_PROG_INTLTOOL provided in
+# intltool.m4, but without the parts where it breaks gettext.
+AC_PATH_PROG([INTLTOOL_EXTRACT], [intltool-extract])
+AC_PATH_PROG([INTLTOOL_MERGE], [intltool-merge])
+AS_IF([test -z "$INTLTOOL_EXTRACT" -o -z "$INTLTOOL_MERGE"],
+      [AC_MSG_ERROR([*** intltool not found])])
+
+# Add the bits for Makefile rules
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+INTLTOOL_DESKTOP_RULE='%.desktop:  %.desktop.in  $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.1])
+
+# Checks for libraries.
+AC_CHECK_LIB([X11], [XGetWindowAttributes],
+             [AC_SUBST(X11_LIBS, [-lX11])],
+             [AC_MSG_FAILURE([*** libX11 not usable.])])
+
+AC_CHECK_LIB([audit], [audit_open],
+             [AC_SUBST(AUDIT_LIBS, [-laudit])],
+             [AC_MSG_FAILURE([*** libaudit not usable.])])
+
+AC_CHECK_LIB([z], [zlibVersion],
+             [AC_SUBST(ZLIB_LIBS, [-lz])],
+             [AC_MSG_FAILURE([*** libz not usable.])])
+
+# Checks for header files.
+AC_PATH_X
+AC_FUNC_ALLOCA
+AC_HEADER_RESOLV
+AC_HEADER_MAJOR
+AC_CHECK_HEADERS([argz.h arpa/inet.h fcntl.h inttypes.h libintl.h limits.h \
+                  malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h \
+                  string.h strings.h sys/ioctl.h sys/mount.h sys/param.h \
+                  sys/socket.h sys/time.h sys/vfs.h syslog.h termios.h \
+                  unistd.h utime.h wchar.h],
+                 [],
+                 [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
+                 [])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_INT32_T
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
+AC_TYPE_INT64_T
+
+# Checks for library functions.
+AC_FUNC_CHOWN
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_FORK
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_FUNC_MMAP
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([dup2 fdatasync ftruncate getcwd gethostbyname gettimeofday \
+                lchown memmove memset mkdir mkfifo munmap realpath select \
+                setenv sethostname socket strcasecmp strchr strcspn strdup \
+                strerror strncasecmp strndup strrchr strstr strtol strtoul \
+                strverscmp uname utime wcwidth],
+               [],
+               [AC_MSG_FAILURE([*** Required function $ac_func not found.])])
+
+AM_PATH_PYTHON(python_required_version)
+
+# Check for the python extension paths
+PKG_CHECK_MODULES([PYTHON], [python], [
+    LIBS_save="$LIBS"
+    LIBS="$LIBS $PYTHON_LIBS"
+    AC_MSG_CHECKING([Python libraries])
+    AC_TRY_LINK_FUNC([Py_Initialize], 
+                     [AC_MSG_RESULT([yes])], 
+                     [AC_MSG_RESULT([no])
+                      AC_MSG_FAILURE([*** Unable to use python library])])
+    LIBS="$LIBS_save"
+    ],
+    [AC_MSG_FAILURE([*** Unable to find python library])])
+
+# Check for libraries we need that provide pkg-config scripts
+PKG_PROG_PKG_CONFIG([0.23])
+PKG_CHECK_MODULES([X11], [x11 >= 1.3])
+PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite >= 0.4.1])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.1])
+PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0 >= 3.0])
+PKG_CHECK_MODULES([GDK], [gdk-3.0])
+PKG_CHECK_MODULES([NETWORKMANAGER], [NetworkManager >= 0.7.1])
+PKG_CHECK_MODULES([LIBNL], [libnl-1 >= 1.0])
+PKG_CHECK_MODULES([LIBNM_GLIB], [libnm-glib >= 0.7.1 libnm-util >= 0.7.1])
+PKG_CHECK_MODULES([RPM], [rpm >= 4.10.0])
+PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.0.4])
+
+# Set $RPM_OPT_FLAGS if we don't have it
+if test -z $RPM_OPT_FLAGS ; then
+    CFLAGS="$CFLAGS -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions"
+else
+    CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+fi
+
+# NFS support can, in theory, be enabled or disabled
+AC_ARG_ENABLE(nfs,
+    AC_HELP_STRING([--enable-nfs],
+                   [enable NFS support (default is yes)]),
+    [nfs=$enableval],
+    [nfs=yes])
+
+# IPv6 support can be enabled or disabled
+AC_ARG_ENABLE(ipv6,
+    AC_HELP_STRING([--enable-ipv6],
+                   [enable IPv6 support (default is yes)]),
+    [ipv6=$enableval],
+    [ipv6=yes])
+if test x$ipv6 = xyes ; then
+    AC_SUBST(IPV6_CFLAGS, [-DENABLE_IPV6])
+fi
+
+# GCC likes to bomb out on some ridiculous warnings.  Add your favorites
+# here.
+SHUT_UP_GCC="-Wno-unused-result"
+
+# Add remaining compiler flags we want to use
+CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+
+# Filter CFLAGS (remove duplicate flags)
+cflags_filter() {
+    have=
+    first=1
+    for flag in $* ; do
+        if test -z "`echo $have | grep -- $flag`" ; then
+            if test x$first == x1 ; then
+                first=2
+            else
+                echo -n " "
+            fi
+            echo -n $flag
+            have="$have $flag"
+        fi
+    done
+}
+CFLAGS="`cflags_filter $CFLAGS`"
+
+# Unset $(LIBS) because different programs and libraries will have different
+# lists of libraries to link with, we don't want everything linking against
+# all libraries we checked for.
+LIBS=
+
+# Get the release number from the spec file
+rel="`awk '/Release:/ { split($2, r, "%"); print r[[1]] }' $srcdir/anaconda.spec`"
+AC_SUBST(PACKAGE_RELEASE, [$rel])
+
+# Perform arch related tests
+AC_CANONICAL_BUILD
+s_arch="`echo $build_cpu | sed -e s/i.86/i386/ -e s/powerpc.*/ppc/`"
+
+AM_CONDITIONAL(IS_LIVEINST_ARCH,
+  [test x$s_arch = xppc || test x$s_arch = xi386 || test x$s_arch = xx86_64])
+
+AC_CONFIG_SUBDIRS([widgets])
+
+AC_CONFIG_FILES([Makefile
+                 data/Makefile
+                 data/command-stubs/Makefile
+                 docs/Makefile
+                 dracut/Makefile
+                 pyanaconda/installclasses/Makefile
+                 data/liveinst/Makefile
+                 data/liveinst/console.apps/Makefile
+                 data/liveinst/gnome/Makefile
+                 data/liveinst/pam.d/Makefile
+                 data/pixmaps/Makefile
+                 data/icons/Makefile
+                 data/icons/hicolor/Makefile
+                 data/icons/hicolor/16x16/Makefile
+                 data/icons/hicolor/16x16/apps/Makefile
+                 data/icons/hicolor/22x22/Makefile
+                 data/icons/hicolor/22x22/apps/Makefile
+                 data/icons/hicolor/24x24/Makefile
+                 data/icons/hicolor/24x24/apps/Makefile
+                 data/icons/hicolor/32x32/Makefile
+                 data/icons/hicolor/32x32/apps/Makefile
+                 data/icons/hicolor/48x48/Makefile
+                 data/icons/hicolor/48x48/apps/Makefile
+                 data/icons/hicolor/256x256/Makefile
+                 data/icons/hicolor/256x256/apps/Makefile
+                 data/systemd/Makefile
+                 po/Makefile.in
+                 scripts/Makefile
+                 pyanaconda/Makefile
+                 pyanaconda/isys/Makefile
+                 pyanaconda/packaging/Makefile
+                 pyanaconda/ui/Makefile
+                 pyanaconda/ui/lib/Makefile
+                 pyanaconda/ui/gui/categories/Makefile
+                 pyanaconda/ui/gui/hubs/Makefile
+                 pyanaconda/ui/gui/spokes/Makefile
+                 pyanaconda/ui/gui/spokes/advstorage/Makefile
+                 pyanaconda/ui/gui/spokes/lib/Makefile
+                 pyanaconda/ui/gui/tools/Makefile
+                 pyanaconda/ui/gui/Makefile
+                 pyanaconda/ui/tui/hubs/Makefile
+                 pyanaconda/ui/tui/simpleline/Makefile
+                 pyanaconda/ui/tui/spokes/Makefile
+                 pyanaconda/ui/tui/tools/Makefile
+                 pyanaconda/ui/tui/Makefile
+                 data/post-scripts/Makefile
+                 tests/Makefile
+                 utils/Makefile
+                 utils/dd/Makefile])
+AC_OUTPUT
diff --git a/anaconda/data/Makefile.am b/anaconda/data/Makefile.am
index 1c08ed2..463ca85 100644
--- a/anaconda/data/Makefile.am
+++ b/anaconda/data/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: Martin Sivak <msivak@redhat.com>
 
-SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts
+SUBDIRS = command-stubs liveinst systemd post-scripts help
 
 CLEANFILES = *~
 
@@ -25,4 +25,7 @@ dist_pkgdata_DATA          = interactive-defaults.ks \
 			     tmux.conf \
 			     anaconda-gtk.css
 
+helpdir               = $(datadir)/$(PACKAGE_NAME)
+dist_help_DATA        = anaconda_options.txt
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/anaconda-gtk.css b/anaconda/data/anaconda-gtk.css
index 0bd85ae..16a6ce3 100644
--- a/anaconda/data/anaconda-gtk.css
+++ b/anaconda/data/anaconda-gtk.css
@@ -109,3 +109,94 @@
 .error {
     text-shadow: none;
 }
+
+/* vendor-specific colors/images */
+
+@define-color redhat #41413e;
+@define-color fedora #2f4265;
+
+/* logo and sidebar classes for Fedora */
+
+/* The sidebar consists of three parts: a background, a logo, and a product logo,
+ * rendered in that order. The product logo is empty by default and is intended
+ * to be overridden by a stylesheet in product.img.
+ */
+.logo-sidebar {
+    background-image: url('/usr/share/anaconda/pixmaps/sidebar-bg.png');
+    background-color: @fedora;
+    background-repeat: no-repeat;
+}
+
+/* Add a logo to the sidebar */
+.logo {
+    background-image: url('/usr/share/anaconda/pixmaps/sidebar-logo.png');
+    background-position: 50% 20px;
+    background-repeat: no-repeat;
+    background-color: transparent;
+}
+
+/* This is a placeholder to be filled by a product-specific logo. */
+.product-logo {
+    background-image: none;
+    background-color: transparent;
+}
+
+AnacondaSpokeWindow #nav-box {
+    background-color: @fedora;
+    background-image: url('/usr/share/anaconda/pixmaps/topbar-bg.png');
+    background-repeat: repeat;
+    color: white;
+}
+
+/* Remove the box-shadow from buttons in the nav-box because it adds a white stripe
+ * below the buttons and makes them look dumb */
+AnacondaSpokeWindow #nav-box GtkButton {
+    box-shadow: none;
+}
+
+AnacondaSpokeWindow #nav-box {
+    background-color: @fedora;
+}
+
+/* These rules were removed when the Adwaita theme moved from
+ * gnome-themes-standard to gtk. The selectors had been wildcards, but after
+ * the move they were replaced with more specific selectors, because gtk is
+ * maintained by garbage people who don't care about how anyone else's
+ * applications look. We need to apply the old style to anconda's custom
+ * widgets in order for the selection highlight and insensitive shading to
+ * appear.
+ */
+@define-color anaconda_selected_bg_color #4a90d9;
+@define-color anaconda_selected_fg_color #ffffff;
+
+AnacondaMountpointSelector:selected,
+AnacondaDiskOverview:selected,
+AnacondaSpokeSelector:selected,
+AnacondaMountpointSelector:selected:focus,
+AnacondaDiskOverview:selected:focus,
+AnacondaSpokeSelector:selected:focus {
+    background-color: @anaconda_selected_bg_color;
+    color: @anaconda_selected_fg_color;
+}
+
+@define-color anaconda_insensitive_bg_color #f4f4f2;
+@define-color anaconda_insensitive_fg_color #a7aba7;
+@define-color anaconda_internal_element_color #888a85;
+@define-color anaconda_insensitive_borders shade(@anaconda_internal_element_color, 1.37);
+
+AnacondaMountpointSelector:insensitive,
+AnacondaDiskOverview:insensitive,
+AnacondaSpokeSelector:insensitive {
+    background-color: @anaconda_insensitive_bg_color;
+    color: @anaconda_insensitive_fg_color;
+    border-color: @anaconda_insensitive_borders;
+}
+
+/* When multi-column GtkTreeViews set a row separator, the horizontal-separator
+ * style property is still applied to the row separator, breaking the row
+ * separator up for each column. It looks kind of dumb. Provide a way to not do
+ * that.
+ */
+GtkTreeView.solid-separator {
+    -GtkTreeView-horizontal-separator: 0;
+}
diff --git a/anaconda/data/anaconda_options.txt b/anaconda/data/anaconda_options.txt
new file mode 100644
index 0000000..12a10d9
--- /dev/null
+++ b/anaconda/data/anaconda_options.txt
@@ -0,0 +1,233 @@
+cmdline
+Force command line installation mode. This mode simply prints out text and does not allow any interactivity.
+All options must be specified either in a kickstart file or on the command line. If all required options
+are not specified, the installation will terminate immediately. If running in PXE, network or media
+installation mode Anaconda will also reboot the machine. This can be prevented by passing the "inst.nokill"
+boot option.
+
+graphical
+Force graphical installation. A graphical installation implies that the installed system will
+boot up into graphical.target, using whichever display manager is in use by the default desktop
+(gdm for GNOME, kdm for KDE).
+
+text
+Force text mode installation. This also implies that the installed system will boot up in text mode
+instead of to the graphical login screen.
+
+proxy
+Use the given proxy settings when performing an installation from a HTTP/HTTPS/FTP source.
+The PROXY_URL can be specified like this: [PROTOCOL://][USERNAME[:PASSWORD]@]HOST[:PORT]
+
+debug
+Show debug level messages in the log watching consoles.
+This basically a shortcut for for loglevel=debug.
+
+ks
+Gives the location of the kickstart file to be used for installation. The KICKSTART_URL
+supports fetching kickstarts from HTTP/S, FTP, NFS, from a local file, from a local
+harddrive, from an optical disk and from BIOS RAID sets. For details on the KICKSTART_URL
+syntax see the Anaconda options wiki page: http://fedoraproject.org/wiki/Anaconda_Boot_Options
+
+kickstart
+Gives the local file path to use for kickstart. Normally only used when running anaconda
+from the cmdline.
+
+rescue
+Start the rescue environment instead of installation.
+
+armplatform
+Can be used to specify the ARM platform for the installation by passing the appropriate PLATFORM_ID.
+
+multilib
+Enable yum's multlib_policy of "all" instead of the default of "best".
+
+method
+This option is deprecated in favor of the repo option. For now, it does the same thing as repo,
+but will be removed in the future.
+
+askmethod
+Do not automatically configure the Installation Source spoke, but require the user to enter it and
+choose an option. If you don't want to wait for the default configuration to be processed before
+you can enter the spoke and change it, you can pass this option.
+
+repo
+This option tells Anaconda where to find the packages for installation. This option must point to a
+valid yum repository (or, for some protocols, a Fedora DVD ISO image). It is analogous to the older
+method option, but repo makes it more clear exactly what is meant. This option may appear only once
+on the command line. It corresponds to the kickstart command install (whereas kickstart command repo
+is used for additional repositories). As of Fedora 16, you can (optionally) add a specific .iso file
+to the path. If no inst.root or inst.stage2 parameter is passed, this location will also be used
+as the source for the installer runtime image.
+For more information about the REPO_URL format check the Anaconda option documentation, available on:
+http://fedoraproject.org/wiki/Anaconda_Boot_Options
+
+stage2
+The STAGE2_URL specifies a path to a repository containing a stage2 (squashfs.img) file instead of to an
+installation source. Follows the same syntax as the repo option. If this parameter is provided,
+it takes precedence over all other methods of finding the install.img. Otherwise, Anaconda will attempt
+to find the install.img first on any existing CD, and then from the location given by repo.
+If only the stage2 option is given without repo, Anaconda will use whatever repos the installed
+system would have enabled by default for installation. For instance, an install of a Fedora release
+will attempt to use the Fedora mirrorlist given by /etc/yum.repos.d/fedora.repo from that release.
+
+noverifyssl
+Prevents Anaconda from verifying the ssl certificate for all HTTPS connections with an exception of the
+additional kickstart repos (where --noverifyssl can be set per repo).
+
+liveinst
+Run in live installation mode.
+
+resolution
+Run GUI installer in the resolution specified, "1024x768" for example.
+
+usefbx
+Use the framebuffer X driver instead of attempting to use a hardware-specific one.
+
+vnc
+Enable VNC-based installation. You will need to connect to the machine using a VNC client application.
+A VNC install implies that the installed system will boot up in runlevel 3 instead of to the graphical
+login screen. The VNC session will be shared. Consider setting a VNC password using the vncpassword
+option.
+
+vncconnect
+Once installation is up and running, connect to the VNC client named HOST, and optionally use port PORT.
+
+vncpassword
+Enable a password for the VNC connection. This will prevent someone from inadvertently connecting
+to the vnc-based installation. Requires the VNC option to be specified as well. If you have specified
+vncconnect the PASSWORD will not be used unless connection to host is not possible. Please note that
+the password needs to be 6 to 8 characters long (limitation of the VNC protocol).
+
+xdriver
+Use DRIVER as the X driver to use during installation as well as on the installed system.
+
+keymap
+Keyboard layout to use during installation and on the installed system. Valid KEYMAP values
+are those which can be used for the keyboard kickstart command.
+
+lang
+Language to use for the installation. LANG should be a language code which is valid to be used
+with the lang kickstart command.
+
+loglevel
+Set the minimum level required for messages to be logged on a terminal (log files always
+contain messages of all levels). Values for LEVEL are "debug", "info", "warning", "error",
+"critical" and "lock" (the "lock" level has been added in F21 and is used for debugging YUM locking).
+The default value is "info".
+
+syslog
+Once installation is up and running, send log messages to the syslog process on HOST,
+and optionally, on TCP port PORT. Requires the remote syslog process to accept incoming
+connections.
+
+noselinux
+Disable SELinux usage on the installed system.
+
+selinux
+Enable SELinux usage in the installed system (default). Note that when used as a boot option,
+"selinux" and "inst.selinux" are not the same. The "selinux" option is picked up by both the kernel
+and Anaconda, but "inst.selinux" is processed only by Anaconda. So when "selinux=0" is used,
+SELinux will be disabled both in the installation environment and in the installed system,
+but when "inst.selinux=0" is used SELinux will only be disabled in the installed system.
+Also note that while SELinux is running in the installation environment by default, it is
+running in permissive mode so disabling it there does not make much sense.
+
+nompath
+Disable support for multipath devices. This is for systems on which a false-positive is encountered
+which erroneously identifies a normal block device as a multipath device. There is no other reason
+to use this option. Warning: Don't use nompath with actual multipath hardware! Using this to attempt
+to install to a single path of a multipath is ill-advised, and not supported.
+
+mpath
+Enable multipath support during the installation (default)
+
+nodmraid
+Disable dmraid usage during the installation.
+
+dmraid
+Enable dmraid (Device Mapper software RAID) usage during the installation (default).
+
+noibft
+Disable iBFT usage during the installation.
+
+ibft
+Enable iBFT (iSCSI Boot Firmware Table) usage during the installation (default).
+
+geoloc
+Configure geolocation usage in Anaconda. Geolocation is used to pre-set language and time zone.
+The following values for PROVIDER_ID are supported: 0 - disable geolocation, "provider_fedora_geoip"
+- use the Fedora GeoIP API (default) and "provider_hostip" - use the Hostip.info GeoIP API.
+
+nomount
+Don't automatically mount any installed Linux partitions in rescue mode.
+
+updates
+Path to an updates image that is on local filesystem or available over FTP or HTTP.
+UPDATES_URL must be either a local filesystem path, a network URL or <disk>:<path> where
+<disk> can be one of sdX, /dev/sdX, LABEL=xxx, UUID=xxx and <path> defaults
+to /updates.img if missing. See the Anaconda docs for more details about the path specification.
+Please note that the updates image only updates the installation environment and is completely
+unrelated to package updates.
+
+dirinstall
+Use the device mounted at /mnt/sysimage as the installation
+destination. The --dirinstall and --image options are mutually
+exclusive. The /mnt/sysimage directory can be overridden by
+setting the ANACONDA_ROOT_PATH environmental variable before
+starting anaconda.
+
+image
+Specification of disk image file to be used as installation
+destination. IMAGE_SPEC must have format <path>[:<name>] where
+<path> specifies the path of an image file and an optional <name>
+component is used to identify the disk during installation.
+<path> must be a local path but it may be relative or absolute.
+If <name> is not specified, a name is synthesized from the
+basename of <path>. <name> may not contain a colon or a slash.
+This option may be used multiple times to specify multiple disk
+images. It is an error to specify the same <path> twice or to use
+duplicate names. The --image and --dirinstall options are
+mutually exclusive.
+
+memcheck
+Check if the system has enough RAM to complete the installation
+and abort if it doesn't. Please note that this check is approximate
+and that memory usage during installation depends on the package
+selection, user interface (graphical vs text) and other parameters.
+
+nomemcheck
+Do not check if the system has enough RAM to complete the installation.
+Of course, any attempt to install with less than the safe minimum amount
+of memory may fail and is unsupported.
+
+leavebootorder
+Boot the drives in their existing order, to override the default of booting
+into the newly installed drive on Power Systems servers and EFI systems.
+This is useful for systems that, for example, should network boot first
+before falling back to a local boot.
+
+noeject
+Don't eject the installation CD/DVD (if any) once the installation
+has been completed. Ignored for image, directory and livecd installs.
+
+extlinux
+Use extlinux as the bootloader. Note that there's no attempt to validate
+that this will work for your platform or anything; it assumes that if you
+ask for it, you want to try.
+
+nombr
+
+If nombr is specified the grub2 bootloader will be installed but the
+MBR will not be updated.  Therefore, when the system reboot, a previously
+installed OS will be booted.  /etc/grub.d/40_custom can be used with
+manually created menuentrys which can use configfile to point to the
+grub.cfg on the newly installed OS.
+
+dnf
+Use the experimental DNF package management backend instead of the YUM backend
+that is used by default. For more information about the DNF project see:
+http://dnf.baseurl.org
+
+mpathfriendlynames
+Tell multipathd to use user friendly names when naming devices during the installation.
+See the multipathd documentation for more info.
diff --git a/anaconda/data/command-stubs/list-harddrives-stub b/anaconda/data/command-stubs/list-harddrives-stub
index 75e8f89..ae5e6b9 100755
--- a/anaconda/data/command-stubs/list-harddrives-stub
+++ b/anaconda/data/command-stubs/list-harddrives-stub
@@ -18,15 +18,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import os
 import sys
 import parted
-import _ped
 
 def main(argv):
     lst = set()
 
-    for dev in filter(lambda d: d.type != parted.DEVICE_DM, parted.getAllDevices()):
+    for dev in filter(lambda d: d.type != parted.DEVICE_DM and not d.path.startswith("/dev/sr"), parted.getAllDevices()):
         if dev.path.startswith("/dev/"):
             path = dev.path[5:]
         else:
@@ -37,7 +35,7 @@ def main(argv):
     lst = list(lst)
     lst.sort()
     for dev, size in lst:
-        print dev, size
+        print(dev, size)
 
 if __name__ == "__main__":
     main(sys.argv)
diff --git a/anaconda/data/command-stubs/raidstart-stub b/anaconda/data/command-stubs/raidstart-stub
deleted file mode 100755
index 6913006..0000000
--- a/anaconda/data/command-stubs/raidstart-stub
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/python
-#
-# raidstart-stub
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import os
-import sys
-
-from pyanaconda import anaconda_log, fsset, raid, isys
-from sys import argv
-
-if len(argv) != 2 or argv[1][:7] != "/dev/md":
-    print "usage: raidstart /dev/md[minornum]"
-    sys.exit(1)
-
-targMinor = int(argv[1][7:])
-
-drives = isys.hardDriveDict().keys()
-drives.sort (isys.compareDrives)
-
-raidDevices = raid.scanForRaid(drives)
-for (minor, devices, level, totalDisks) in raidDevices:
-    if targMinor == minor:
-    	devName = "md%d" % (minor,)
-	isys.raidstart(devName, devices[0])
-	sys.exit(0)
-
-print "could not find devices associated with raid device md%d" % targMinor
-sys.exit(1)
diff --git a/anaconda/data/command-stubs/raidstop-stub b/anaconda/data/command-stubs/raidstop-stub
deleted file mode 100755
index 21f809d..0000000
--- a/anaconda/data/command-stubs/raidstop-stub
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/python
-#
-# raidstop-stub
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import os
-import sys
-
-from pyanaconda import anaconda_log, fsset, raid, isys
-from sys import argv
-
-if len(argv) != 2 or argv[1][:7] != "/dev/md":
-    print "usage: raidstop /dev/md[minornum]"
-    sys.exit(1)
-
-isys.raidstop(argv[1][5:])
diff --git a/anaconda/data/icons/Makefile.am b/anaconda/data/help/Makefile.am
similarity index 83%
rename from anaconda/data/icons/Makefile.am
rename to anaconda/data/help/Makefile.am
index 0fdcec3..ed2eda3 100644
--- a/anaconda/data/icons/Makefile.am
+++ b/anaconda/data/help/Makefile.am
@@ -1,6 +1,6 @@
-# icons/Makefile.am for anaconda
+# data/Makefile.am for anaconda
 #
-# Copyright (C) 2010  Red Hat, Inc.
+# Copyright (C) 2014  Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = hicolor
+# Author: Martin Kolman <mkolman@redhat.com>
+SUBDIRS = en-US
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/help/en-US/FedoraPlaceholder.html b/anaconda/data/help/en-US/FedoraPlaceholder.html
new file mode 100644
index 0000000..4d1781a
--- /dev/null
+++ b/anaconda/data/help/en-US/FedoraPlaceholder.html
@@ -0,0 +1,5 @@
+<body>
+<h1>The Anaconda built-in help</h1>
+<p>...is not yet available for this screen.</p>
+<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead.</p>
+</body>
diff --git a/anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html b/anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html
new file mode 100644
index 0000000..5fe0485
--- /dev/null
+++ b/anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html
@@ -0,0 +1,13 @@
+<body>
+<h1>The Anaconda built-in help</h1>
+<p>...is not yet available for this screen.</p>
+<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead:</p>
+<p>
+<ul>
+    <li><a href="http://docs.fedoraproject.org/en-US/Fedora/20/html/Installation_Guide/">Fedora Installation Guide</a></li>
+    <li><a href="https://fedoraproject.org/wiki/Anaconda">Anaconda Wiki</a></li>
+    <li><a href="http://fedoraproject.org/wiki/Anaconda_Boot_Options">Anaconda Boot Options</a></li>
+    <li><a href="http://fedoraproject.org/wiki/Anaconda/Kickstart">Anaconda Kickstart</a></li>
+</ul>
+</p>
+</body>
diff --git a/anaconda/data/icons/hicolor/16x16/apps/Makefile.am b/anaconda/data/help/en-US/Makefile.am
similarity index 61%
rename from anaconda/data/icons/hicolor/16x16/apps/Makefile.am
rename to anaconda/data/help/en-US/Makefile.am
index 3e8b02c..46590cb 100644
--- a/anaconda/data/icons/hicolor/16x16/apps/Makefile.am
+++ b/anaconda/data/help/en-US/Makefile.am
@@ -1,6 +1,6 @@
-# icons/hicolor/16x16/apps/Makefile.am for anaconda
+# data/Makefile.am for anaconda
 #
-# Copyright (C) 2010  Red Hat, Inc.
+# Copyright (C) 2014  Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
@@ -15,11 +15,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Author: David Cantrell <dcantrell@redhat.com>
+# Author: Martin Kolman <mkolman@redhat.com>
 
-if IS_LIVEINST_ARCH
-iconsdir        = $(datadir)/icons/hicolor/16x16/apps
-dist_icons_DATA = liveinst.png
-endif
+enhelpcontentdir              = $(datadir)/anaconda/help/en-US
+# The $(srcdir)/*.*ml expression matches both the *.html placeholders and *.xml help
+# content files. It also works around the fact that autotools complain if the xml files
+# are not present but $(srcdir)/*.xml is used.
+dist_enhelpcontent_DATA       = $(srcdir)/*.*ml
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/help/en-US/RHEL7Placeholder.html b/anaconda/data/help/en-US/RHEL7Placeholder.html
new file mode 100644
index 0000000..9f3c446
--- /dev/null
+++ b/anaconda/data/help/en-US/RHEL7Placeholder.html
@@ -0,0 +1,5 @@
+<body>
+<h1>The Anaconda built-in help</h1>
+<p>...is not yet available for this screen.</p>
+<p>You can check out the Red Hat Enterprise Linux 7 Installation Guide or other online help resources instead.</p>
+</body>
diff --git a/anaconda/data/help/en-US/RHEL7PlaceholderWithLinks.html b/anaconda/data/help/en-US/RHEL7PlaceholderWithLinks.html
new file mode 100644
index 0000000..c2da61b
--- /dev/null
+++ b/anaconda/data/help/en-US/RHEL7PlaceholderWithLinks.html
@@ -0,0 +1,11 @@
+<body>
+<h1>The Anaconda built-in help</h1>
+<p>...is not yet available for this screen.</p>
+<p>You can check the Red Hat Enterprise Linux 7 Installation Guide or Red Hat Customer Portal resources instead:</p>
+<p>
+<ul>
+    <li><a href="https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/index.html">Red Hat Enterprise Linux 7 Installation Guide</a></li>
+    <li><a href="https://access.redhat.com">Red Hat Customer Portal</a></li>
+</ul>
+</p>
+</body>
diff --git a/anaconda/data/icons/hicolor/16x16/Makefile.am b/anaconda/data/icons/hicolor/16x16/Makefile.am
deleted file mode 100644
index ab8a795..0000000
--- a/anaconda/data/icons/hicolor/16x16/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/16x16/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = apps
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/16x16/apps/liveinst.png b/anaconda/data/icons/hicolor/16x16/apps/liveinst.png
deleted file mode 100644
index 35e1f31..0000000
Binary files a/anaconda/data/icons/hicolor/16x16/apps/liveinst.png and /dev/null differ
diff --git a/anaconda/data/icons/hicolor/22x22/Makefile.am b/anaconda/data/icons/hicolor/22x22/Makefile.am
deleted file mode 100644
index 3b94dde..0000000
--- a/anaconda/data/icons/hicolor/22x22/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/22x22/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = apps
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/22x22/apps/Makefile.am b/anaconda/data/icons/hicolor/22x22/apps/Makefile.am
deleted file mode 100644
index 9a70404..0000000
--- a/anaconda/data/icons/hicolor/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# icons/hicolor/22x22/apps/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_LIVEINST_ARCH
-iconsdir        = $(datadir)/icons/hicolor/22x22/apps
-dist_icons_DATA = liveinst.png
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/22x22/apps/liveinst.png b/anaconda/data/icons/hicolor/22x22/apps/liveinst.png
deleted file mode 100644
index 3a8fe9b..0000000
Binary files a/anaconda/data/icons/hicolor/22x22/apps/liveinst.png and /dev/null differ
diff --git a/anaconda/data/icons/hicolor/24x24/Makefile.am b/anaconda/data/icons/hicolor/24x24/Makefile.am
deleted file mode 100644
index c4a4745..0000000
--- a/anaconda/data/icons/hicolor/24x24/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/24x24/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = apps
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/24x24/apps/Makefile.am b/anaconda/data/icons/hicolor/24x24/apps/Makefile.am
deleted file mode 100644
index 4396837..0000000
--- a/anaconda/data/icons/hicolor/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# icons/hicolor/24x24/apps/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_LIVEINST_ARCH
-iconsdir        = $(datadir)/icons/hicolor/24x24/apps
-dist_icons_DATA = liveinst.png
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/24x24/apps/liveinst.png b/anaconda/data/icons/hicolor/24x24/apps/liveinst.png
deleted file mode 100644
index ab00c79..0000000
Binary files a/anaconda/data/icons/hicolor/24x24/apps/liveinst.png and /dev/null differ
diff --git a/anaconda/data/icons/hicolor/256x256/Makefile.am b/anaconda/data/icons/hicolor/256x256/Makefile.am
deleted file mode 100644
index 73c80a9..0000000
--- a/anaconda/data/icons/hicolor/256x256/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/256x256/Makefile.am for anaconda
-#
-# Copyright (C) 2011  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Chris Lumens <clumens@redhat.com>
-
-SUBDIRS = apps
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/256x256/apps/Makefile.am b/anaconda/data/icons/hicolor/256x256/apps/Makefile.am
deleted file mode 100644
index 948995c..0000000
--- a/anaconda/data/icons/hicolor/256x256/apps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# icons/hicolor/256x256/apps/Makefile.am for anaconda
-#
-# Copyright (C) 2011  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Chris Lumens <clumens@redhat.com>
-
-if IS_LIVEINST_ARCH
-iconsdir        = $(datadir)/icons/hicolor/256x256/apps
-dist_icons_DATA = liveinst.png
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/256x256/apps/liveinst.png b/anaconda/data/icons/hicolor/256x256/apps/liveinst.png
deleted file mode 100644
index cc6c9fe..0000000
Binary files a/anaconda/data/icons/hicolor/256x256/apps/liveinst.png and /dev/null differ
diff --git a/anaconda/data/icons/hicolor/32x32/Makefile.am b/anaconda/data/icons/hicolor/32x32/Makefile.am
deleted file mode 100644
index 0dee034..0000000
--- a/anaconda/data/icons/hicolor/32x32/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/32x32/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = apps
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/32x32/apps/Makefile.am b/anaconda/data/icons/hicolor/32x32/apps/Makefile.am
deleted file mode 100644
index 958f780..0000000
--- a/anaconda/data/icons/hicolor/32x32/apps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# icons/hicolor/32x32/apps/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_LIVEINST_ARCH
-iconsdir        = $(datadir)/icons/hicolor/32x32/apps
-dist_icons_DATA = liveinst.png
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/32x32/apps/liveinst.png b/anaconda/data/icons/hicolor/32x32/apps/liveinst.png
deleted file mode 100644
index 64fec89..0000000
Binary files a/anaconda/data/icons/hicolor/32x32/apps/liveinst.png and /dev/null differ
diff --git a/anaconda/data/icons/hicolor/48x48/Makefile.am b/anaconda/data/icons/hicolor/48x48/Makefile.am
deleted file mode 100644
index 9d23a6e..0000000
--- a/anaconda/data/icons/hicolor/48x48/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/48x48/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = apps
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/48x48/apps/Makefile.am b/anaconda/data/icons/hicolor/48x48/apps/Makefile.am
deleted file mode 100644
index 7be016a..0000000
--- a/anaconda/data/icons/hicolor/48x48/apps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# icons/hicolor/48x48/apps/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_LIVEINST_ARCH
-iconsdir        = $(datadir)/icons/hicolor/48x48/apps
-dist_icons_DATA = liveinst.png
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/icons/hicolor/48x48/apps/liveinst.png b/anaconda/data/icons/hicolor/48x48/apps/liveinst.png
deleted file mode 100644
index 385293b..0000000
Binary files a/anaconda/data/icons/hicolor/48x48/apps/liveinst.png and /dev/null differ
diff --git a/anaconda/data/icons/hicolor/Makefile.am b/anaconda/data/icons/hicolor/Makefile.am
deleted file mode 100644
index 80c7511..0000000
--- a/anaconda/data/icons/hicolor/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# icons/hicolor/Makefile.am for anaconda
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/liveinst/Makefile.am b/anaconda/data/liveinst/Makefile.am
index 7274b3f..7a3562f 100644
--- a/anaconda/data/liveinst/Makefile.am
+++ b/anaconda/data/liveinst/Makefile.am
@@ -25,8 +25,12 @@ dist_sbin_SCRIPTS  = liveinst
 desktopdir         = $(datadir)/applications
 desktop_DATA       = liveinst.desktop
 
-xinitdir           = /etc/X11/xinit/xinitrc.d
+xinitdir           = $(sysconfdir)/X11/xinit/xinitrc.d
 dist_xinit_SCRIPTS = zz-liveinst.sh
+
+install-exec-local:
+	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(LN_S) consolehelper $(DESTDIR)$(bindir)/liveinst
 endif
 
 EXTRA_DIST = README liveinst.desktop.in
@@ -37,15 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 @INTLTOOL_DESKTOP_RULE@
 
-install-exec-local:
-	mkdir -p $(DESTDIR)$(bindir)
-	ln -s consolehelper $(DESTDIR)$(bindir)/liveinst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/liveinst
-	for d in $(DESTDIR)$(bindir) ; do
-		while [ ! -z "$$d" ]; do \
-			rmdir $$d 2>/dev/null ; \
-			d="`dirname $$d`" ; \
-		done ; \
-	done
+# Files generated for gettext need to be included in the distribution
+EXTRA_DIST += $(srcdir)/liveinst.desktop.in.h
+$(srcdir)/liveinst.desktop.in.h: $(srcdir)/liveinst.desktop.in
+	@$(MAKE) -C $(top_builddir)/po $(abs_top_srcdir)/$(subdir)/$$(basename $@)
diff --git a/anaconda/data/liveinst/console.apps/Makefile.am b/anaconda/data/liveinst/console.apps/Makefile.am
index f153902..9f15979 100644
--- a/anaconda/data/liveinst/console.apps/Makefile.am
+++ b/anaconda/data/liveinst/console.apps/Makefile.am
@@ -18,9 +18,14 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_LIVEINST_ARCH
-consoledir        = /etc/security/console.apps
+consoledir        = $(sysconfdir)/security/console.apps
 dist_console_DATA = liveinst
 endif
+#
+# Files generated for gettext need to be included in the distribution
+EXTRA_DIST = $(srcdir)/liveinst.h
+$(srcdir)/liveinst.h: $(srcdir)/liveinst
+	@$(MAKE) -C $(top_builddir)/po $(abs_top_srcdir)/$(subdir)/$$(basename $@)
 
 CLEANFILES = *.h
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/liveinst/console.apps/liveinst b/anaconda/data/liveinst/console.apps/liveinst
index 7c31081..1b3a153 100644
--- a/anaconda/data/liveinst/console.apps/liveinst
+++ b/anaconda/data/liveinst/console.apps/liveinst
@@ -3,4 +3,7 @@ PROGRAM=/usr/sbin/liveinst
 SESSION=true
 # has to be here otherwise consolehelper switches off the waiting cursor too early
 STARTUP_NOTIFICATION_NAME="Starting Install to Hard Drive"
-DOMAIN=anaconda
\ No newline at end of file
+DOMAIN=anaconda
+# DBus session connections fail when running setuid unless we pass DBUS_SESSION_BUS_ADDRESS through
+# Keep the Gdk scale settings from the user environment
+KEEP_ENV_VARS=DBUS_SESSION_BUS_ADDRESS,LIVECMD,GDK_SCALE
diff --git a/anaconda/data/liveinst/gnome/Makefile.am b/anaconda/data/liveinst/gnome/Makefile.am
index 706cd10..ae05a5c 100644
--- a/anaconda/data/liveinst/gnome/Makefile.am
+++ b/anaconda/data/liveinst/gnome/Makefile.am
@@ -28,3 +28,9 @@ CLEANFILES = fedora-welcome.desktop
 MAINTAINERCLEANFILES = Makefile.in
 
 @INTLTOOL_DESKTOP_RULE@
+
+# Files generated for gettext need to be included in the distribution
+EXTRA_DIST += $(srcdir)/fedora-welcome.po $(srcdir)/fedora-welcome.desktop.in.h
+$(srcdir)/fedora-welcome.po $(srcdir)/fedora-welcome.desktop.in.h: \
+	$(srcdir)/fedora-welcome $(srcdir)/fedora-welcome.desktop.in
+	@$(MAKE) -C $(top_builddir)/po $(abs_top_srcdir)/$(subdir)/$$(basename $@)
diff --git a/anaconda/data/liveinst/gnome/fedora-welcome b/anaconda/data/liveinst/gnome/fedora-welcome
index 8780941..c4834e7 100755
--- a/anaconda/data/liveinst/gnome/fedora-welcome
+++ b/anaconda/data/liveinst/gnome/fedora-welcome
@@ -40,14 +40,14 @@ function makeLabel(label, button) {
     let widget = new Gtk.Label();
 
     if (button)
-        widget.set_markup('<b><span size="x-large" color="white">' + label + '</span></b>');
+        widget.set_markup('<b><span size="x-large">' + label + '</span></b>');
     else {
         widget.set_line_wrap(true);
         widget.set_justify(Gtk.Justification.CENTER);
         widget.set_margin_top(32);
         widget.set_margin_bottom(32);
 
-        widget.set_markup('<span size="large" color="white">' + label + '</span>');
+        widget.set_markup('<span size="large">' + label + '</span>');
     }
 
     return widget;
@@ -61,6 +61,7 @@ const WelcomeWindow = new Lang.Class({
                                                 type: Gtk.WindowType.TOPLEVEL,
                                                 default_width: 600,
                                                 default_height: 550,
+                                                skip_taskbar_hint: true,
                                                 title: _("Welcome to Fedora"),
                                                 window_position: Gtk.WindowPosition.CENTER });
       this.window.connect('key-press-event', Lang.bind(this,
@@ -88,7 +89,7 @@ const WelcomeWindow = new Lang.Class({
 
       let tryContent = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL,
                                      spacing: 16 });
-      tryContent.add(new Gtk.Image({ icon_name: 'media-cdrom',
+      tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
                                      pixel_size: 256 }));
       tryContent.add(makeLabel(_("Try Fedora"), true));
 
@@ -99,10 +100,8 @@ const WelcomeWindow = new Lang.Class({
                                          spacing: 16 });
 
       // provided by the 'fedora-logos' package
-      let pix = GdkPixbuf.Pixbuf.new_from_file_at_size(
-          '/usr/share/icons/Fedora/scalable/apps/anaconda.svg',
-          256, 256);
-      installContent.add(new Gtk.Image({ pixbuf: pix }));
+      installContent.add(new Gtk.Image({ icon_name: 'anaconda',
+                                         pixel_size: 256 }));
       installContent.add(makeLabel(anacondaApp.get_name(), true));
 
       let installButton = new Gtk.Button({ child: installContent });
diff --git a/anaconda/data/liveinst/gnome/fedora-welcome.desktop b/anaconda/data/liveinst/gnome/fedora-welcome.desktop
index abcec9f..216c570 100644
--- a/anaconda/data/liveinst/gnome/fedora-welcome.desktop
+++ b/anaconda/data/liveinst/gnome/fedora-welcome.desktop
@@ -5,8 +5,6 @@ Name[bg]=Добре дошли във Fedora
 Name[cs]=Vítejte ve Fedoře
 Name[da]=Velkommen til Fedora
 Name[de]=Willkommen bei Fedora
-Name[en@boldquot]=Welcome to Fedora
-Name[en@quot]=Welcome to Fedora
 Name[es]=Bienvenido a Fedora
 Name[et]=Teretulemast Fedorasse
 Name[eu]=Ongi etorri Fedora-ra
@@ -33,7 +31,6 @@ Name[uk]=Вітаємо у Fedora
 Name[zh_CN]=欢迎使用 Fedora
 Name[zh_TW]=歡迎使用 Fedora
 Exec=/usr/share/anaconda/gnome/fedora-welcome
-Icon=/usr/share/icons/Fedora/256x256/places/start-here.png
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/anaconda/data/liveinst/gnome/fedora-welcome.desktop.in b/anaconda/data/liveinst/gnome/fedora-welcome.desktop.in
index bac0e0a..aebaf50 100644
--- a/anaconda/data/liveinst/gnome/fedora-welcome.desktop.in
+++ b/anaconda/data/liveinst/gnome/fedora-welcome.desktop.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
 _Name=Welcome to Fedora
 Exec=/usr/share/anaconda/gnome/fedora-welcome
-Icon=/usr/share/icons/Fedora/256x256/places/start-here.png
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/anaconda/data/liveinst/liveinst b/anaconda/data/liveinst/liveinst
index c5684e6..9d47a19 100755
--- a/anaconda/data/liveinst/liveinst
+++ b/anaconda/data/liveinst/liveinst
@@ -47,7 +47,14 @@ if [ -z "$LIVE_BLOCK" ]; then
 fi
 
 if [ $LIVE_INSTALL = 1 -a ! -b "$LIVE_BLOCK" ]; then
-  zenity --error --title="Not a Live image" --text "Can't do live image installation unless running from a live image"
+  title="Not a Live image"
+  text="Can't do live image installation unless running from a live image"
+  if which zenity &> /dev/null; then
+      zenity --error --title="$title" --text="$text"
+  else
+      echo "$title" >&2
+      echo "$text" >&2
+  fi
   exit 1
 fi
 
@@ -59,12 +66,15 @@ ANACONDA=${LIVECMD:=anaconda --liveinst --method=livecd://$LIVE_BLOCK}
 # load modules that would get loaded by the initramfs (#230945)
 for i in raid0 raid1 raid5 raid6 raid456 raid10 dm-mod dm-zero dm-mirror dm-snapshot dm-multipath dm-round-robin vfat dm-crypt cbc sha256 lrw xts iscsi_tcp iscsi_ibft; do /sbin/modprobe $i 2>/dev/null ; done
 
-export ANACONDA_PRODUCTNAME=$( cat /etc/system-release | sed -r -e 's/ *release.*//' )
-if [ $LIVE_INSTALL = 1 ]; then
+if [ -f /etc/system-release ]; then
+    export ANACONDA_PRODUCTNAME=$( cat /etc/system-release | sed -r -e 's/ *release.*//' )
     export ANACONDA_PRODUCTVERSION=$( cat /etc/system-release | sed -r -e 's/^.* ([0-9\.]+).*$/\1/' )
-elif [ $IMAGE_INSTALL = 1 ]; then
+fi
+
+if [ $IMAGE_INSTALL = 1 ]; then
     export ANACONDA_PRODUCTVERSION=$(rpmquery -q --qf '%{VERSION}' anaconda | cut -d. -f1)
 fi
+
 export ANACONDA_BUGURL=${ANACONDA_BUGURL:="https://bugzilla.redhat.com/bugzilla/"}
 
 RELEASE=$(rpm -q --qf '%{Release}' fedora-release)
@@ -103,6 +113,27 @@ for opt in `cat /proc/cmdline` $*; do
     --inst.updates=*)
         UPDATES="${opt#--inst.updates=}"
         ;;
+    --updates)
+        title="updates error"
+        text="liveinst requires --updates=<url> instead of --updates <url>"
+        if which zenity &> /dev/null; then
+            zenity --error --no-markup --title="$title" --text="$text"
+        else
+            echo "$title" >&2
+            echo "$text" >&2
+        fi
+        exit 1
+        ;;
+    ks=*|kickstart=*|--ks=*|--kickstart=*|inst.ks=*|--inst.ks=*|inst.kickstart=*|--inst-kickstart=*)
+        title="Configuration not supported"
+        text="Kickstart is not supported on live installs.  This installation will continue interactively."
+        if which zenity &> /dev/null; then
+            zenity --warning --title="$title" --text="$text"
+         else
+            echo "$title" >&2
+            echo "$text" >&2
+         fi
+        ;;
     esac
 done
 
@@ -112,11 +143,18 @@ anaconda-cleanup $ANACONDA $*
 # Set up the updates, if provided.
 if [ ! -z "$UPDATES" ]; then
     if [ -e /tmp/updates.img -o -e /tmp/updates ]; then
-        zenity --error --title="Updates already exist" --text "updates= was provided, but an updates image already exists.  Please remove /tmp/updates.img and /tmp/updates and try again."
+        title="Updates already exist"
+        text="updates= was provided, but an updates image already exists.  Please remove /tmp/updates.img and /tmp/updates and try again."
+        if which zenity &> /dev/null; then
+            zenity --error --title="$title" --text="$text"
+        else
+            echo "$title" >&2
+            echo "$text" >&2
+        fi
         exit 1
     fi
 
-    curl -o /tmp/updates.img $UPDATES
+    curl -L -o /tmp/updates.img $UPDATES
 
     # We officially support two updates.img formats:  a filesystem image, and
     # a compressed cpio blob.
@@ -135,9 +173,6 @@ if [ ! -z "$UPDATES" ]; then
     export PATH=/tmp/updates:$PATH
 fi
 
-# Prevents breakage if the hostname is changed during the install
-xhost +si:localuser:root
-
 if [ -x /usr/bin/udisks ]; then
     /usr/bin/udisks --inhibit -- $ANACONDA $*
 else
diff --git a/anaconda/data/liveinst/liveinst.desktop.in b/anaconda/data/liveinst/liveinst.desktop.in
index c585b75..b0ef188 100644
--- a/anaconda/data/liveinst/liveinst.desktop.in
+++ b/anaconda/data/liveinst/liveinst.desktop.in
@@ -6,7 +6,7 @@ Categories=System;Utility;X-Red-Hat-Base;X-Fedora;GNOME;GTK;
 Exec=/usr/bin/liveinst
 Terminal=false
 Type=Application
-Icon=liveinst
+Icon=anaconda
 Encoding=UTF-8
 StartupNotify=true
 NoDisplay=true
diff --git a/anaconda/data/liveinst/pam.d/Makefile.am b/anaconda/data/liveinst/pam.d/Makefile.am
index 9b2bf06..cd1ad8c 100644
--- a/anaconda/data/liveinst/pam.d/Makefile.am
+++ b/anaconda/data/liveinst/pam.d/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_LIVEINST_ARCH
-pamdir        = /etc/pam.d
+pamdir        = $(sysconfdir)/pam.d
 dist_pam_DATA = liveinst
 endif
 
diff --git a/anaconda/data/liveinst/zz-liveinst.sh b/anaconda/data/liveinst/zz-liveinst.sh
index c141290..137a754 100755
--- a/anaconda/data/liveinst/zz-liveinst.sh
+++ b/anaconda/data/liveinst/zz-liveinst.sh
@@ -2,6 +2,9 @@
 # Set up a launcher on the desktop for the live installer if we're on
 # a live CD
 
+# Prevents breakage if the hostname is changed before or during the install
+[ -x /usr/bin/xhost ] && xhost +si:localuser:root > /dev/null 2>&1
+
 # don't run on geode (olpc)
 if [ `grep -c Geode /proc/cpuinfo` -eq 0 ]; then
   if [ -b /dev/mapper/live-osimg-min ]; then
diff --git a/anaconda/data/pixmaps/anaconda_spoke_header.png b/anaconda/data/pixmaps/anaconda_spoke_header.png
deleted file mode 100644
index f1feefc..0000000
Binary files a/anaconda/data/pixmaps/anaconda_spoke_header.png and /dev/null differ
diff --git a/anaconda/data/post-scripts/80-setfilecons.ks b/anaconda/data/post-scripts/80-setfilecons.ks
index 93ac962..5adae44 100644
--- a/anaconda/data/post-scripts/80-setfilecons.ks
+++ b/anaconda/data/post-scripts/80-setfilecons.ks
@@ -4,12 +4,15 @@ restorecon -ir /etc/sysconfig/network-scripts /var/lib /etc/lvm \
                /dev /etc/iscsi /var/lib/iscsi /root /var/lock /var/log \
                /etc/modprobe.d /etc/sysconfig /var/cache/yum
 
+# Also relabel the OSTree variants of the normal mounts (if they exist)
+restorecon -ir /var/roothome /var/home /var/opt /var/srv /var/media /var/mnt
+
 restorecon -i /etc/rpm/macros /etc/dasd.conf /etc/zfcp.conf /lib64 /usr/lib64 \
               /etc/blkid.tab* /etc/mtab /etc/fstab /etc/resolv.conf \
               /etc/modprobe.conf* /var/log/*tmp /etc/crypttab \
               /etc/mdadm.conf /etc/sysconfig/network /root/install.log* \
               /etc/*shadow* /etc/dhcp/dhclient-*.conf /etc/localtime \
-              /root/install.log*
+              /etc/hostname /root/install.log*
 
 if [ -e /etc/zipl.conf ]; then
     restorecon -i /etc/zipl.conf
diff --git a/anaconda/data/post-scripts/99-copy-logs.ks b/anaconda/data/post-scripts/99-copy-logs.ks
index 0060b90..ab8e9cb 100644
--- a/anaconda/data/post-scripts/99-copy-logs.ks
+++ b/anaconda/data/post-scripts/99-copy-logs.ks
@@ -1,17 +1,12 @@
 # Note, this script log will not be copied to the installed system.
 %post --nochroot
 
-mkdir -p /mnt/sysimage/var/log/anaconda
-[ -e /tmp/anaconda.log ] && cp /tmp/anaconda.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.log
-[ -e /tmp/syslog ] && cp /tmp/syslog $ANA_INSTALL_PATH/var/log/anaconda/syslog
-[ -e /tmp/X.log ] && cp /tmp/X.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.xlog
-[ -e /tmp/program.log ] && cp /tmp/program.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.program.log
-[ -e /tmp/packaging.log ] && cp /tmp/packaging.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.packaging.log
-[ -e /tmp/storage.log ] && cp /tmp/storage.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.storage.log
-[ -e /tmp/ifcfg.log ] && cp /tmp/ifcfg.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.ifcfg.log
-[ -e /tmp/yum.log ] && cp /tmp/yum.log $ANA_INSTALL_PATH/var/log/anaconda/anaconda.yum.log
+mkdir -p $ANA_INSTALL_PATH/var/log/anaconda
+for log in anaconda.log syslog X.log program.log packaging.log storage.log ifcfg.log yum.log dnf.log dnf.rpm.log; do
+    [ -e /tmp/$log ] && cp /tmp/$log $ANA_INSTALL_PATH/var/log/anaconda/
+done
 cp /tmp/ks-script*.log $ANA_INSTALL_PATH/var/log/anaconda/
-journalctl -b > $ANA_INSTALL_PATH/var/log/anaconda/anaconda.journal.log
-chmod 0600 /mnt/sysimage/var/log/anaconda/*
+journalctl -b > $ANA_INSTALL_PATH/var/log/anaconda/journal.log
+chmod 0600 $ANA_INSTALL_PATH/var/log/anaconda/*
 
 %end
diff --git a/anaconda/data/systemd/Makefile.am b/anaconda/data/systemd/Makefile.am
index 2c4e692..ababe99 100644
--- a/anaconda/data/systemd/Makefile.am
+++ b/anaconda/data/systemd/Makefile.am
@@ -21,12 +21,14 @@ systemddir = $(prefix)/lib/systemd/system
 generatordir = $(prefix)/lib/systemd/system-generators
 
 dist_systemd_DATA = anaconda.service \
+		    anaconda-noshell.service \
 		    anaconda-direct.service \
 		    anaconda.target \
 		    anaconda-tmux@.service \
 		    anaconda-shell@.service \
 		    instperf.service \
-		    anaconda-sshd.service
+		    anaconda-sshd.service \
+		    zram.service
 
 dist_generator_SCRIPTS = anaconda-generator
 
diff --git a/anaconda/data/systemd/anaconda-direct.service b/anaconda/data/systemd/anaconda-direct.service
index 61df8ca..64deda6 100644
--- a/anaconda/data/systemd/anaconda-direct.service
+++ b/anaconda/data/systemd/anaconda-direct.service
@@ -1,18 +1,17 @@
-[Install]
-WantedBy=anaconda.target
-
 [Unit]
 Description=the anaconda installation program
 Wants=instperf.service rsyslog.service systemd-udev-settle.service NetworkManager.service
 After=instperf.service rsyslog.service systemd-udev-settle.service NetworkManager.service anaconda-sshd.service
 Requires=anaconda.service
+# TODO: use ConditionArchitecture in systemd v210 or later
+ConditionPathIsDirectory=|/sys/hypervisor/s390
 
 [Service]
-Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr
+Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr GDK_BACKEND=x11 XDG_RUNTIME_DIR=/tmp
 Type=oneshot
 WorkingDirectory=/root
 ExecStart=/usr/sbin/anaconda
-StandardInput=
+StandardInput=null
 StandardOutput=journal+console
 StandardError=journal+console
 TimeoutSec=0
diff --git a/anaconda/data/systemd/anaconda-generator b/anaconda/data/systemd/anaconda-generator
index 41ee092..f09cb3b 100755
--- a/anaconda/data/systemd/anaconda-generator
+++ b/anaconda/data/systemd/anaconda-generator
@@ -1,9 +1,6 @@
 #!/bin/bash
 # anaconda-generator: generate services needed for anaconda operation
 
-# Source in the dracut lib so we can parse cmd line arguments
-. /usr/lib/dracut/modules.d/99base/dracut-lib.sh
-
 # set up dirs
 systemd_dir=/lib/systemd/system
 target_dir=$systemd_dir/anaconda.target.wants
@@ -24,27 +21,13 @@ while [ -f /sys/class/tty/$tty/active ]; do
 done
 consoletty="$tty"
 
-# put anaconda on the real console if not s390x, otherwise put anaconda direct
-if [ $(uname -m) = "s390x" ]; then
-    ln -sf $systemd_dir/anaconda-direct.service $target_dir/
-else
-    service_on_tty anaconda-tmux@.service $consoletty
-fi
+# put anaconda's tmux session on the console
+service_on_tty anaconda-tmux@.service $consoletty
 
-# put a shell on tty2 and the first virtualization console we find
-for tty in tty2 hvc0 hvc1 xvc0 hvsi0 hvsi1 hvsi2; do
+# put a shell on the first virtualization console we find
+for tty in hvc0 hvc1 xvc0 hvsi0 hvsi1 hvsi2; do
     [ "$tty" = "$consoletty" ] && continue
     if [ -d /sys/class/tty/$tty ]; then
         service_on_tty anaconda-shell@.service $tty
-        [ "$tty" != "tty2" ] && break
     fi
 done
-
-# enable the ssh service
-# NOTE: We have a match for s390x here because the console sucks on that
-# platform.  Really any platform with a crappy console that can't do curses
-# or have multiple VTs should get sshd spawned automatically, but we don't
-# yet have a good way of detecting these platforms.
-if getargbool 0 inst.sshd || [ $(uname -m) = "s390x" ]; then
-    ln -sf $systemd_dir/anaconda-sshd.service $target_dir/anaconda-sshd.service
-fi
diff --git a/anaconda/data/systemd/anaconda-noshell.service b/anaconda/data/systemd/anaconda-noshell.service
new file mode 100644
index 0000000..f378c67
--- /dev/null
+++ b/anaconda/data/systemd/anaconda-noshell.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Restrict Anaconda Text Console
+After=anaconda.service
+Before=anaconda-tmux@.service
+ConditionKernelCommandLine=|inst.noshell
+ConditionKernelCommandLine=|noshell
+
+[Service]
+Type=oneshot
+WorkingDirectory=/root
+ExecStart=/usr/bin/tmux unbind-key -a; \
+                        kill-window -t anaconda:shell; \
+                        bind-key 1 select-window -t :1; \
+                        bind-key 2 select-window -t :2; \
+                        bind-key 3 select-window -t :3; \
+                        bind-key 4 select-window -t :4; \
+                        bind-key 5 select-window -t :5; \
+                        bind-key ? list-keys
diff --git a/anaconda/data/systemd/anaconda-shell@.service b/anaconda/data/systemd/anaconda-shell@.service
index 41c4469..bc69fd1 100644
--- a/anaconda/data/systemd/anaconda-shell@.service
+++ b/anaconda/data/systemd/anaconda-shell@.service
@@ -3,10 +3,13 @@
 [Unit]
 Description=Shell on %I
 After=systemd-user-sessions.service plymouth-quit-wait.service
+ConditionKernelCommandLine=!noshell
+ConditionKernelCommandLine=!inst.noshell
 
 [Service]
 WorkingDirectory=/
-ExecStart=-/sbin/agetty -n -l /bin/bash -o '--login' %I 38400
+ExecStart=-/sbin/agetty --noclear -n -l /bin/bash -o '--login' %I 38400
+Type=idle
 Restart=always
 RestartSec=0
 TTYPath=/dev/%I
@@ -15,3 +18,4 @@ TTYVHangup=yes
 TTYVTDisallocate=yes
 KillMode=process
 KillSignal=SIGHUP
+IgnoreSIGPIPE=no
diff --git a/anaconda/data/systemd/anaconda-sshd.service b/anaconda/data/systemd/anaconda-sshd.service
index 2588a53..5209200 100644
--- a/anaconda/data/systemd/anaconda-sshd.service
+++ b/anaconda/data/systemd/anaconda-sshd.service
@@ -2,6 +2,10 @@
 Description=OpenSSH server daemon
 Before=anaconda.target
 After=syslog.target network.target
+ConditionKernelCommandLine=|sshd
+ConditionKernelCommandLine=|inst.sshd
+# TODO: use ConditionArchitecture in systemd v210 or later
+ConditionPathIsDirectory=|/sys/hypervisor/s390
 
 [Service]
 EnvironmentFile=/etc/sysconfig/sshd
diff --git a/anaconda/data/systemd/anaconda-tmux@.service b/anaconda/data/systemd/anaconda-tmux@.service
index 0b83765..e2fd1b8 100644
--- a/anaconda/data/systemd/anaconda-tmux@.service
+++ b/anaconda/data/systemd/anaconda-tmux@.service
@@ -2,14 +2,20 @@
 Description=Anaconda Text Console
 Requires=anaconda.service
 After=anaconda.target anaconda.service
+# TODO: use ConditionArchitecture in systemd v210 or later
+ConditionPathIsDirectory=!/sys/hypervisor/s390
 
 [Service]
-Type=simple
+Type=idle
 WorkingDirectory=/root
 Environment=LANG=en_US.UTF-8
 ExecStartPre=/usr/bin/echo -e \033%G
 ExecStart=/usr/bin/tmux -u attach -t anaconda
-StandardInput=tty-force
+StandardInput=tty
+StandardOutput=tty
 TTYPath=/dev/%I
 TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
 Restart=always
+RestartSec=0
diff --git a/anaconda/data/systemd/anaconda.service b/anaconda/data/systemd/anaconda.service
index 0946d70..a80c6bb 100644
--- a/anaconda/data/systemd/anaconda.service
+++ b/anaconda/data/systemd/anaconda.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Anaconda
 After=anaconda.target
+Wants=anaconda-noshell.service
 
 [Service]
 Type=forking
-Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin LANG=en_US.UTF-8
+Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin LANG=en_US.UTF-8 GDK_BACKEND=x11 XDG_RUNTIME_DIR=/tmp GIO_USE_VFS=local
 WorkingDirectory=/root
 ExecStart=/usr/bin/tmux -u -f /usr/share/anaconda/tmux.conf start
diff --git a/anaconda/data/systemd/anaconda.target b/anaconda/data/systemd/anaconda.target
index 77e42ff..e160da6 100644
--- a/anaconda/data/systemd/anaconda.target
+++ b/anaconda/data/systemd/anaconda.target
@@ -8,3 +8,6 @@ Wants=rsyslog.service
 Wants=systemd-udev-settle.service
 Wants=NetworkManager.service
 Wants=plymouth-quit.service plymouth-quit-wait.service
+Wants=anaconda-direct.service anaconda.service
+Wants=anaconda-sshd.service
+Wants=zram.service
diff --git a/anaconda/data/systemd/zram.service b/anaconda/data/systemd/zram.service
new file mode 100644
index 0000000..d2cd96c
--- /dev/null
+++ b/anaconda/data/systemd/zram.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Service enabling compressing RAM with zRam
+ConditionKernelCommandLine=!inst.zram=off
+ConditionKernelCommandLine=!inst.zram=0
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/anaconda/zramswapon
+ExecStop=/usr/libexec/anaconda/zramswapoff
+RemainAfterExit=yes
+
diff --git a/anaconda/docs/Makefile.am b/anaconda/docs/Makefile.am
index cbf244a..f8106b5 100644
--- a/anaconda/docs/Makefile.am
+++ b/anaconda/docs/Makefile.am
@@ -17,9 +17,7 @@
 #
 # Author: David Cantrell <dcantrell@redhat.com>
 
-EXTRA_DIST = boot-options.txt mediacheck.txt \
-             lvm_sanity_checks.txt rescue-mode api.cfg making-screenshots \
-             threads.txt gettext.txt transifex.txt
+EXTRA_DIST = *.rst *.txt
 
 CLEANFILES = api *.xml
 
diff --git a/anaconda/docs/boot-options.txt b/anaconda/docs/boot-options.txt
index 88fc238..983d9f2 100644
--- a/anaconda/docs/boot-options.txt
+++ b/anaconda/docs/boot-options.txt
@@ -88,6 +88,14 @@ the space character (' ').
 This specifies the location to fetch only the installer runtime image;
 packages will be ignored. Otherwise the same as <<inst.repo,`inst.repo`>>.
 
+=== inst.dd ===
+This specifies the location for driver rpms. May be specified multiple times.
+Locations may be specified using any of the formats allowed for
+<<inst.repo,`inst.repo`>>.
+
+=== inst.multilib ===
+This sets yum's multilib_policy to "all" (as opposed to "best").
+
 [[kickstart]]
 Kickstart
 ---------
@@ -99,12 +107,14 @@ Locations may be specified using any of the formats allowed for
 
 For any format the `<path>` component defaults to `/ks.cfg` if it is omitted.
 
+For NFS kickstarts, if the `<path>` ends in `/`, `<ip>-kickstart` is added.
+
 If `inst.ks` is used without a value, the installer will look for
 `nfs:<next_server>:/<filename>`:
 
 * `<next_server>` is the DHCP "next-server" option, or the IP of the DHCP server itself,
 * `<filename>` is the DHCP "filename" option, or `/kickstart/`, and
-* if the filename given ends in `/`, `<ip>-kickstart` is added
+* if the filename given ends in `/`, `<ip>-kickstart` is added (as above)
 * example:
 ** DHCP server: `192.168.122.1`
 ** client address: `192.168.122.100`
@@ -230,6 +240,11 @@ Run the installer in graphical mode. This is the default.
 Run the installer using a limited text-based UI. Unless you're using a
 kickstart file this probably isn't a good idea; you should use VNC instead.
 
+=== inst.resolution ===
+Specify screen size for the installer. Use format nxm, where n is the
+number of horizontal pixels, m the number of vertical pixels. The lowest
+supported resolution is 800x600.
+
 [[inst.vnc]]
 === inst.vnc ===
 Run the installer GUI in a VNC session. You will need a VNC client application
@@ -271,9 +286,6 @@ the `sshpw` kickstart command.
 Debugging and Troubleshooting
 -----------------------------
 
-=== inst.mediacheck ===
-Verify the installer media before starting the install.
-
 === inst.rescue ===
 Run the rescue environment. This is useful for trying to diagnose and fix
 broken systems.
@@ -303,6 +315,8 @@ Forward logs through the named virtio port (a character device at
 `/dev/virtio-ports/<name>`). A port named `org.fedoraproject.anaconda.log.0`
 will be used by default, if found.
 
+=== inst.zram ===
+Forces/disables (on/off) usage of zRAM swap for the installation process.
 
 Deprecated Options
 ------------------
@@ -376,6 +390,9 @@ Who needs to force half-duplex 10-base-T anymore?
 This was used to debug `loader`, so it has been removed. There are plenty of
 options for debugging dracut-based initramfs - see the {dracutdebug}.
 
+=== inst.mediacheck ===
+Use the dracut option rd.live.check instead.
+
 === ks=floppy ===
 We no longer support floppy drives. Try `inst.ks=hd:<device>` instead.
 
@@ -387,8 +404,10 @@ All this option actually did was set `TERM=vt100`. The default `TERM` setting
 works fine these days, so this was no longer necessary.
 
 === noipv6  ===
-ipv6 is built into the kernel and can't be removed. You should be able to
-disable it with `ipv6.disable`, though.
+ipv6 is built into the kernel and can't be removed by anaconda.
+
+You can disable ipv6 with `ipv6.disable=1`. This setting will be carried onto
+the installed system.
 
 === upgradeany ===
 Anaconda doesn't handle upgrades anymore.
diff --git a/anaconda/docs/gettext.txt b/anaconda/docs/gettext.txt
index 1bef9e4..c048b7b 100644
--- a/anaconda/docs/gettext.txt
+++ b/anaconda/docs/gettext.txt
@@ -1,6 +1,7 @@
 gettext, i18n, and the po/ subdirectory
-05-Jun-2009
+26-Nov-2013
 David Cantrell <dcantrell@redhat.com>
+David Shea <dshea@redhat.com>
 ---------------------------------------
 
 I have attempted to clean up our po/ subdirectory and bring it in to
@@ -12,15 +13,15 @@ From time to time, we may have to update our gettext template files and or
 expand or reduce the information in the files.  How do you know what files
 do what?  Here's an explanation:
 
+ABOUT-NLS
+config.rpath
 m4/gettext.m4
 m4/iconv.m4
-m4/lib-ld.m4
-m4/lib-link.m4
-m4/lib-prefix.m4
 m4/nls.m4
 m4/po.m4
-m4/progtest.m4
+m4/...
 po/Makefile.in.in
+po/Makevars.template
 po/Rules-quot
 po/boldquot.sed
 po/en@boldquot.header
@@ -29,16 +30,21 @@ po/insert-header.sin
 po/quot.sed
 po/remove-potcdate.sin
 
-    These files are copied in when 'gettextize' is run on the source
-    project.  When we need to update to a newer minimum version of
-    gettext, these files will be replaced.  In general, we should never
+    These files are copied in when 'autopoint' is run on the source
+    project, which happens as part of autogen.sh.  In general, we should never
     need to touch these files.
 
+    The autopoint tool depends on two macros in configure.ac: AM_GNU_GETTEXT,
+    and AM_GNU_GETTEXT_VERSION([<version>]). From time to time we may need to
+    update the set of gettext files that we use. To do so, update the gettext
+    version number in AM_GNU_GETTEXT_VERSION and run autogen.sh. Be sure to
+    also update the required gettext version in the spec file.
+
 po/Makevars
 
-    Should be updated when we update gettext files with a new gettextize
-    run.  A file called po/Makevars.template will appear and we can move
-    over our values to the new file and commit it.  We do not need to
+    Should be updated when we update gettext files from autopoint with a new
+    gettext version.  A file called po/Makevars.template will appear and we
+    can move over our values to the new file and commit it.  We do not need to
     change this file on a regular basis.
 
 po/POTFILES.in
@@ -46,11 +52,40 @@ po/POTFILES.in
     This file contains a listing of all source files in the project that
     have translatable strings.
 
+    Some files can't be handled by gettext directly, such as the GNOME desktop
+    files and anything without a clear filename extension. For these types of
+    files, add a rule to po/Rules-extract to create a file that gettext can
+    handle, and add the name of the generated file to po/POTFILES.in.
+
 po/LINGUAS
 
     Space-delimited list of languages available.  If a new language is
     added, it should be added to this file.
 
+po/Rules-extract
+
+    Extra Makefile rules to process files that gettext can't handle on its
+    own.
+
+    Currently there are two types of files handled in Rules-extract: files in
+    a language that gettext doesn't know, and files in a language that gettext
+    can't figure out from the filename. For the first type of file (.desktop
+    files, consolehelper files), we use intltool-extract to create a C-style
+    header file containing the translatable strings, and for the second we
+    manually run xgettext, forcing a --language setting, and generate an
+    intermediate .po file.
+
+    In both cases, the name of the generated file is what goes in
+    po/POTFILES.in.
+
+po/anaconda.pot
+
+    This is the template file built by xgettext containing all of the
+    translatable strings. The file is updated and committed to git as part of
+    building a release.
+
 po/*.po
 
-    Actual translated strings, as maintained by the translation team(s).
+    Actual translated strings, as maintained by the translation team(s). These
+    files are not stored in git. The po-pull target will pull the latest
+    translations from Transifex.
diff --git a/anaconda/dracut/Makefile.am b/anaconda/dracut/Makefile.am
index 3bab16a..ae704e9 100644
--- a/anaconda/dracut/Makefile.am
+++ b/anaconda/dracut/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: Will Woods <wwoods@redhat.com>
 
-dracutdir = /usr/lib/dracut/modules.d/80$(PACKAGE_NAME)
+dracutdir = $(prefix)/lib/dracut/modules.d/80$(PACKAGE_NAME)
 dist_dracut_SCRIPTS = module-setup.sh \
                       python-deps \
 		      anaconda-lib.sh \
@@ -33,6 +33,7 @@ dist_dracut_SCRIPTS = module-setup.sh \
 		      anaconda-diskroot \
 		      anaconda-copy-ks.sh \
 		      anaconda-copy-cmdline.sh \
+		      anaconda-ifcfg.sh \
 		      fetch-kickstart-net.sh \
 		      fetch-kickstart-disk \
 		      fetch-updates-disk \
@@ -43,7 +44,6 @@ dist_dracut_SCRIPTS = module-setup.sh \
 		      parse-anaconda-dd.sh \
 		      fetch-driver-net.sh \
 		      driver-updates@.service \
-		      driver-updates-net@.service \
 		      driver-updates.sh \
 		      driver-updates-net.sh \
 		      anaconda-depmod.sh \
diff --git a/anaconda/dracut/README-dd b/anaconda/dracut/README-dd
index 0103b56..ba3f522 100644
--- a/anaconda/dracut/README-dd
+++ b/anaconda/dracut/README-dd
@@ -6,8 +6,7 @@ modules before the rest of the installer is executed.
 
 cmdline hook
     parse-anaconda-dd.sh
-    parses the inst.dd/dd arguments for URIs and saves all of them into $dd_args
-    and calls set_neednet if network is needed to retrieve a driver rpm
+    Calls set_neednet if network is needed to retrieve a driver rpm
     The files will be downloaded when the network device online hook is executed.
 
 initqueue/online
@@ -28,14 +27,11 @@ pre-pivot hook
     anaconda-depmod.sh
     If any drivers were installed or downloaded run depmod on the $NEWROOT
 
-
 Systemd Services
-    driver-updates@.service and driver-updates-net@.service
-    These services launch the driver update UI (/bin/driver-updates). The -net
-    version passes the path to the rpm's that have been downloaded from the
-    network. They handle connecting the tty so that the user can select drivers
-    if inst.dd has been passed on the cmdline.
-
+    driver-updates@.service
+    This service launch the driver update UI (/bin/driver-updates). It handles
+    connecting the tty so that the user can select drivers if inst.dd has
+    been passed on the cmdline.
 
 driver-updates
     This searches disks labeled OEMDRV for driver update repositories and
@@ -45,7 +41,17 @@ driver-updates
 
     Pass it the path to a directory of rpms (eg. downloaded from the
     network) and it will install them before checking for additional OEMDRV
-    labeled devices.
+    labeled devices. It will also do this if /tmp/DD-net/ is present.
+
+    If /tmp/dd_args_ks is present when it runs it will ignore existing
+    OEMDRV devices and process the devices in the file first, then process
+    any new OEMDRV devices that appear.
 
     Pass inst.dd with no parameters and it will prompt the user for specific
     drivers to load using a simple text user interface.
+
+parse-kickstart
+    If the driverdisk command is present in the kickstart it will write
+    out partitions to /tmp/dd_args_ks and network sources to the cmdline
+    for normal network handling. The dd_args_ks devices are handled in
+    run_kickstart using the driver-updates@.service
diff --git a/anaconda/dracut/anaconda-ifcfg.sh b/anaconda/dracut/anaconda-ifcfg.sh
new file mode 100644
index 0000000..c1718f1
--- /dev/null
+++ b/anaconda/dracut/anaconda-ifcfg.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+command -v getarg >/dev/null || . /lib/dracut-lib.sh
+
+# initqueue/online hook passes interface name as $1
+netif="$1"
+
+# make sure we get ifcfg for every interface that comes up
+save_netinfo $netif
diff --git a/anaconda/dracut/anaconda-lib.sh b/anaconda/dracut/anaconda-lib.sh
index 86ab570..9075c5c 100755
--- a/anaconda/dracut/anaconda-lib.sh
+++ b/anaconda/dracut/anaconda-lib.sh
@@ -22,11 +22,16 @@ config_get() {
 }
 
 find_iso() {
-    local f="" iso="" isodir="$1" tmpmnt=$(mkuniqdir /run/install tmpmnt)
+    local f="" p="" iso="" isodir="$1" tmpmnt=$(mkuniqdir /run/install tmpmnt)
     for f in $isodir/*.iso; do
         [ -e $f ] || continue
         mount -o loop,ro $f $tmpmnt || continue
-        [ -e $tmpmnt/.discinfo ] && iso=$f
+        # Valid ISOs either have stage2 in one of the supported paths
+        # or have a .treeinfo that might tell use where to find the stage2 image.
+        # If it does not have any of those, it is not valid and will not be used.
+        for p in $tmpmnt/LiveOS/squashfs.img $tmpmnt/images/install.img $tmpmnt/.treeinfo; do
+            if [ -e $p ]; then iso=$f; break; fi
+        done
         umount $tmpmnt
         if [ "$iso" ]; then echo "$iso"; return 0; fi
     done
@@ -154,6 +159,12 @@ when_diskdev_appears() {
     } >> $rulesfile
 }
 
+when_any_cdrom_appears() {
+    local cmd="/sbin/initqueue --settled --onetime --name autocd $*"
+    printf 'SUBSYSTEM=="block", ENV{ID_CDROM_MEDIA}=="1", RUN+="%s"\n' "$cmd" \
+      >> $rulesfile
+}
+
 # dracut doesn't bring up the network unless:
 #   a) $netroot is set (i.e. you have a network root device), or
 #   b) /tmp/net.ifaces exists.
@@ -194,13 +205,37 @@ run_kickstart() {
 
     # re-parse new cmdline stuff from the kickstart
     . $hookdir/cmdline/*parse-anaconda-repo.sh
-    # TODO: parse for other stuff ks might set (updates, dd, etc.)
+    . $hookdir/cmdline/*parse-livenet.sh
+    # TODO: parse for other stuff ks might set (dd? other stuff?)
     case "$repotype" in
         http*|ftp|nfs*) do_net=1 ;;
         cdrom|hd|bd)    do_disk=1 ;;
     esac
     [ "$root" = "anaconda-auto-cd" ] && do_disk=1
 
+    # kickstart Driver Disk Handling
+    # parse-kickstart may have added network inst.dd entries to the cmdline
+    # Or it may have written devices to /tmp/dd_ks
+
+    # Does network need to be rerun?
+    dd_args="$(getargs dd= inst.dd=)"
+    for dd in $dd_args; do
+        case "${dd%%:*}" in
+            http|https|ftp|nfs|nfs4)
+                do_net=1
+                rm /tmp/dd_net.done
+                break
+            ;;
+        esac
+    done
+
+    # Run the driver update UI for disks
+    if [ -e "/tmp/dd_args_ks" ]; then
+        # TODO: Seems like this should be a function, a mostly same version is used in 3 places
+        start_driver_update "Kickstart Driver Update Disk"
+        rm /tmp/dd_args_ks
+    fi
+
     # replay udev events to trigger actions
     if [ "$do_disk" ]; then
         . $hookdir/pre-trigger/*repo-genrules.sh
@@ -222,3 +257,17 @@ wait_for_kickstart() {
 wait_for_updates() {
     echo "[ -e /tmp/liveupdates.done ]" > $hookdir/initqueue/finished/updates.sh
 }
+
+start_driver_update() {
+    local title="$1"
+
+    tty=$(find_tty)
+
+    # save module state
+    cat /proc/modules > /tmp/dd_modules
+
+    info "Starting $title Service on $tty"
+    systemctl start driver-updates@$tty.service
+    status=$(systemctl -p ExecMainStatus show driver-updates@$tty.service)
+    info "DD status=$status"
+}
diff --git a/anaconda/dracut/driver-updates b/anaconda/dracut/driver-updates
index 1800087..373884f 100644
--- a/anaconda/dracut/driver-updates
+++ b/anaconda/dracut/driver-updates
@@ -23,6 +23,7 @@ Driver Update Disk UI
 /tmp/dd_modules is a copy of /proc/modules at startup time
 /tmp/dd_args is a parsed list of the inst.dd= cmdline args, and may include
              'dd' or 'inst.dd' if it was specified without arguments
+/tmp/dd_args_ks is the same format, but skips processing existing OEMDRV devices.
 
 Pass a path and it will install the driver rpms from the path before checking
 for new OEMDRV devices.
@@ -41,6 +42,7 @@ import sys
 import os
 import subprocess
 import time
+import glob
 
 log = logging.getLogger("DD")
 
@@ -71,10 +73,10 @@ def run_cmd(cmd):
                 for line in out.splitlines():
                     log.debug(line)
     except OSError as e:
-        log.error("Error running %s: %s" % (cmd[0], e.strerror))
+        log.error("Error running %s: %s", cmd[0], e.strerror)
         raise
     if proc.returncode:
-        log.debug("%s returned %s" % (cmd[0], proc.returncode))
+        log.debug("%s returned %s", cmd[0], proc.returncode)
         raise RunCmdError()
     return (proc.returncode, out)
 
@@ -94,33 +96,25 @@ def oemdrv_list():
         return outlines.splitlines()
 
 
-def is_dd(dd_path):
-    """ Determine if a path is a valid DD for the current arch
-
-        :param dd_path: Path to the DD directory to test
-        :type dd_path:  string
-        :returns:       True if it is a valid DD
-        :rtype:         bool
-    """
-    arch = os.uname()[4]
-    return os.path.exists(dd_path+"/rhdd3") and \
-       not os.path.isdir(dd_path+"/rpms/%s" % arch)
-
-
 def get_dd_args():
-    """ Get the dd arguments from /tmp/dd_args
+    """ Get the dd arguments from /tmp/dd_args or /tmp/dd_args_ks
 
         :returns: List of arguments
         :rtype:   list of strings
     """
-    try:
-        dd_args = open("/tmp/dd_args", "r").readline().split()
-    except IOError:
-        return []
-
-    # skip dd args that need networking
     net_protocols = ["http", "https", "ftp", "nfs", "nfs4"]
-    return filter(lambda x: x.split(":")[0].lower() not in net_protocols, dd_args)
+    args = []
+    for dd_args_file in ["/tmp/dd_args", "/tmp/dd_args_ks"]:
+        if not os.path.exists(dd_args_file):
+            continue
+        try:
+            dd_args = open(dd_args_file, "r").readline().split()
+        except IOError:
+            return []
+
+        # skip dd args that need networking
+        args.extend(filter(lambda x: x.split(":")[0].lower() not in net_protocols, dd_args))
+    return args
 
 
 def is_interactive():
@@ -139,10 +133,13 @@ def is_interactive():
 def umount(device):
     """ Unmount the device
 
-        :param device: Device to unmount
+        :param device: Device or mountpoint to unmount
         :type device:  string
         :returns:      None
     """
+    if not device:
+        return
+
     try:
         run_cmd(["umount", device])
     except (OSError, RunCmdError):
@@ -235,7 +232,7 @@ def find_dd(mnt="/media/DD"):
         if "rhdd3" in files and "rpms" in dirs and \
           os.path.exists(root+"/rpms/"+arch):
             dd_repos.append(root+"/rpms/"+arch)
-    log.debug("Found repos - %s" % " ".join(dd_repos))
+    log.debug("Found repos - %s", " ".join(dd_repos))
     return dd_repos
 
 
@@ -255,8 +252,10 @@ def get_module_set(fname):
                     modules.update([mod_args[0]])
     return modules
 
+def to_modname(modfile):
+    return os.path.basename(modfile)[:-3].replace('-','_')
 
-def reload_modules():
+def reload_modules(newfiles):
     """ Reload new module versions from /lib/modules/<kernel>/updates/
     """
     try:
@@ -266,10 +265,15 @@ def reload_modules():
 
     # Make a list of modules added since startup
     startup_modules = get_module_set("/tmp/dd_modules")
-    startup_modules.update(["virtio_blk", "virtio_net"])
     current_modules = get_module_set("/proc/modules")
     new_modules = current_modules.difference(startup_modules)
-    log.debug("new_modules = %s" % " ".join(new_modules))
+    log.debug("new_modules = %s", " ".join(new_modules))
+
+    # And a list of modules contained in the disk we just extracted
+    dd_modules = set(to_modname(f) for f in newfiles if f.endswith(".ko"))
+    # TODO: what modules do we unload when there's new firmware?
+    log.debug("dd_modules = %s", " ".join(dd_modules))
+    new_modules.update(dd_modules)
 
     # I think we can just iterate once using modprobe -r to remove unused deps
     for module in new_modules:
@@ -373,7 +377,7 @@ def dd_extract(driver, dest_path="/updates/", kernel_ver=None):
         :type driver:     Driver object
         :param dest_path: Top directory of the destination path
         :type dest_path:  string
-        :returns:         None
+        :returns:         list of paths to extracted firmware and modules
 
         This extracts the driver's files into 'dest_path' (which defaults
         to /updates/ so that the normal live updates handling will overlay
@@ -385,11 +389,16 @@ def dd_extract(driver, dest_path="/updates/", kernel_ver=None):
     cmd = ["dd_extract", "-k", kernel_ver]
     cmd += driver.args
     cmd += ["--rpm", driver.rpm, "--directory", dest_path]
-    log.info("Extracting files from %s" % driver.rpm)
+    log.info("Extracting files from %s", driver.rpm)
+
+    # make sure the to be used directory exists
+    if not os.path.isdir(dest_path):
+        os.makedirs(dest_path)
+
     try:
         run_cmd(cmd)
     except (OSError, RunCmdError):
-        log.error("dd_extract failed, skipped %s" % driver.rpm)
+        log.error("dd_extract failed, skipped %s", driver.rpm)
         return
 
     # Create the destination directories
@@ -401,56 +410,104 @@ def dd_extract(driver, dest_path="/updates/", kernel_ver=None):
         if not os.path.exists(d):
             os.makedirs(d)
 
+    filelist = []
+
     # Copy *.ko files over to /updates/lib/modules/<kernel>/updates/
-    for root, dirs, files in os.walk(dest_path+"/lib/modules/"):
+    for root, _dirs, files in os.walk(dest_path+"/lib/modules/"):
         if root.endswith("/updates") and os.path.isdir(root):
             continue
         for f in (f for f in files if f.endswith(".ko")):
             src = root+"/"+f
+            filelist.append(src)
             copy_file(src, ko_updates)
             move_file(src, initrd_updates)
 
     # Copy the firmware updates
-    for root, dirs, files in os.walk(dest_path+"/lib/firmware/"):
+    for root, _dirs, files in os.walk(dest_path+"/lib/firmware/"):
         if root.endswith("/updates") and os.path.isdir(root):
             continue
         for f in (f for f in files):
             src = root+"/"+f
+            filelist.append(src)
             copy_file(src, firmware_updates)
             move_file(src, initrd_firmware)
 
+    # Tell our caller about the newly-extracted stuff
+    return filelist
 
-def select_drivers(drivers):
-    """ Display pages of drivers to be loaded.
 
-        :param drivers: Drivers to be selected by the user
-        :type drivers:  list of Driver objects
-        :returns:       None
+# an arbitrary value to signal refreshing the menu contents
+DoRefresh = True
+
+def selection_menu(items, title, info_func, multi_choice=True, refresh=False):
+    """ Display menu and let user select one or more choices.
+
+        :param items: list of items
+        :type items: list of objects (with the 'selected' property/attribute if
+                     multi_choice=True is used)
+        :param title: title for the menu
+        :type title: str
+        :param info_func: function providing info about items
+        :type info_func: item -> str
+        :param multi_choice: whether it is a multiple choice menu or not
+        :type multi_choice: bool
+        :returns: the selected item in case of multi_choice=False and user did
+                  selection, None otherwise
     """
+
     page_length = 20
     page = 1
-    while True:
-        # show a page of drivers
-        print("\nPage %d of %d" % (page, 1 + (len(drivers) / page_length)))
-        print("Select drivers to install")
-        for i in xrange(0, min(len(drivers), page_length)):
-            driver_idx = ((page-1) * page_length) + i
-            if drivers[driver_idx].selected:
-                selected = "x"
-            else:
-                selected = " "
-            print("%3d) [%s] %s" % (i+1, selected, drivers[driver_idx].source))
+    num_pages = len(items) / page_length
+    if len(items) % page_length > 0:
+        num_pages += 1
 
-        # Select driver to toggle, continue or change pages
-        idx = raw_input("\n# to toggle selection, 'n'-next page, 'p'-previous page or 'c'-continue: ")
-        if idx.isdigit():
-            if int(idx) < 1 or int(idx) > min(len(drivers), page_length):
-                print("Invalid selection")
-                continue
-            driver_idx = ((page-1) * page_length) + int(idx) - 1
-            drivers[driver_idx].selected = not drivers[driver_idx].selected
+    if multi_choice:
+        choice_format = "[%s]"
+    else:
+        choice_format = ""
+    format_str = "%3d) " + choice_format + " %s"
+
+    while True:
+        # show a page of items
+        print("\nPage %d of %d" % (page, num_pages))
+        print(title)
+        if page * page_length <= len(items):
+            num_items = page_length
+        else:
+            num_items = len(items) % page_length
+        for i in xrange(0, num_items):
+            item_idx = ((page-1) * page_length) + i
+            if multi_choice:
+                if items[item_idx].selected:
+                    selected = "x"
+                else:
+                    selected = " "
+                args = (i+1, selected, info_func(items[item_idx]))
+            else:
+                args = (i+1, info_func(items[item_idx]))
+            print(format_str % args)
+
+        # Select an item to toggle, continue or change pages
+        opts = ["# to select",
+                "'n'-next page",
+                "'p'-previous page",
+                "'c'-continue"]
+        if multi_choice:
+            opts[0] = "# to toggle selection"
+        if refresh:
+            opts.insert(1,"'r'-refresh")
+        idx = raw_input(''.join(['\n',
+                                ", ".join(opts[:-1]),
+                                " or ", opts[-1], ": "]))
+        if idx.isdigit() and not (int(idx) < 1 or int(idx) > num_items):
+            item_idx = ((page-1) * page_length) + int(idx) - 1
+            if multi_choice:
+                items[item_idx].selected = not items[item_idx].selected
+            else:
+                # single choice only, we can return now
+                return items[item_idx]
         elif idx.lower() == 'n':
-            if page < 1 + (len(drivers) / page_length):
+            if page < num_pages:
                 page += 1
             else:
                 print("Last page")
@@ -459,9 +516,25 @@ def select_drivers(drivers):
                 page -= 1
             else:
                 print("First page")
+        elif idx.lower() == 'r' and refresh:
+            return DoRefresh
         elif idx.lower() == 'c':
             return
+        else:
+            print("Invalid selection")
 
+def select_drivers(drivers):
+    """ Display pages of drivers to be loaded.
+
+        :param drivers: Drivers to be selected by the user
+        :type drivers:  list of Driver objects
+        :returns:       None
+    """
+    if not drivers:
+        return
+
+    selection_menu(drivers, "Select drivers to install",
+                   lambda driver: driver.source)
 
 def process_dd(dd_path):
     """ Handle installing modules, firmware, enhancements from the dd repo
@@ -471,7 +544,7 @@ def process_dd(dd_path):
         :returns:       None
     """
     drivers = dd_list(dd_path)
-    log.debug("drivers = %s" % " ".join([d.rpm for d in drivers]))
+    log.debug("drivers = %s", " ".join([d.rpm for d in drivers]))
 
     # If interactive mode or rhdd3.rules pass flag to deselect by default?
     if os.path.exists(dd_path+"/rhdd3.rules") or is_interactive():
@@ -482,19 +555,19 @@ def process_dd(dd_path):
         map(lambda d: setattr(d, "selected", True), drivers)
 
     # Copy the repository for Anaconda to use during install
-    if os.path.isdir(dd_path+"/repodata"):
-        copy_repo(dd_path, "/updates/run/install/DD-")
+    copy_repo(dd_path, "/updates/run/install/DD-")
+
+    extracted = []
 
     for driver in filter(lambda d: d.selected, drivers):
-        dd_extract(driver, "/updates/")
+        extracted += dd_extract(driver, "/updates/")
 
         # Write the package names for all modules and firmware for Anaconda
-        if os.path.isdir(dd_path+"/repodata") \
-           and ("modules" in driver.flags or "firmwares" in driver.flags):
+        if "modules" in driver.flags or "firmwares" in driver.flags:
             with open("/run/install/dd_packages", "a") as f:
                 f.write("%s\n" % driver.name)
 
-    reload_modules()
+    reload_modules(extracted)
 
 
 def select_dd(device):
@@ -512,7 +585,7 @@ def select_dd(device):
 
     dd_repos = find_dd(mnt)
     for repo in dd_repos:
-        log.info("Processing DD repo %s on %s" % (repo, device))
+        log.info("Processing DD repo %s on %s", repo, device)
         process_dd(repo)
 
     # TODO - does this need to be done before module reload?
@@ -528,48 +601,204 @@ def network_driver(dd_path):
     """
     skip_dds = set(oemdrv_list())
 
-    log.info("Processing Network Drivers from %s" % dd_path)
+    log.info("Processing Network Drivers from %s", dd_path)
+    isos = glob.glob(os.path.join(dd_path, "*.iso"))
+    for iso in isos:
+        select_dd(iso)
+
     process_dd(dd_path)
 
     # TODO: May need to add new drivers to /tmp/dd_modules to prevent them from being unloaded
 
-    # Scan for new OEMDRV devices
-    dd_scan(skip_dds)
+    # Scan for new OEMDRV devices and ignore dd_args
+    dd_scan(skip_dds, scan_dd_args=False, skip_device_menu=True)
 
+class DeviceInfo(object):
+    def __init__(self, **kwargs):
+        self.device = kwargs.get("device", None)
+        self.label = kwargs.get("label", None)
+        self.uuid = kwargs.get("uuid", None)
+        self.fs_type = kwargs.get("fs_type", None)
 
-def dd_scan(skip_dds=None):
+    def __str__(self):
+        return "%-10s %-20s %-15s %s" % (self.device or "", self.fs_type or "",
+                                        self.label or "", self.uuid or "")
+
+def parse_blkid(line):
+    """ Parse a line of output from blkid
+
+        :param line: line of output from blkid
+        :param type: string
+        :returns: {} or dict of NAME=VALUE pairs including "device"
+        :rtype: dict
+
+        blkid output cannot be trusted. labels may be missing or in a different
+        order so we parse what we get and return a dict with their values.
+    """
+    import shlex
+
+    device = {"device":None, "label":None, "uuid":None, "fs_type":None}
+    fields = shlex.split(line)
+    if len(fields) < 2 or not fields[0].startswith("/dev/"):
+        return {}
+
+    # device is in [0] and the remainder are NAME=VALUE with possible spaces
+    # Use the sda1 part of device "/dev/sda1:"
+    device['device'] = fields[0][5:-1]
+    for f in fields[1:]:
+        if "=" in f:
+            (key, val) = f.split("=", 1)
+            if key == "TYPE":
+                key = "fs_type"
+            device[key.lower()] = val
+    return device
+
+def select_iso():
+    """ Let user select device and DD ISO on it.
+
+        :returns: path to the selected ISO file and mountpoint to be unmounted
+                  or (None, None) if no ISO file is selected
+        :rtype: (str, str)
+    """
+    header = "      %-10s %-20s %-15s %s" % ("DEVICE", "TYPE", "LABEL", "UUID")
+
+    iso_dev = DoRefresh
+    while iso_dev is DoRefresh:
+        try:
+            _ret, out = run_cmd(["blkid"])
+        except (OSError, RunCmdError):
+            return (None, None)
+
+        devices = []
+        for line in out.splitlines():
+            dev = parse_blkid(line)
+            if dev:
+                devices.append(DeviceInfo(**dev))
+
+        iso_dev = selection_menu(devices,
+                                 "Driver disk device selection\n" + header,
+                                 str, multi_choice=False, refresh=True)
+
+    if not iso_dev:
+        return (None, None)
+
+    mnt = "/media/DD-search"
+    if not os.path.isdir(mnt):
+        os.makedirs(mnt)
+    if not mount_device("/dev/" + iso_dev.device, mnt):
+        print("===Cannot mount the chosen device!===\n")
+        return select_iso()
+
+    # is this device a Driver Update Disc?
+    if find_dd(mnt):
+        umount(mnt) # BLUH. unmount it first so select_dd can mount it OK
+        return ("/dev/" + iso_dev.device, None)
+
+    # maybe it's a device containing multiple DUDs - let the user pick one
+    isos = list()
+    for dir_path, _dirs, files in os.walk(mnt):
+        # trim the mount point path
+        rel_dir = dir_path[len(mnt):]
+
+        # and the starting "/" (if any)
+        if rel_dir.startswith("/"):
+            rel_dir = rel_dir[1:]
+
+        isos += (os.path.join(rel_dir, iso_file)
+                 for iso_file in files if iso_file.endswith(".iso"))
+
+    if not isos:
+        print("===No ISO files found on %s!===\n" % iso_dev.device)
+        umount(mnt)
+        return select_iso()
+    else:
+        # mount writes out some mounting information, add blank line
+        print
+
+    # let user choose the ISO file
+    dd_iso = selection_menu(isos, "Choose driver disk ISO file",
+                            lambda iso_file: iso_file,
+                            multi_choice=False)
+
+    if not dd_iso:
+        return (None, None)
+
+    return (os.path.join(mnt, dd_iso), "/media/DD-search")
+
+def dd_scan(skip_dds=None, scan_dd_args=True, skip_device_menu=False):
     """ Scan the system for OEMDRV devices and and specified by dd=/dev/<device>
 
-        :param skip_dds: devices to skip when checking for OEMDRV label
-        :type skip_dds:  set()
-        :returns:        None
+        :param skip_dds:     devices to skip when checking for OEMDRV label
+        :type skip_dds:      set()
+        :param scan_dd_args: Scan devices passed in /tmp/dd_args or dd_args_ks
+        :type scan_dd_args:  bool
+        :returns:            None
     """
-    if skip_dds:
-        dd_finished = skip_dds
-        dd_todo = set(oemdrv_list()).difference(dd_finished)
-        if dd_todo:
-            log.info("Found new OEMDRV device(s) - %s" % ", ".join(dd_todo))
-    else:
-        dd_finished = set()
-        dd_todo = set(oemdrv_list())
+    dd_todo = set(oemdrv_list())
 
+    if skip_dds is None:
+        skip_dds = set()
+
+    if skip_dds:
+        dd_todo.difference_update(skip_dds)
+        if dd_todo:
+            log.info("Found new OEMDRV device(s) - %s", ", ".join(dd_todo))
+
+    if scan_dd_args:
         # Add the user specified devices
         dd_devs = get_dd_args()
         dd_devs = [dev for dev in dd_devs if dev not in ("dd", "inst.dd")]
         dd_todo.update(dd_devs)
-        log.info("Checking devices %s" % ", ".join(dd_todo))
+        log.info("Checking devices %s", ", ".join(dd_todo))
 
     # Process each Driver Disk, checking for new disks after each one
+    dd_finished = dd_load(dd_todo, skip_dds=skip_dds)
+    skip_dds.update(dd_finished)
+
+    # Skip interactive selection of an iso if OEMDRV was found
+    if skip_dds or skip_device_menu or not is_interactive():
+        return
+
+    # Handle interactive driver selection
+    mount_point = None
+    while True:
+        iso, mount_point = select_iso()
+        if iso:
+            if iso in skip_dds:
+                skip_dds.remove(iso)
+            dd_load(set([iso]), skip_dds=skip_dds)
+            # NOTE: we intentionally do not add the newly-loaded device to
+            # skip_dds - the user might (e.g.) swap DVDs and use /dev/sr0 twice
+            umount(mount_point)
+        else:
+            break
+
+def dd_load(dd_todo, skip_dds=None):
+    """ Process each Driver Disk, checking for new disks after each one.
+        Return the set of devices that loaded stuff from.
+
+        :param dd_todo:     devices to load drivers from
+        :type dd_todo:      set
+        :param skip_dds:    devices to skip when checking for OEMDRV label
+        :type skip_dds:     set
+        :returns:           set of devices that have been loaded
+    """
+    if skip_dds is None:
+        skip_dds = set()
+
+    dd_finished = set()
     while dd_todo:
         device = dd_todo.pop()
-        log.info("Checking device %s" % device)
+        if device in skip_dds:
+            continue
+        log.info("Checking device %s", device)
         select_dd(device)
-        dd_finished.update([device])
+        dd_finished.add(device)
         new_oemdrv = set(oemdrv_list()).difference(dd_finished, dd_todo)
         if new_oemdrv:
-            log.info("Found new OEMDRV device(s) - %s" % ", ".join(new_oemdrv))
+            log.info("Found new OEMDRV device(s) - %s", ", ".join(new_oemdrv))
         dd_todo.update(new_oemdrv)
-
+    return dd_finished
 
 if __name__ == '__main__':
     log.setLevel(logging.DEBUG)
@@ -582,7 +811,20 @@ if __name__ == '__main__':
     log.addHandler(handler)
 
     if len(sys.argv) > 1:
+        # Network driver source
         network_driver(sys.argv[1])
+    elif os.path.exists("/tmp/DD-net/"):
+        network_driver("/tmp/DD-net/")
+    elif os.path.exists("/tmp/dd_args_ks"):
+        # Kickstart driverdisk command, skip existing OEMDRV devices and
+        # process cmdline dd entries. This will process any OEMDRV that
+        # appear after loading the other drivers.
+        skip_devices = set(oemdrv_list())
+        dd_scan(skip_devices, skip_device_menu=True)
     else:
+        # Process /tmp/dd_args and OEMDRV devices
+        # Show device selection menu when inst.dd passed and no OEMDRV devices
         dd_scan()
 
+    sys.exit(0)
+
diff --git a/anaconda/dracut/driver-updates-net.sh b/anaconda/dracut/driver-updates-net.sh
index d4a503f..f8bed52 100644
--- a/anaconda/dracut/driver-updates-net.sh
+++ b/anaconda/dracut/driver-updates-net.sh
@@ -5,15 +5,6 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh
 . /lib/anaconda-lib.sh
 
 if [ -n "$(ls /tmp/DD-net)" ]; then
-    # Run the systemd service for network drivers
-    tty=$(find_tty)
-
-    # Update module list so we don't unload the network driver
-    cat /proc/modules > /tmp/dd_modules
-
-    info "Starting Network Driver Update Disk Service on $tty"
-    systemctl start driver-updates-net@$tty.service
-    status=$(systemctl -p ExecMainStatus show driver-updates-net@$tty.service)
-    info "Network DD status=$status"
+    start_driver_update "Network Driver Update Disk"
     rm -rf /tmp/DD-net
 fi
diff --git a/anaconda/dracut/driver-updates-net@.service b/anaconda/dracut/driver-updates-net@.service
deleted file mode 100644
index b457502..0000000
--- a/anaconda/dracut/driver-updates-net@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Network Driver Update Disk UI on %I
-DefaultDependencies=no
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-WorkingDirectory=/tmp
-Environment=LANG=en_US.UTF-8
-ExecStart=/bin/driver-updates /tmp/DD-net/
-StandardInput=tty-force
-StandardOutput=inherit
-StandardError=inherit
-TTYPath=/dev/%I
-TTYReset=yes
-TimeoutSec=0
diff --git a/anaconda/dracut/driver-updates.sh b/anaconda/dracut/driver-updates.sh
index 74615fe..fca0b83 100644
--- a/anaconda/dracut/driver-updates.sh
+++ b/anaconda/dracut/driver-updates.sh
@@ -2,9 +2,6 @@
 # Determine if a Driver Update Disk is present, or inst.dd passed on the cmdline
 # and launch the driver update systemd service
 
-# save module state
-cat /proc/modules > /tmp/dd_modules
-
 # load all modules
 udevadm trigger
 udevadm settle
@@ -13,19 +10,14 @@ udevadm settle
 blkid -t LABEL=OEMDRV > /dev/null
 blkid_rc=$?
 
-# dd_args will have been set by parse-anaconda-dd.sh cmdline hook
+command -v getarg >/dev/null || . /lib/dracut-lib.sh
+dd_args="$(getargs dd= inst.dd=)"
 if [ -n "$dd_args" -o $blkid_rc -eq 0 ]; then
     command -v getarg >/dev/null || . /lib/dracut-lib.sh
     . /lib/anaconda-lib.sh
 
-    tty=$(find_tty)
     # kludge to let kernel spit out some extra info w/o stomping on our UI
     sleep 5
-
     echo "$dd_args" > /tmp/dd_args
-    info "Starting Driver Update Disk Service on $tty"
-    systemctl start driver-updates@$tty.service
-    status=$(systemctl -p ExecMainStatus show driver-updates@$tty.service)
-    info "DD status=$status"
+    start_driver_update "Driver Update Disk"
 fi
-
diff --git a/anaconda/dracut/driver-updates@.service b/anaconda/dracut/driver-updates@.service
index 52cd6ca..210bcd5 100644
--- a/anaconda/dracut/driver-updates@.service
+++ b/anaconda/dracut/driver-updates@.service
@@ -8,6 +8,7 @@ Type=oneshot
 RemainAfterExit=no
 WorkingDirectory=/tmp
 Environment=LANG=en_US.UTF-8
+ExecStartPre=-/bin/plymouth quit
 ExecStart=/bin/driver-updates
 StandardInput=tty-force
 StandardOutput=inherit
diff --git a/anaconda/dracut/fetch-driver-net.sh b/anaconda/dracut/fetch-driver-net.sh
index 9e46a95..5adc39b 100644
--- a/anaconda/dracut/fetch-driver-net.sh
+++ b/anaconda/dracut/fetch-driver-net.sh
@@ -6,14 +6,13 @@
 netif="$1"
 
 # We already processed the dd_args - exit
-[ -e /tmp/dd-net.done ] && return 0
-
-# no dd requested - exit
-[ -n "$dd_args" ] || return 0
+[ -e /tmp/dd_net.done ] && return 0
 
 command -v getarg >/dev/null || . /lib/dracut-lib.sh
-. /lib/url-lib.sh
+dd_args="$(getargs dd= inst.dd=)"
+[ -n "$dd_args" ] || return 0
 
+. /lib/url-lib.sh
 dd_repo=/tmp/DD-net/
 for dd in $dd_args; do
     case "${dd%%:*}" in
@@ -28,4 +27,4 @@ for dd in $dd_args; do
             ;;
     esac
 done
-echo > /tmp/dd-net.done
+echo > /tmp/dd_net.done
diff --git a/anaconda/dracut/fetch-kickstart-net.sh b/anaconda/dracut/fetch-kickstart-net.sh
index 927dcdc..4ec073b 100755
--- a/anaconda/dracut/fetch-kickstart-net.sh
+++ b/anaconda/dracut/fetch-kickstart-net.sh
@@ -14,9 +14,6 @@ netif="$1"
 # user requested a specific device, but this isn't it - exit
 [ -n "$ksdevice" ] && [ "$ksdevice" != "$netif" ] && return 0
 
-# no ksdevice was requested, so the first device online wins!
-[ -z "$ksdevice" ] && ksdevice="$netif"
-
 command -v getarg >/dev/null || . /lib/dracut-lib.sh
 . /lib/url-lib.sh
 . /lib/anaconda-lib.sh
@@ -25,7 +22,7 @@ if [ "$kickstart" = "nfs:auto" ]; then
     # construct kickstart URL from dhcp info
     # server is next_server, or the dhcp server itself if missing
     . /tmp/net.$netif.dhcpopts
-    server="${new_dhcp_next_server:-$new_dhcp_server_identifier}"
+    server="${new_next_server:-$new_dhcp_server_identifier}"
     # filename is dhcp 'filename' option, or '/kickstart/' if missing
     filename="/kickstart/"
     # read the dhcp lease file and see if we can find 'filename'
@@ -39,10 +36,10 @@ if [ "$kickstart" = "nfs:auto" ]; then
     kickstart="nfs:$server:$filename"
 fi
 
-# kickstart is appended with '$IP_ADDR-kickstart' if ending in '/'
-if [ "${kickstart%/}" != "$kickstart" ]; then
-    kickstart="${kickstart}${new_ip_address}-kickstart"
-fi
+# NFS kickstart URLs that end in '/' get '$IP_ADDR-kickstart' appended
+case "$kickstart" in
+    nfs*/) kickstart="${kickstart}${new_ip_address}-kickstart" ;;
+esac
 
 info "anaconda fetching kickstart from $kickstart"
 if fetch_url "$kickstart" /tmp/ks.cfg; then
diff --git a/anaconda/dracut/kickstart-genrules.sh b/anaconda/dracut/kickstart-genrules.sh
index f29ad87..3b83d6c 100755
--- a/anaconda/dracut/kickstart-genrules.sh
+++ b/anaconda/dracut/kickstart-genrules.sh
@@ -8,18 +8,20 @@ case "${kickstart%%:*}" in
         # handled by fetch-kickstart-net in the online hook
         wait_for_kickstart
     ;;
-    cdrom|hd|bd) # cdrom, cdrom:<dev>:<path>, hd:<dev>:<path>, bd:<dev>:<path>
+    cdrom|hd) # cdrom, cdrom:<path>, hd:<dev>:<path>
         splitsep ":" "$kickstart" kstype ksdev kspath
-        [ "$kstype" = "cdrom" ] && [ -z "$ksdev" ] && ksdev="/dev/cdrom"
-        ksdev=$(disk_to_dev_path $ksdev)
-        if [ "$kstype" = "bd" ]; then # TODO FIXME: no biospart support yet
-            warn "inst.ks='$kickstart'"
-            warn "can't get kickstart: biospart isn't supported yet"
-            ksdev=""
+        if [ "$kstype" = "cdrom" ] && [ -z "$kspath" ]; then
+            kspath="$ksdev"
+            when_any_cdrom_appears \
+                fetch-kickstart-disk \$env{DEVNAME} "$kspath"
         else
+            ksdev=$(disk_to_dev_path $ksdev)
             when_diskdev_appears "$ksdev" \
                 fetch-kickstart-disk \$env{DEVNAME} "$kspath"
-            wait_for_kickstart
         fi
+        wait_for_kickstart
+    ;;
+    bd) # bd:<dev>:<path> - biospart (TODO... if anyone uses this anymore)
+        warn "inst.ks: can't get kickstart - biospart (bd:) isn't supported yet"
     ;;
 esac
diff --git a/anaconda/dracut/module-setup.sh b/anaconda/dracut/module-setup.sh
index ebd9de8..3a31a31 100755
--- a/anaconda/dracut/module-setup.sh
+++ b/anaconda/dracut/module-setup.sh
@@ -32,6 +32,7 @@ install() {
     inst_hook pre-trigger 50 "$moddir/kickstart-genrules.sh"
     inst_hook pre-trigger 50 "$moddir/updates-genrules.sh"
     inst_hook initqueue/settled 00 "$moddir/anaconda-ks-sendheaders.sh"
+    inst_hook initqueue/online 00 "$moddir/anaconda-ifcfg.sh"
     inst_hook initqueue/online 80 "$moddir/anaconda-netroot.sh"
     inst "$moddir/anaconda-diskroot" "/sbin/anaconda-diskroot"
     inst_hook pre-pivot 50 "$moddir/anaconda-copy-ks.sh"
@@ -45,13 +46,14 @@ install() {
     inst "$moddir/parse-kickstart" "/sbin/parse-kickstart"
     # Driver Update Disks
     inst_hook cmdline 29 "$moddir/parse-anaconda-dd.sh"
-    inst_hook initqueue/online 10 "$moddir/fetch-driver-net.sh"
+    inst_hook initqueue/online 20 "$moddir/fetch-driver-net.sh"
     inst_hook pre-trigger 40 "$moddir/driver-updates.sh"
     inst_hook pre-pivot 10 "$moddir/driver-updates-net.sh"
     inst_hook pre-pivot 50 "$moddir/anaconda-depmod.sh"
     inst "$moddir/driver-updates" "/bin/driver-updates"
     inst_simple "$moddir/driver-updates@.service" "/etc/systemd/system/driver-updates@.service"
-    inst_simple "$moddir/driver-updates-net@.service" "/etc/systemd/system/driver-updates-net@.service"
+    # rpm configuration file (needed by dd_extract)
+    inst "/usr/lib/rpm/rpmrc"
     # python deps for parse-kickstart. DOUBLE WOOOO
     $moddir/python-deps $moddir/parse-kickstart $moddir/driver-updates | while read dep; do
         case "$dep" in
diff --git a/anaconda/dracut/parse-anaconda-dd.sh b/anaconda/dracut/parse-anaconda-dd.sh
index df02bc1..ebabd07 100644
--- a/anaconda/dracut/parse-anaconda-dd.sh
+++ b/anaconda/dracut/parse-anaconda-dd.sh
@@ -2,7 +2,7 @@
 # parse-anaconda-dd.sh: handle driver update disk settings
 
 # no need to do this twice
-[ -f /tmp/dd-net.done ] && return
+[ -f /tmp/dd_net.done ] && return
 
 command -v getarg >/dev/null || . /lib/dracut-lib.sh
 
@@ -16,4 +16,3 @@ for dd in $dd_args; do
         ;;
     esac
 done
-export dd_args
diff --git a/anaconda/dracut/parse-anaconda-options.sh b/anaconda/dracut/parse-anaconda-options.sh
index 1337178..8fce64a 100755
--- a/anaconda/dracut/parse-anaconda-options.sh
+++ b/anaconda/dracut/parse-anaconda-options.sh
@@ -108,7 +108,7 @@ warn_renamed_arg "kssendsn" "inst.ks.sendsn"
 
 # Ignore self-signed SSL certs
 warn_renamed_arg "noverifyssl" "inst.noverifyssl"
-if $(getargbool 0 noverifyssl inst.noverifyssl); then
+if getargbool 0 noverifyssl inst.noverifyssl; then
     # Tell dracut to use curl --insecure
     echo "rd.noverifyssl" >> /etc/cmdline.d/75-anaconda-options.conf
 fi
@@ -131,9 +131,6 @@ fi
 # for vnc bring network up in initramfs so that cmdline configuration is used
 getargbool 0 vnc inst.vnc && warn "anaconda requiring network for vnc" && set_neednet
 
-# make sure we get ifcfg for every interface that comes up
-echo 'save_netinfo $netif' > $hookdir/initqueue/online/anaconda-ifcfg.sh
-
 # Driver Update Disk
 warn_renamed_arg "dd" "inst.dd"
 
diff --git a/anaconda/dracut/parse-kickstart b/anaconda/dracut/parse-kickstart
index 4afd6c9..7c60405 100755
--- a/anaconda/dracut/parse-kickstart
+++ b/anaconda/dracut/parse-kickstart
@@ -1,13 +1,27 @@
 #!/usr/bin/python
 #vim: set fileencoding=utf8
-# parse-kickstart - read a kickstart file and emit equivalent dracut boot args.
-#
-# Copyright © 2012 Red Hat, Inc.
-# BLAH BLAH GPL BLAH.
+# parse-kickstart - read a kickstart file and emit equivalent dracut boot args
 #
 # Designed to run inside the dracut initramfs environment.
 # Requires python 2.7 or later.
 #
+#
+# Copyright © 2012-2014 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
 # Authors:
 #   Will Woods <wwoods@redhat.com>
 
@@ -15,9 +29,12 @@ import sys, os
 import logging
 import shutil
 import uuid
+import glob
 from pykickstart.parser import KickstartParser, preprocessKickstart
+from pykickstart.sections import NullSection
 from pykickstart.version import returnClassForVersion
 from pykickstart.errors import KickstartError
+# pylint: disable=wildcard-import
 from pykickstart.constants import *
 from pykickstart import commands
 from collections import OrderedDict
@@ -42,9 +59,10 @@ def read_cmdline(f):
         lines = open(f).readlines()
     except IOError:
         lines = []
+    # pylint: disable=redefined-outer-name
     for line in lines:
         for arg in line.split():
-            k,e,v = arg.partition("=")
+            k,_e,v = arg.partition("=")
             args[k] = v
     return args
 
@@ -65,9 +83,10 @@ class HardDrive(commands.harddrive.FC3_HardDrive):
 
 class NFS(commands.nfs.FC6_NFS):
     def dracut_args(self, args, lineno, obj):
-        method="nfs:%s:%s" % (self.server, self.dir)
         if self.opts:
-            method += ":%s" % self.opts
+            method = "nfs:%s:%s:%s" % (self.opts, self.server, self.dir)
+        else:
+            method="nfs:%s:%s" % (self.server, self.dir)
 
         return "inst.repo=%s" % method
 
@@ -90,15 +109,25 @@ class MediaCheck(commands.mediacheck.FC4_MediaCheck):
 
 class DriverDisk(commands.driverdisk.F14_DriverDisk):
     def dracut_args(self, args, lineno, obj):
-        dd = self.driverdiskList[-1]
-        if dd.biospart:
-            location = "bd:%s" % dd.biospart
-        else:
-            location = dd.partition or dd.source
-        if location:
-            return "inst.driverdisk=%s" % location
+        dd_net = []
+        dd_disk = []
+        for dd in self.driverdiskList:
+            if dd.partition:
+                dd_disk.append(dd.partition)
+            elif dd.source:
+                dd_net.append("inst.dd=%s" % dd.source)
 
-class Network(commands.network.F20_Network):
+        # disk sources cannot be added to cmdline because the initial
+        # driver-update run has already finished.
+        if dd_disk:
+            with open("/tmp/dd_args_ks", "w") as f:
+                f.write(" ".join(dd_disk))
+
+        # network sources can be added to the existing cmdline, they
+        # are processed later.
+        return "\n".join(dd_net)
+
+class Network(commands.network.F21_Network):
     def dracut_args(self, args, lineno, net):
         '''
         NOTE: The first 'network' line get special treatment:
@@ -110,21 +139,17 @@ class Network(commands.network.F20_Network):
 
         # first 'network' line
         if len(self.network) == 1:
+            # Setting only hostname in kickstart
+            if not net.device and net.hostname and not self.handler.ksdevice:
+                return None
             net.activate = True
             if net.device == "link" or not net.device:
                 # NOTE: this might still be empty (e.g. 'ks=file:...')
                 # XXX FIXME: handle "link" properly?
+                log.debug("Using ksdevice %s for missing --device in first kickstart network command", self.handler.ksdevice)
                 net.device = self.handler.ksdevice
             # tell dracut to bring this device up
             netline = ksnet_to_dracut(args, lineno, net, bootdev=True)
-
-            # HACK: current dracut dies if you have BOOTIF= and ip= together.
-            # Until that gets fixed upstream, we have to defer to dracut.
-            # XXX FIXME: remove this when dracut can handle BOOTIF+ip!
-            if 'BOOTIF' in proc_cmdline:
-                # let dracut use BOOTIF to bring up the network
-                netline = None
-
         else:
             # all subsequent 'network' lines require '--device'
             if not net.device or net.device == "link":
@@ -145,7 +170,7 @@ class DisplayMode(commands.displaymode.FC3_DisplayMode):
         elif self.displayMode == DISPLAY_MODE_GRAPHICAL:
             return "inst.graphical"
 
-class Bootloader(commands.bootloader.F19_Bootloader):
+class Bootloader(commands.bootloader.F21_Bootloader):
     def dracut_args(self, args, lineno, obj):
         if self.extlinux:
             return "extlinux"
@@ -176,6 +201,9 @@ class DracutHandler(handlerclass):
         obj = handlerclass.dispatcher(self, args, lineno)
         # and execute any specified dracut_args
         cmd = args[0]
+        # the commands member is implemented by the class returned
+        # by returnClassForVersion
+        # pylint: disable=no-member
         command = self.commands[cmd]
         if hasattr(command, "dracut_args"):
             log.debug("kickstart line %u: handling %s", lineno, cmd)
@@ -199,8 +227,40 @@ def find_devname(mac):
         if thismac.lower() == mac.lower():
             return netif
 
+def s390_settings(device):
+    cfg = {
+        'SUBCHANNELS': '',
+        'NETTYPE': '',
+        'OPTIONS': ''
+        }
+
+    subchannels = []
+    for symlink in sorted(glob.glob("/sys/class/net/%s/device/cdev[0-9]*" % device)):
+        subchannels.append(os.path.basename(os.readlink(symlink)))
+    if not subchannels:
+        return cfg
+    cfg['SUBCHANNELS'] = ','.join(subchannels)
+
+    ## cat /etc/ccw.conf
+    #qeth,0.0.0900,0.0.0901,0.0.0902,layer2=0,portname=FOOBAR,portno=0
+    #
+    #SUBCHANNELS="0.0.0900,0.0.0901,0.0.0902"
+    #NETTYPE="qeth"
+    #OPTIONS="layer2=1 portname=FOOBAR portno=0"
+    with open('/etc/ccw.conf') as f:
+        # pylint: disable=redefined-outer-name
+        for line in f:
+            if cfg['SUBCHANNELS'] in line:
+                items = line.strip().split(',')
+                cfg['NETTYPE'] = items[0]
+                cfg['OPTIONS'] = " ".join(i for i in items[1:] if '=' in i)
+                break
+
+    return cfg
+
 def ksnet_to_dracut(args, lineno, net, bootdev=False):
     '''Translate the kickstart network data into dracut network data.'''
+    # pylint: disable=redefined-outer-name
     line = []
     ip=""
     autoconf=""
@@ -248,13 +308,6 @@ def ksnet_to_dracut(args, lineno, net, bootdev=False):
         if ns:
             line.append("nameserver=%s" % ns)
 
-    if net.mtu:
-        # XXX FIXME: dracut doesn't support mtu= (yet)
-        if net.device:
-            line.append("mtu=%s:%s" % (net.device, net.mtu))
-        else:
-            line.append("mtu=%s" % net.mtu)
-
     if bootdev:
         if net.device:
             line.append("bootdev=%s" % net.device)
@@ -291,6 +344,15 @@ def ksnet_to_ifcfg(net, filename=None):
     # we use it to activate devcies by NM on start
     ifcfg['ONBOOT'] = "yes" if net.activate else "no"
 
+    s390cfg = s390_settings(dev)
+    if s390cfg['SUBCHANNELS']:
+        ifcfg.pop('HWADDR')
+        ifcfg['SUBCHANNELS'] = s390cfg['SUBCHANNELS']
+    if s390cfg['NETTYPE']:
+        ifcfg['NETTYPE'] = s390cfg['NETTYPE']
+    if s390cfg['OPTIONS']:
+        ifcfg['OPTIONS'] = s390cfg['OPTIONS']
+
     # dhcp etc.
     ifcfg['BOOTPROTO'] = net.bootProto
     if net.bootProto == 'static':
@@ -339,7 +401,7 @@ def ksnet_to_ifcfg(net, filename=None):
             shutil.copyfile(srcpath, dstpath)
 
     if net.bondslaves:
-        ifcfg.pop('HWADDR')
+        ifcfg.pop('HWADDR', None)
         ifcfg['TYPE'] = "Bond"
         ifcfg['BONDING_MASTER'] = "yes"
         ifcfg['NAME'] = "Bond connection %s" % dev
@@ -358,17 +420,13 @@ def ksnet_to_ifcfg(net, filename=None):
                             'MASTER' : dev,
                             'HWADDR' : readsysfile("/sys/class/net/%s/address" % slave),
                           }
-            # not using NM naming conventions, following dracut so that it does not
-            # override kickstart config by generating its own ifcfg files for slaves
-            #slave_filename = "/tmp/ifcfg/ifcfg-%s" % "_".join(slave_ifcfg['NAME'].split(" "))
-            # FIXME - change in dracut?
-            slave_filename = "/tmp/ifcfg/ifcfg-%s" % slave
+            slave_filename = "/tmp/ifcfg/ifcfg-%s" % "_".join(slave_ifcfg['NAME'].split(" "))
             log.info("writing ifcfg %s for slave %s of bond %s" % (slave_filename, slave, dev))
             write_ifcfg(slave_filename, slave_ifcfg)
 
     if net.teamslaves:
 
-        ifcfg.pop('HWADDR')
+        ifcfg.pop('HWADDR', None)
         ifcfg['TYPE'] = "Team"
         ifcfg['NAME'] = "Team connection %s" % dev
         ifcfg['TEAM_CONFIG'] = "'" + net.teamconfig + "'"
@@ -386,17 +444,13 @@ def ksnet_to_ifcfg(net, filename=None):
             if cfg:
                 slave_ifcfg['TEAM_PORT_CONFIG'] = "'" + cfg + "'"
 
-            # not using NM naming conventions, following dracut so that it does not
-            # override kickstart config by generating its own ifcfg files for slaves
-            #slave_filename = "/tmp/ifcfg/ifcfg-%s" % "_".join(slave_ifcfg['NAME'].split(" "))
-            # FIXME - change in dracut?
-            slave_filename = "/tmp/ifcfg/ifcfg-%s" % slave
+            slave_filename = "/tmp/ifcfg/ifcfg-%s" % "_".join(slave_ifcfg['NAME'].split(" "))
             log.info("writing ifcfg %s for slave %s of team %s" % (slave_filename, slave, dev))
             write_ifcfg(slave_filename, slave_ifcfg)
 
     if net.vlanid:
-        interface_name = "%s.%s" % (dev, net.vlanid)
-        ifcfg.pop('HWADDR')
+        interface_name = net.interfacename or "%s.%s" % (dev, net.vlanid)
+        ifcfg.pop('HWADDR', None)
         ifcfg['TYPE'] = "Vlan"
         ifcfg['VLAN'] = "yes"
         ifcfg['VLAN_ID'] = net.vlanid
@@ -424,6 +478,7 @@ def process_kickstart(ksfile):
     handler = DracutHandler()
     handler.ksdevice = os.environ.get('ksdevice')
     parser = KickstartParser(handler, missingIncludeIsFatal=False, errorsAreFatal=False)
+    parser.registerSection(NullSection(handler, sectionOpen="%addon"))
     log.info("processing kickstart file %s", ksfile)
     processed_file = preprocessKickstart(ksfile)
     try:
@@ -440,4 +495,4 @@ if __name__ == '__main__':
     for path in sys.argv[1:]:
         outfile, output = process_kickstart(path)
         for line in filter(None, output):
-            print line
+            print(line)
diff --git a/anaconda/dracut/python-deps b/anaconda/dracut/python-deps
index 86c63b1..e626ff4 100755
--- a/anaconda/dracut/python-deps
+++ b/anaconda/dracut/python-deps
@@ -3,6 +3,7 @@
 
 import os, sys
 from modulefinder import ModuleFinder
+# pylint: disable=wildcard-import
 from distutils.sysconfig import *
 
 sitedir = get_python_lib()
@@ -18,9 +19,10 @@ def moduledir(pyfile):
         if modname not in ('..', 'site-packages'):
             return os.path.join(topdir, modname)
 
+# pylint: disable=redefined-outer-name
 def pyfiles(moddir):
     '''basically, "find $moddir -type f -name "*.py"'''
-    for curdir, dirs, files in os.walk(moddir):
+    for curdir, _dirs, files in os.walk(moddir):
         for f in files:
             if f.endswith(".py"):
                 yield os.path.join(curdir, f)
@@ -44,11 +46,11 @@ for script in sys.argv[1:]:
             mods.append(moddir)
 
 # Include some bits that the python install itself needs
-print get_makefile_filename()
-print get_config_h_filename()
-print os.path.join(libdir,'site.py')
-print os.path.join(libdir,'sysconfig.py')
+print(get_makefile_filename())
+print(get_config_h_filename())
+print(os.path.join(libdir,'site.py'))
+print(os.path.join(libdir,'sysconfig.py'))
 
 # And print the list of deps.
 for d in deps:
-    print d
+    print(d)
diff --git a/anaconda/dracut/save-initramfs.sh b/anaconda/dracut/save-initramfs.sh
index 4ebbdfe..e55291e 100644
--- a/anaconda/dracut/save-initramfs.sh
+++ b/anaconda/dracut/save-initramfs.sh
@@ -16,7 +16,7 @@ if [ -z "$initramfs" ]; then
     gzip=$(type -P pigz || type -P gzip)
     # Prune out things we don't need - modules & firmware, python, overlay file
     find / -xdev | \
-      grep -Ev 'lib/modules|lib/firmware|python|overlay|etc/ssl|fsck' | \
+      grep -Ev 'tmp/|lib/modules|lib/firmware|python|overlay|etc/ssl|fsck' | \
       cpio -co 2>/dev/null | $gzip -c1 > $initramfs
 fi
 
diff --git a/anaconda/po/LINGUAS b/anaconda/po/LINGUAS
index 63f8e7c..5ce32bd 100644
--- a/anaconda/po/LINGUAS
+++ b/anaconda/po/LINGUAS
@@ -1,2 +1,2 @@
 # Set of available languages.
-af am ar as ast bal be bg bn bn_IN bs ca cs cy da de de_CH el en@quot en@boldquot en_GB es et eu eu_ES fa fi fr gl gu he hi hr hu hy id ilo is it ja ka kk kn ko lt lv mai mk ml mr ms nb nds ne nl nn nso or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tg th tr uk ur vi zh_CN zh_TW zu
+af am ar as ast be bg bn bn_IN bs ca cs cy da de de_CH el en_GB es et eu fa fi fr gl gu hi hr hu id ilo is it ja ka kk kn ko lt lv mai mk ml mr ms nb ne nl nso or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tg th tr uk ur vi zh_CN zh_TW zu
diff --git a/anaconda/po/Makevars b/anaconda/po/Makevars
index d0775e8..fe913f2 100644
--- a/anaconda/po/Makevars
+++ b/anaconda/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 --from-code=UTF-8
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 --keyword=C_:1c,2 --keyword=CN_:1c,2 --keyword=CP_:1c,2,3 --from-code=UTF-8
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
@@ -44,7 +44,7 @@ EXTRA_LOCALE_CATEGORIES =
 # context.  Possible values are "yes" and "no".  Set this to yes if the
 # package uses functions taking also a message context, like pgettext(), or
 # if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
+USE_MSGCTXT = yes
 
 # These options get passed to msgmerge.
 # Useful options are in particular:
diff --git a/anaconda/po/POTFILES.in b/anaconda/po/POTFILES.in
index c23835a..7b5d1ac 100644
--- a/anaconda/po/POTFILES.in
+++ b/anaconda/po/POTFILES.in
@@ -1,9 +1,13 @@
 # List of source files which contain translatable strings.
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009-2014  Red Hat, Inc.
 
 # Main anaconda source files
+pyanaconda/addons.py
 pyanaconda/bootloader.py
 pyanaconda/constants.py
+pyanaconda/constants_text.py
+pyanaconda/errors.py
+pyanaconda/exception.py
 pyanaconda/image.py
 pyanaconda/install.py
 pyanaconda/installclass.py
@@ -14,6 +18,9 @@ pyanaconda/network.py
 pyanaconda/product.py
 pyanaconda/regexes.py
 pyanaconda/rescue.py
+pyanaconda/storage_utils.py
+pyanaconda/text.py
+pyanaconda/users.py
 pyanaconda/vnc.py
 
 # Install class definitions
@@ -25,13 +32,23 @@ pyanaconda/packaging/__init__.py
 pyanaconda/packaging/livepayload.py
 pyanaconda/packaging/tarpayload.py
 pyanaconda/packaging/yumpayload.py
+pyanaconda/packaging/dnfpayload.py
+pyanaconda/packaging/rpmostreepayload.py
 
 # Interfaces
 pyanaconda/ui/common.py
+pyanaconda/ui/helpers.py
 pyanaconda/ui/__init__.py
+pyanaconda/ui/categories/__init__.py
+pyanaconda/ui/categories/customization.py
+pyanaconda/ui/categories/localization.py
+pyanaconda/ui/categories/software.py
+pyanaconda/ui/categories/system.py
+pyanaconda/ui/categories/user_settings.py
 
 # Common stuff
 pyanaconda/ui/lib/space.py
+pyanaconda/ui/lib/entropy.py
 
 # Text interface
 pyanaconda/ui/tui/hubs/summary.py
@@ -41,12 +58,15 @@ pyanaconda/ui/tui/simpleline/widgets.py
 pyanaconda/ui/tui/simpleline/base.py
 pyanaconda/ui/tui/simpleline/__init__.py
 pyanaconda/ui/tui/spokes/askvnc.py
+pyanaconda/ui/tui/spokes/langsupport.py
 pyanaconda/ui/tui/spokes/network.py
 pyanaconda/ui/tui/spokes/password.py
 pyanaconda/ui/tui/spokes/storage.py
 pyanaconda/ui/tui/spokes/time_spoke.py
+pyanaconda/ui/tui/spokes/shell_spoke.py
 pyanaconda/ui/tui/spokes/source.py
 pyanaconda/ui/tui/spokes/software.py
+pyanaconda/ui/tui/spokes/user.py
 pyanaconda/ui/tui/spokes/warnings.py
 pyanaconda/ui/tui/spokes/progress.py
 pyanaconda/ui/tui/spokes/__init__.py
@@ -54,12 +74,6 @@ pyanaconda/ui/tui/__init__.py
 
 # Graphical interface
 pyanaconda/ui/gui/__init__.py
-pyanaconda/ui/gui/categories/__init__.py
-pyanaconda/ui/gui/categories/customization.py
-pyanaconda/ui/gui/categories/localization.py
-pyanaconda/ui/gui/categories/software.py
-pyanaconda/ui/gui/categories/system.py
-pyanaconda/ui/gui/categories/user_settings.py
 pyanaconda/ui/gui/hubs/__init__.py
 pyanaconda/ui/gui/hubs/progress.py
 pyanaconda/ui/gui/spokes/custom.py
@@ -74,57 +88,65 @@ pyanaconda/ui/gui/spokes/source.py
 pyanaconda/ui/gui/spokes/storage.py
 pyanaconda/ui/gui/spokes/user.py
 pyanaconda/ui/gui/spokes/welcome.py
+pyanaconda/ui/gui/spokes/advstorage/iscsi.py
+pyanaconda/ui/gui/spokes/advstorage/dasd.py
 pyanaconda/ui/gui/spokes/lib/accordion.py
 pyanaconda/ui/gui/spokes/lib/cart.py
+pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+pyanaconda/ui/gui/spokes/lib/dasdfmt.py
+pyanaconda/ui/gui/spokes/lib/detailederror.py
 pyanaconda/ui/gui/spokes/lib/passphrase.py
 pyanaconda/ui/gui/spokes/lib/refresh.py
 pyanaconda/ui/gui/spokes/lib/resize.py
 pyanaconda/ui/gui/spokes/lib/summary.py
+pyanaconda/ui/gui/spokes/lib/entropy_dialog.py
 
 # Custom widgets.
 widgets/src/BaseWindow.c
+widgets/src/BaseStandalone.c
 widgets/src/DiskOverview.c
 widgets/src/HubWindow.c
 widgets/src/MountpointSelector.c
 widgets/src/SpokeSelector.c
 widgets/src/SpokeWindow.c
 widgets/src/StandaloneWindow.c
-widgets/src/TimezoneMap.c
 widgets/src/LayoutIndicator.c
-widgets/src/Lightbox.c
 widgets/src/glade-adaptor.c
-widgets/src/tz.c
+widgets/src/widgets-common.c
+
+# Interface files.
+pyanaconda/ui/gui/spokes/advanced_user.glade
+pyanaconda/ui/gui/spokes/datetime_spoke.glade
+pyanaconda/ui/gui/spokes/filter.glade
+pyanaconda/ui/gui/spokes/network.glade
+pyanaconda/ui/gui/spokes/software.glade
+pyanaconda/ui/gui/spokes/storage.glade
+pyanaconda/ui/gui/spokes/keyboard.glade
+pyanaconda/ui/gui/spokes/langsupport.glade
+pyanaconda/ui/gui/spokes/password.glade
+pyanaconda/ui/gui/spokes/source.glade
+pyanaconda/ui/gui/spokes/welcome.glade
+pyanaconda/ui/gui/spokes/user.glade
+pyanaconda/ui/gui/spokes/custom.glade
+pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
+pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+pyanaconda/ui/gui/spokes/advstorage/dasd.glade
+pyanaconda/ui/gui/spokes/lib/cart.glade
+pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
+pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
+pyanaconda/ui/gui/spokes/lib/detailederror.glade
+pyanaconda/ui/gui/spokes/lib/passphrase.glade
+pyanaconda/ui/gui/spokes/lib/refresh.glade
+pyanaconda/ui/gui/spokes/lib/resize.glade
+pyanaconda/ui/gui/spokes/lib/summary.glade
+pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade
+pyanaconda/ui/gui/main.glade
+pyanaconda/ui/gui/hubs/summary.glade
+pyanaconda/ui/gui/hubs/progress.glade
 
 # For file types that gettext doesn't understand, list <filename>.h and
 # use Rules-extract to extract the strings into a C-style header.
 
-# Interface files.
-# gettext doesn't fully support glade3
-pyanaconda/ui/gui/spokes/advanced_user.glade.h
-pyanaconda/ui/gui/spokes/datetime_spoke.glade.h
-pyanaconda/ui/gui/spokes/filter.glade.h
-pyanaconda/ui/gui/spokes/network.glade.h
-pyanaconda/ui/gui/spokes/software.glade.h
-pyanaconda/ui/gui/spokes/storage.glade.h
-pyanaconda/ui/gui/spokes/keyboard.glade.h
-pyanaconda/ui/gui/spokes/langsupport.glade.h
-pyanaconda/ui/gui/spokes/password.glade.h
-pyanaconda/ui/gui/spokes/source.glade.h
-pyanaconda/ui/gui/spokes/welcome.glade.h
-pyanaconda/ui/gui/spokes/user.glade.h
-pyanaconda/ui/gui/spokes/custom.glade.h
-pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h
-pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h
-pyanaconda/ui/gui/spokes/lib/cart.glade.h
-pyanaconda/ui/gui/spokes/lib/detailederror.glade.h
-pyanaconda/ui/gui/spokes/lib/passphrase.glade.h
-pyanaconda/ui/gui/spokes/lib/refresh.glade.h
-pyanaconda/ui/gui/spokes/lib/resize.glade.h
-pyanaconda/ui/gui/spokes/lib/summary.glade.h
-pyanaconda/ui/gui/main.glade.h
-pyanaconda/ui/gui/hubs/summary.glade.h
-pyanaconda/ui/gui/hubs/progress.glade.h
-
 # liveinst source files
 data/liveinst/liveinst.desktop.in.h
 data/liveinst/console.apps/liveinst.h
diff --git a/anaconda/po/Rules-extract b/anaconda/po/Rules-extract
index f232500..c5ecdbf 100644
--- a/anaconda/po/Rules-extract
+++ b/anaconda/po/Rules-extract
@@ -7,45 +7,40 @@
 # input file. --local will output files in a tmp/ directory relative to the
 # current working directory.
 #
-# intltool-extract adds "no-c-format" to any lines it finds containing format
-# specifiers, which disables the xgettext warnings on format errors. Assume
-# instead that anything in a glade file is going to be used as a python format
-# string so that our gettext tests work.
-#
 # All output files need to be in $srcdir for gettext to be able to find them.
 
-%.glade.h: %.glade
-	@intltool-extract -q --type=gettext/glade -l $< && \
-	sed 's/no-c-format/python-format/' < tmp/$$(basename $@) > $@ && \
-	rm -f tmp/$$(basename $@)
+DISTFILES.common.extra2 = Rules-extract
 
 %.desktop.in.h: %.desktop.in
-	@intltool-extract -q --type=gettext/keys -l $< && \
+	@intltool-extract -q --type=gettext/keys -l --srcdir / $(realpath $<) && \
 	sed 's/no-c-format/python-format/' < tmp/$$(basename $@) > $@ && \
 	rm -f tmp/$$(basename $@)
 
 %liveinst.h: %liveinst
-	@intltool-extract -q --type=gettext/quoted -l $< && \
+	@intltool-extract -q --type=gettext/quoted -l --srcdir / $(realpath $<) && \
 	sed 's/no-c-format/python-format/' < tmp/$$(basename $@) > $@ && \
 	rm -f tmp/$$(basename $@)
 
 # Remove the $top_srcdir prefix from files so that xgettext can search for the file
 # relative to $top_srcdir and get the path name right in the .po
 %anaconda.po: %anaconda
-	@input_file="$<" && \
+	@input_file="$(realpath $<)" && \
 	$(XGETTEXT) $(XGETTEXT_OPTIONS) --omit-header --directory=$(top_srcdir) \
-		--language=Python -o $@ $${input_file##$(top_srcdir)/}
+		--language=Python -o $@ $${input_file##$(realpath $(top_srcdir))/}
 
-# This file is actually JavaScript, but C is close enough
 %fedora-welcome.po: %fedora-welcome
-	@input_file="$<" && \
+	@input_file="$(realpath $<)" && \
 	$(XGETTEXT) $(XGETTEXT_OPTIONS) --omit-header --directory=$(top_srcdir) \
-		--language=C -o $@ $${input_file##$(top_srcdir)/}
+		--language=JavaScript -o $@ $${input_file##$(realpath $(top_srcdir))/}
 
-mostlyclean: mostlyclean-extract
-mostlyclean-extract:
+maintainer-clean: maintainer-clean-extract
+maintainer-clean-extract:
 	rm -f \
 		$(top_srcdir)/anaconda.po $(top_srcdir)/data/liveinst/gnome/fedora-welcome.po \
 		$(top_srcdir)/data/liveinst/console.apps/liveinst.h
-	find $(top_srcdir) \( -name '*.glade.h' -o -name '*.desktop.in.h' \) \
+	find $(top_srcdir) \( -name '*.desktop.in.h' \) \
 		-exec rm -f {} \;
+
+mostlyclean: mostlyclean-extract
+mostlyclean-extract:
+	rm -rf .intltool-merge-cache
diff --git a/anaconda/po/af.po b/anaconda/po/af.po
index dbfdf28..710585d 100644
--- a/anaconda/po/af.po
+++ b/anaconda/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,208 +19,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Begin VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Gebruik teksmodus"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -229,85 +462,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -316,7 +841,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -330,8 +860,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Redding"
 
@@ -369,28 +899,22 @@ msgstr "Rekenaar om te red"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Sluit af"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -403,7 +927,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -412,28 +936,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Reddingmodus"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Jou rekenaar is onder die %s-gids geheg."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Jou wortelpartisie is minder as 250 megagreep groot, wat gewoonlik te klein "
+"is om %s te installeer."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Jy het nie 'n wortelpartisie (/) gedefinieer nie, en dit word vereis voor "
+"die installering van %s kan voortgaan."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Jou wortelpartisie is minder as 250 megagreep groot, wat gewoonlik te klein "
+"is om %s te installeer."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Jy het nie 'n ruilpartisie gespesifiseer nie. Alhoewel dit nie in alle "
+"gevalle nodig is nie, sal dit die werking van die meeste soorte "
+"installerings wesenlik verbeter."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -524,84 +1228,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installeer op rekenaar"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Installeer op rekenaar"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Kan nie 'n vraag in bevelreëlmodus vra nie!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fout"
 
@@ -625,31 +1474,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -664,445 +1515,518 @@ msgstr ""
 "ander rekenaar af aan hierdie rekenaar te koppel en 'n grafiese installering "
 "te doen, of wil jy voortgaan in teksmodus?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Die wagwoord moet ten minste ses karakters lank wees."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Die wagwoord moet ten minste ses karakters lank wees."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Begin VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installeer op rekenaar"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Waarskuwings"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1117,580 +2041,404 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1717,277 +2465,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1995,14 +2766,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2011,128 +2782,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2143,68 +2934,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2212,945 +3098,1348 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Gaan voort"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Gebruik teksmodus"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-toestel"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Byvoeg"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Gaan voort"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Gaan voort"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Gaan voort"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Gekoppel!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Waarskuwings"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Byvoeg"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Byvoeg"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID-toestel"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Byvoeg"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3158,643 +4447,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Watter taal wil jy graag tydens die installeerproses gebruik?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Gaan voort"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Oop"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-toestel"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Byvoeg"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID-toestel"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID-toestel"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID-toestel"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID-toestel"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Oop"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-toestel"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Installeer op rekenaar"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Her_selflaai"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3808,40 +5460,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3850,60 +5503,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fout"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Kan nie 'n vraag in bevelreëlmodus vra nie!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-toestel"
+
 #~ msgid "Completed"
 #~ msgstr "Afgehandel"
 
@@ -3921,9 +5581,6 @@ msgstr ""
 #~ msgstr[0] "%s greep"
 #~ msgstr[1] "%s greep"
 
-#~ msgid "Re_boot"
-#~ msgstr "Her_selflaai"
-
 #~ msgid "_Retry"
 #~ msgstr "_Weer probeer"
 
@@ -3942,29 +5599,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Jy kan nie 'n partisie van 'n LDL-geformateerde DASD skrap nie."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Jy het nie 'n wortelpartisie (/) gedefinieer nie, en dit word vereis voor "
-#~ "die installering van %s kan voortgaan."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Jou wortelpartisie is minder as 250 megagreep groot, wat gewoonlik te "
-#~ "klein is om %s te installeer."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Jy het nie 'n ruilpartisie gespesifiseer nie. Alhoewel dit nie in alle "
-#~ "gevalle nodig is nie, sal dit die werking van die meeste soorte "
-#~ "installerings wesenlik verbeter."
-
 #~ msgid "Back"
 #~ msgstr "Terug"
 
diff --git a/anaconda/po/am.po b/anaconda/po/am.po
index 0726166..8ac3449 100644
--- a/anaconda/po/am.po
+++ b/anaconda/po/am.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,208 +19,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "ቪኤንሲን ጀምር"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "የጽሑፍ አሠራር ዘዴ ተጠቀም"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "እሺ"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -229,85 +462,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -316,7 +841,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -329,8 +859,8 @@ msgstr "ሲጨርሱ እባክዎን ከሼሉ ይውጡ ከዚያ ኮምፒው
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "አድን"
 
@@ -368,28 +898,22 @@ msgstr "ሲስተም ለማዳን"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "እሺ"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "ውጣ"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -402,7 +926,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -411,28 +935,200 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "የማዳኛ አሠራር ዘዴ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "ሲስተምዎት የተከማቸው በ%s ማውጫ ሥር ነው።"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "ዋናው መከፋፈያዎች ከ250 ሜጋባይት ያነሰና አብዛኛውን ጊዜ %sን ለማስገባት በጣም ትንሽ ነው።"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "%sም የማስገባት ሥራ ለመቀጠል የሚያስፈልገውን ዋና መከፋፈያውን (/) አልገለጹም።"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr "ዋናው መከፋፈያዎች ከ250 ሜጋባይት ያነሰና አብዛኛውን ጊዜ %sን ለማስገባት በጣም ትንሽ ነው።"
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"የስዋፕን መከፋፈያ አልገለጹም። በሁሉም ጉዳይዎች ላይ በጥብቅ ባያስፈልጉም በእርግጥ ብዙ የማስገባት ሥራዎችን ያሻሽላል።"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -523,84 +1219,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ሲስተሙ ላይ ያስገቡ"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ሲስተሙ ላይ ያስገቡ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "በትእዛዝ መሥመሩ የአሰራር ዘዴ ውስጥ ትያቄ ሊኖር አይችልም!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ስህተት"
 
@@ -624,31 +1465,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -662,445 +1505,518 @@ msgstr ""
 "በማሽንዎት ላይ Xን ለማስጀመር አልተቻለም ነገር። ቪኤንሲን ለማስጀመር ከሌላ ኮምፒውተር ወደዚህ ኮምፒውተር አገናኝተው "
 "ግራፊካል ማስገባቱን ማድረግ ወይንም በጽሑፍ ዘዴ የማስገባቱን ሥራ መቀጠል ይፈልጋሉ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "ሚስጢራዊ ቃሉ በትንሹ ስድስት አኃዞችን የያዘ መሆን አለበት።"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "ሚስጢራዊ ቃሉ በትንሹ ስድስት አኃዞችን የያዘ መሆን አለበት።"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "ቪኤንሲን ጀምር"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ሲስተሙ ላይ ያስገቡ"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ማስጠንቀቂያ"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1115,580 +2031,404 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1715,277 +2455,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1993,14 +2756,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2009,128 +2772,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "እሺ"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2141,68 +2924,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2210,945 +3088,1348 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "ቀጥል (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "እሺ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "የጽሑፍ አሠራር ዘዴ ተጠቀም"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "የRAID  መሣሪያ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_ጨምር"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "ቀጥል (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "ቀጥል (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "ቀጥል (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "ተገናኝቷል!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "ማስጠንቀቂያ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_ጨምር"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "እሺ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_ጨምር"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "እሺ"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "የRAID  መሣሪያ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_ጨምር"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3156,643 +4437,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "በማስገባቱ ሂደት ወቅት የቱን ቋንቋ ነው መጠቀም የሚፈልጉት?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "ቀጥል (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ነፃ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "የRAID  መሣሪያ"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_ጨምር"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "የRAID  መሣሪያ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "የRAID  መሣሪያ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "የRAID  መሣሪያ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "እሺ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "እሺ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "የRAID  መሣሪያ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ነፃ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "የRAID  መሣሪያ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "እሺ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "እሺ"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ሲስተሙ ላይ ያስገቡ"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "እንደገና አስጀምር (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3806,40 +5450,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3848,60 +5493,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ስህተት"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "በትእዛዝ መሥመሩ የአሰራር ዘዴ ውስጥ ትያቄ ሊኖር አይችልም!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "የRAID  መሣሪያ"
+
 #~ msgid "Completed"
 #~ msgstr "ተጠናቋል"
 
@@ -3919,9 +5571,6 @@ msgstr ""
 #~ msgstr[0] "የ%s ባይት"
 #~ msgstr[1] "የ%s ባይት"
 
-#~ msgid "Re_boot"
-#~ msgstr "እንደገና አስጀምር (_b)"
-
 #~ msgid "_Retry"
 #~ msgstr "እንደገና ሞክር (_R)"
 
@@ -3940,24 +5589,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "በLDL የተስተካከለ የDASDን መከፋፈያ ማጥፋት አይችሉም።"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr "%sም የማስገባት ሥራ ለመቀጠል የሚያስፈልገውን ዋና መከፋፈያውን (/) አልገለጹም።"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "ዋናው መከፋፈያዎች ከ250 ሜጋባይት ያነሰና አብዛኛውን ጊዜ %sን ለማስገባት በጣም ትንሽ ነው።"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "የስዋፕን መከፋፈያ አልገለጹም። በሁሉም ጉዳይዎች ላይ በጥብቅ ባያስፈልጉም በእርግጥ ብዙ የማስገባት ሥራዎችን "
-#~ "ያሻሽላል።"
-
 #~ msgid "Back"
 #~ msgstr "ወደኋላ"
 
diff --git a/anaconda/po/anaconda.pot b/anaconda/po/anaconda.pot
index 148146c..a340661 100644
--- a/anaconda/po/anaconda.pot
+++ b/anaconda/po/anaconda.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: anaconda 20.25.15\n"
+"Project-Id-Version: anaconda 21.48.20\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,208 +18,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr ""
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr ""
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr ""
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -228,85 +461,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -315,7 +840,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -328,8 +858,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr ""
 
@@ -367,28 +897,22 @@ msgstr ""
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr ""
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr ""
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -401,7 +925,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -410,28 +934,199 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr ""
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr ""
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -522,83 +1217,228 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, python-format
+msgid "Installing %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 msgid "Installation"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr ""
 
@@ -622,31 +1462,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -657,443 +1499,514 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+msgid "The password cannot be more than eight characters long."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+msgid "Start shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 msgid "Installation source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 msgid "Warnings"
 msgstr ""
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1108,580 +2021,404 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1708,277 +2445,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1986,14 +2746,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2002,127 +2762,147 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 msgid "_OK"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2133,68 +2913,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2202,942 +3077,1335 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:31
-#, c-format
-msgid "Current layout: '%s'. Click to switch to the next layout."
-msgstr ""
-
 #: widgets/src/LayoutIndicator.c:32
 #, c-format
+msgid "Current layout: '%s'. Click to switch to the next layout."
+msgstr ""
+
+#: widgets/src/LayoutIndicator.c:33
+#, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+msgid "Use Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
-msgid "Add device"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
-msgid "_Select the type of device you wish to add"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
+#: pyanaconda/ui/gui/spokes/network.glade:16
 msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
+#: pyanaconda/ui/gui/spokes/network.glade:20
 msgid "team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
+#: pyanaconda/ui/gui/spokes/network.glade:24
 msgid "vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:31
+msgid "Add device"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Select the type of device you wish to add"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+msgid "Partitioning"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-msgid "Add"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3145,639 +4413,991 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
-msgid "RAID Level:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+msgid "Device(s):"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
-msgid "R_AID Level:"
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+msgid "RAID Level:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr ""
 
@@ -3793,40 +5413,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3835,55 +5456,55 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 msgid "Fatal Error"
 msgstr ""
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
diff --git a/anaconda/po/ar.po b/anaconda/po/ar.po
index 7a24ae6..48816b5 100644
--- a/anaconda/po/ar.po
+++ b/anaconda/po/ar.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Arabic <trans-ar@lists.fedoraproject.org>\n"
@@ -29,211 +29,444 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "إبدأ VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "إستعمل النّمط النّصي"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "موافق"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "يجري تشغيل النصوص البرمجية لما قبل التثبيت"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "عملية التثبيت على وشك البدء"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "يجري القيام بإعداد ما بعد التثبيت"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -242,85 +475,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "يجري تشغيل النصوص البرمجية لما قبل التثبيت"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "يجب أن يكون طول اسم العائل 255 حرفاً أو أقل."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "يجب أن يبدأ اسم العائل بحرف صالح من المدى 'a-z' أو 'A-Z'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -329,7 +854,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "تثبيت نظام %(productName)s %(productVersion)s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -342,8 +872,8 @@ msgstr "عندما تنتهي رجاء اختر من الصَّدفة وسيقو
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "إنقاذ"
 
@@ -381,28 +911,22 @@ msgstr "النّظام المطلوب إنقاذه"
 msgid "Which device holds the root partition of your installation?"
 msgstr "ما هو الجهاز الذي يحمل القسم الجذري لعملية التثبيت؟"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "موافق"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "خروج"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -415,7 +939,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -424,28 +948,203 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "وضع الإنقاذ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "تم ضم النظام تحت الدليل %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "القسم الجذريّ أقل من 250 ميجابايت والذي هو عادة قليل جداً لتثبيت %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "لم تُعرّف قسم جذري (/)، والذي هو مطلوب لاستمرار تثبيت %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"القسم %(mount)s أقلّ حجماً من %(size)s ميجابايت والذي هو أقلّ من المستحسن "
+"لتثبيت طبيعي لنظام %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "يجب عليك إنشاء قسم قابل للإقلاع."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"لم تقم بتحديد قسم ذاكرة بديلة.  مع أنّه ليس مطلوباً بشكل إلزامي بكل الحالات، "
+"إلا أنّه قد يحسّن أداء معظم التّثبيتات."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -550,84 +1249,235 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_فيدورا"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "ريدهات لينوكس للأعمال"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "خطأ في تثبيت حزمة"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "تحتاج لمزيد من المساحة على نظام الملفات:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "خطأ في تثبيت حزمة"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ما بعد التثبيت"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ما بعد التثبيت"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "خطأ"
 
@@ -651,31 +1501,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -690,449 +1542,521 @@ msgstr ""
 "انطلاقا من حاسوب آخر و القيام بتثبيت رسومي أم تودّ المتابعة بالتثبيت على "
 "النّمط النّصّي ؟"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "يجب أن يكون طول كلمة المرور 6 رموز على الأقلّ."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "يجب أن يكون طول كلمة المرور 6 رموز على الأقلّ."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "التثبيت على وشك البدء"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "يجري القيام بإعداد ما بعد الترقية"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "إبدأ VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "يجري التثبيت"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "خطأ في تثبيت حزمة"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "تطوير البرمجيات"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "تحذير"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1148,262 +2072,149 @@ msgstr "قيد العمل."
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "تثبيت نظام %(productName)s %(productVersion)s"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
@@ -1413,319 +2224,265 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "تطوير البرمجيات"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1752,279 +2509,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "تطوير البرمجيات"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "خطأ في إعداد المستودع"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "خطأ في إعداد المستودع"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2032,14 +2813,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2048,33 +2829,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2085,95 +2872,109 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "موافق"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2188,68 +2989,163 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2261,947 +3157,1357 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "ا_ستمر"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "موافق"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "خادم ويب"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "أكّد"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "الشّبكة غير متوفرة"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "إستعمل النّمط النّصي"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "السعة"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "جهاز RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_أضف"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "أكّد"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "الشّبكة غير متوفرة"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "أكّد"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "أكّد"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "أكّد"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "مُتّصل!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "أقسام نظام EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "إ_نهاء برنامج التثبيت"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "أقسام نظام EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "مشفّر"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "أقسام نظام EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_أضف"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "موافق"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "أكّد"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_أضف"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "موافق"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "جهاز RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_أضف"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3209,645 +4515,1014 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ما اللّغة التي تودّ استخدامها أثناء عمليّة التثبيت؟"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "ا_ستمر"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "أكّد"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "فارغ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "جهاز RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_أضف"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "مشفّر"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "السعة"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "جهاز RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "جهاز RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "مشفّر"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "جهاز RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "أكّد"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "موافق"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "موافق"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "جهاز RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "فارغ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "السعة"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "جهاز RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "مشفّر"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "موافق"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "أكّد"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "موافق"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "أقسام نظام EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ما بعد التثبيت"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "يجري القيام بإعداد ما بعد الترقية"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "أعد التّشغيل"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3861,40 +5536,41 @@ msgstr "ثبّت"
 msgid "Install the live CD to your hard disk"
 msgstr "تثبيت القرص الحي على القرص الصلب"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3903,60 +5579,72 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "خطأ"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "يجب أن يبدأ اسم العائل بحرف صالح من المدى 'a-z' أو 'A-Z'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "تحتاج لمزيد من المساحة على نظام الملفات:\n"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "جهاز RAID"
+
 #~ msgid "Completed"
 #~ msgstr "تم"
 
@@ -3979,9 +5667,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "إنهاء برنامج التثبيت"
 
-#~ msgid "_Exit installer"
-#~ msgstr "إ_نهاء برنامج التثبيت"
-
 #~ msgid "IP address is missing."
 #~ msgstr "عنوان IP مفقود"
 
@@ -4011,17 +5696,11 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "ليس هذا هو قرص %s الصّحيح."
 
-#~ msgid "No Network Available"
-#~ msgstr "الشّبكة غير متوفرة"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
 #~ msgstr "بعض المستودعات تتطلب اتصالا، لكن هناك خطأ تفعيل الشبكة على نظامك."
 
-#~ msgid "Re_boot"
-#~ msgstr "أعد التّشغيل"
-
 #~ msgid "_Eject"
 #~ msgstr "إ_خراج القرص المدمج"
 
@@ -4133,9 +5812,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "سطح مكتب رسومي"
 
-#~ msgid "Web Server"
-#~ msgstr "خادم ويب"
-
 #~ msgid "Minimal"
 #~ msgstr "مختزل"
 
@@ -4145,38 +5821,10 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "لا يمكنك حذف قسم من DASD منسّق بشكل LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr "لم تُعرّف قسم جذري (/)، والذي هو مطلوب لاستمرار تثبيت %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "القسم الجذريّ أقل من 250 ميجابايت والذي هو عادة قليل جداً لتثبيت %s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "القسم %(mount)s أقلّ حجماً من %(size)s ميجابايت والذي هو أقلّ من المستحسن "
-#~ "لتثبيت طبيعي لنظام %(productName)s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "التثبيت على جهاز USB. هذا قد يؤدي إلى نظام يعمل وقد لا يعمل."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "يجب عليك إنشاء قسم قابل للإقلاع."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "لم تقم بتحديد قسم ذاكرة بديلة.  مع أنّه ليس مطلوباً بشكل إلزامي بكل "
-#~ "الحالات، إلا أنّه قد يحسّن أداء معظم التّثبيتات."
-
 #~ msgid "Back"
 #~ msgstr "عودة"
 
diff --git a/anaconda/po/as.po b/anaconda/po/as.po
index 402a9eb..98d9d4e 100644
--- a/anaconda/po/as.po
+++ b/anaconda/po/as.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-07 12:44+0000\n"
 "Last-Translator: ngoswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese (http://www.transifex.com/projects/p/fedora/language/"
@@ -24,11 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ফাইলচিস্টেম"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -37,7 +37,7 @@ msgstr ""
 "RAID সংহতিসমূহ যি '%s' অন্তৰ্ভুক্ত কৰে সিহতৰ নিম্নলিখিত raid স্তৰসমূহৰ এটা থাকিব "
 "লাগিব: %s।"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -46,7 +46,7 @@ msgstr ""
 "RAID সংহতিসমূহ যি '%s' অন্তৰ্ভুক্ত কৰে সিহতৰ নিম্নলিখিত মেটাডাটা সংস্কৰণসমূহৰ এটা "
 "থাকিব লাগিব: %s"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -55,108 +55,129 @@ msgstr ""
 "RAID সংহতিসমূহ যি '%s' অন্তৰ্ভুক্ত কৰে সিহতৰ নিম্নলিখিত ডিভাইচ ধৰণসমূহৰ যিকোনো এটা "
 "থাকিব লাগিব: %s।"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s ৰ নিম্নলিখিত ডিস্কলেবেল ধৰণসমূহৰ এটা থাকিব লাগিব: %s।"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s ধৰণ %s ৰ নিচিনা হব নোৱাৰে।"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s ক %s ৰ এটাত মাউন্ট কৰিব লাগিব।"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s আকাৰত %d আৰু %d MB ৰ মাজত হব লাগিব"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s %dMB কে সৰু হব নালাগিব।"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s %dMB কে ডাঙৰ হব নালাগিব।"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s ডিস্কৰ প্ৰথম %dMB ৰ মাজত হব লাগিব।"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s এটা প্ৰাথমিক বিভাজনত হব লাগিব।"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s এটা ইনক্ৰিপ্টেড খণ্ড ডিভাইচত হব নোৱাৰিব।"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ধৰণ %s ৰ হব নোৱাৰিব"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s ৰ %s ত %s ফাইলচিস্টেম ব্যৱহাৰ কৰোতে grub2 দ্বাৰা core.img অন্তৰ্ভুক্ত কৰিবলে "
 "পৰ্যাপ্ত স্থান নাথাকিব পাৰে"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC আৰম্ভ কৰক"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "লিখিত ধৰণ ব্যৱহাৰ কৰক"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "পাছৱাৰ্ড সংহতি কৰা আছে।"
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "পাছৱাৰ্ডসমূহ মিল নাখায়!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "আপুনি এটা দূৰ্বল পাছৱাৰ্ড প্ৰদান কৰিছে: %s।  ইয়াক তথাপিও ব্যৱহাৰ কৰিবলে কৰা হল "
 "টিপক।"
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -164,87 +185,338 @@ msgstr ""
 "টিপক।"
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "দূৰ্বল"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "ভাল"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "ভাল"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "শক্তিশালী"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "হয় (_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "নহয় (_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"ইনস্টল ভঁৰাল ইনস্টল কৰোতে নিম্নলিখিত ত্ৰুটি দেখা দিলে:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ইনস্টল প্ৰক্ৰিয়া আগবাঢ়িব নোৱাৰে।"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"ইনস্টল ভঁৰাল ইনস্টল কৰোতে নিম্নলিখিত ত্ৰুটি দেখা দিলে:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ইনস্টল প্ৰক্ৰিয়া আগবাঢ়িব নোৱাৰে।"
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"ইনস্টলেষণৰ বাবে চিহ্নিত নিম্নলিখিত চফ্টৱেৰৰ ত্ৰুটি আছে।   ই সম্ভবত আপোনাৰ ইনস্টল "
+"উৎসৰ সৈতে এটা ত্ৰুটিৰ বাবে হৈছে।\n"
+"আপুনি এই পেকেইজসমূহক আপোনাৰ ইনস্টলেষণৰ পৰা আতৰোৱাৰ চেষ্টা কৰিব পাৰে। আপোনাৰ "
+"ইনস্টলেষণ উৎস পৰিবৰ্তন কৰক,\n"
+"অথবা ইনস্টলাৰ প্ৰস্থান কৰক।"
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"ইনস্টল প্ৰক্ৰিয়া আপোনাৰ হাৰ্ডৱেৰৰ এটা সমস্যাৰ বাবে বন্ধ কৰা হৈছে। সঠিক ত্ৰুটি বাৰ্তা "
+"হল:\n"
+"\n"
+"%s।\n"
+"\n"
+"ইনস্টলাৰ এতিয়া প্ৰস্থান কৰিব।"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"ইনস্টল প্ৰক্ৰিয়া আপোনাৰ হাৰ্ডৱেৰৰ এটা সমস্যাৰ বাবে বন্ধ কৰা হৈছে। সঠিক ত্ৰুটি বাৰ্তা "
+"হল:\n"
+"\n"
+"%s।\n"
+"\n"
+"ইনস্টলাৰ এতিয়া প্ৰস্থান কৰিব।"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "হাৰ্ডৱেৰ ত্ৰুটি পোৱা গল"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"ইনস্টল প্ৰক্ৰিয়া আপোনাৰ হাৰ্ডৱেৰৰ এটা সমস্যাৰ বাবে বন্ধ কৰা হৈছে। সঠিক ত্ৰুটি বাৰ্তা "
+"হল:\n"
+"\n"
+"%s।\n"
+"\n"
+"ইনস্টলাৰ এতিয়া প্ৰস্থান কৰিব।"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "ইনস্টল্ড চিস্টেম সংৰূপণ কৰা হৈছে"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "নেটৱাৰ্ক সংৰূপ লিখা হৈছে"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "ব্যৱহাৰকাৰীসমূহ সৃষ্টি কৰক"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "ইনস্টল্ড চিস্টেম সংৰূপণ কৰা হৈছে"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ইনস্টলৰ প্ৰাক্কালৰ স্ক্ৰিপ্ট সঞ্চালিত হৈছে"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ইনস্টলেষণ উৎস সংস্থাপন কৰা হৈছে..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "বুটল'ডাৰ ইনস্টল কৰা হৈছে"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "পস্ট-ইনস্টল সংস্থাপন কাৰ্য্যসমূহ পৰিৱেশন কৰা হৈছে"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "বুটল'ডাৰ ইনস্টল কৰা হৈছে"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow প্ৰমাণপত্ৰ %s ৰ নেটৱাৰ্কৰ প্ৰয়োজন।"
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -256,30 +528,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s সন্ধানহিন। ফায়াৰৱাল সংস্থাপন কৰিব নোৱাৰি।"
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s সন্ধানহিন। ফায়াৰৱাল সংস্থাপন কৰিব নোৱাৰি।"
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "এই ফাইল চিস্টেমে লেবেলসমূহ সমৰ্থন নকৰে।"
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "ধাৰ্য্যত নাম %s ইতিমধ্যে ব্যৱহৃত।"
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "ভলিউম দল নাম %s ইতিমধ্যে ব্যৱহৃত। পৰিবৰ্তনসমূহ সংৰক্ষণ কৰা হোৱা নাই।"
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ইনস্টলৰ প্ৰাক্কালৰ স্ক্ৰিপ্ট সঞ্চালিত হৈছে"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "হস্টনাম ৰিক্ত অথবা এটা ৰিক্ত স্ট্ৰিং হব নোৱাৰিব।"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "হস্টৰ নাম দীৰ্ঘত ২৫৫ বা কমসংখ্যাৰ আখৰৰ হ'ব লাগিব।"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "হস্টৰ নাম 'a-z', 'A-Z', বা '0-9' অঞ্চলৰ কোনো বৈধ আখৰৰে আৰম্ভ হ'ব লাগিব।"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -289,55 +853,55 @@ msgstr ""
 "পিৰিয়ডৰ মাজৰ অংশসমূহে কিবা অন্তৰ্ভুক্ত কৰিব লাগিব আৰু '-' ৰ সৈতে আৰম্ভ অথবা শেষ হব "
 "নোৱাৰিব।"
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "সংযোগ কৰা হৈছে..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "বিচ্ছিন্ন কৰা হৈছে..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "তাঁৰযুক্ত (%s) সংযুক্ত"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "%s ৰ সৈতে বেতাঁৰ সংযুক্ত "
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "সংযুক্ত নহয়"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "কোনো নেটৱাৰ্ক ডিভাইচ উপলব্ধ নাই"
 
@@ -346,7 +910,12 @@ msgstr "কোনো নেটৱাৰ্ক ডিভাইচ উপলব্
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s ইনস্টলেষণ"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "নতুন %s %s ইনস্টলেষণ"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "চিস্টেমটো আনমাউন্ট কৰিবলে %s চলাওক যেতিয়া আপোনাৰ কাম সমপূৰ্ণ হৈ যাব।"
@@ -360,8 +929,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "চলাবলৈ /bin/sh পোৱা নগল! শ্বেল আৰম্ভ কৰা হোৱা নাই"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "উদ্ধাৰ"
 
@@ -408,21 +977,15 @@ msgstr "উদ্ধাৰৰ বাবে চিস্টেম"
 msgid "Which device holds the root partition of your installation?"
 msgstr "আপোনাৰ ইনস্টলৰ কোনটো বিভাজনে মূল বিভাজন ধৰি ৰাখে ?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ঠিক অাছে"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "প্ৰস্থান"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "চিস্টেমটো স্বচালিতভাৱে পুনাৰম্ভ হব যেতিয়া আপুনি শ্বেলৰ পৰা প্ৰস্থান কৰিব।"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -432,7 +995,7 @@ msgstr ""
 "পিছলৈ যাওক দবাওক এটা শ্বেললে যাবলে যৰ পৰা আপুনি fsck চলাই আপোনাৰ বিভাজনসমূহ "
 "মাউন্ট কৰিব পাৰিব। %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -453,7 +1016,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -466,28 +1029,235 @@ msgstr ""
 "\n"
 "এটা শ্বেল প্ৰাপ্ত কৰিবলে <return> টিপক।"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "কোনো Linux বিভাজন উপস্থিত নাই।  পুনৰ বুট কৰা হৈছে।\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "চিস্টেমটো স্বচালিতভাৱে পুনাৰম্ভ হব যেতিয়া আপুনি শ্বেলৰ পৰা প্ৰস্থান কৰিব।"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "উদ্ধাৰ পদ্ধতি"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "আপোনাৰ Linux বিভাজনসমূহ নাই। অনুগ্ৰহ কৰি শ্বেল %s লে ঘুৰি যাওক"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "আপোনাৰ চিস্টেম %s ডাইৰেকটৰিৰ তলত মাউন্ট কৰা হৈছে।"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "প্ৰামাণিক বিভাজন"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "ডিস্ক"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"আপোনাৰ কমপিউটাৰৰ 'swap' স্থান মেমৰি কম থকা অৱস্থাত অপাৰেটিং\n"
+"চিস্টেম দ্বাৰা ব্যৱহাৰ কৰা হৈছে।"
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"আপোনাৰ কমপিউটাৰৰ 'boot' স্থান হল যত অপাৰেটিং চিস্টেম\n"
+"আৰম্ভ কৰিবলে প্ৰয়োজনীয় ফাইলসমূহ সংৰক্ষণ কৰা হয়।"
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"আপোনাৰ কমপিউটাৰৰ 'root' স্থান হল যত কেন্দ্ৰীয় চিস্টেম ফাইল আৰি এপ্লিকেচনসমূহ\n"
+"সংৰক্ষণ কৰা হয়।"
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"আপোনাৰ কমপিউটাৰৰ 'home' স্থান হল যত আপোনাৰ সকলো ব্যক্তিগত\n"
+"তথ্য সংৰক্ষণ কৰা হয়।"
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"বুটিং সামৰ্থবান কৰিবলে BIOS হাৰ্ডৱেৰত GPT-বিভাজিত ডিস্কসমূহৰ পৰা\n"
+"BIOS বুট বিভাজনৰ প্ৰয়োজন।"
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PRep বুট বিভাজনক কিছুমান PPC প্লেটফৰ্মত বুটল'ডাৰ সংৰূপৰ এটা অংশ\n"
+"হিচাপে প্ৰয়োজন হয়।"
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "আপোনাৰ মূল বিভাজন ২৫০ MBকৈ কম যিটো সাধাৰণতে %s ইনস্টলৰ বাবে বৰ সৰু।"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"আপুনি কোনো মূল বিভাজন (/) সংজ্ঞাবদ্ধ কৰা নাই, যাৰ %s ৰ ইনস্টলত আগবাঢ়িব'লৈ প্ৰয়োজন "
+"আছে।"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"এই প্লেটফৰ্মৰ এটা বিভাজন অথবা যৌক্তিক আয়তনত /boot ৰ প্ৰয়োজন। যদি আপুনি এটা /boot "
+"আয়তন নিবিচাৰে, আপুনি এটা নন-LVM বিভাজনত / দিব লাগিব।"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"আপোনাৰ  %(mount)s বিভাজন %(size)s মেগাবাইটতকে কে কম যোনটো এটা স্বাভাৱিক "
+"%(productName)s ইনস্টলৰ বাবে উপদেশিতকে কম।"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"আপোনাৰ %(mount)s বিভাজন %(format)s ফৰমেটিংৰ বাবে অতি সৰু (অনুমোদিত আকাৰ হল "
+"%(minSize)d MB ৰ পৰা %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"আপোনাৰ %(mount)s বিভাজন %(format)s ফৰমেটিংৰ বাবে অতি ডাঙৰ (অনুমোদিত আকাৰ হল "
+"%(minSize)d MB ৰ পৰা %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "নতুন ডিভাইচ যোগ কৰিবলে ব্যৰ্থ। বিৱৰণৰ বাবে ক্লিক কৰক।"
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "এটা boot কৰাৰ যোগ্য বিভাজন নিৰ্মাণ কৰা নহয়।"
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"আপোনাৰ BIOS-ভিত্তিয় চিস্টেমৰ %s ৰ নতুন ডিস্ক লেবেল বিন্যাস (GPT) ৰ সৈতে বুট হবলে "
+"এটা বিশেষ বিভাজনৰ প্ৰয়োজন। আগবাঢ়িবলে, অনুগ্ৰহ কৰি এটা ১MB 'BIOS বুট' ধৰণ বিভাজন "
+"সৃষ্টি কৰক।"
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"আপুনি এটা শ্বাপ বিভাজন ধাৰ্য্য কৰা নাই। এটা শ্বাপ বিভাজনৰ বাহিৰে ইনস্টল চলাই নিবলে "
+"%(requiredMem)s MB মেমৰিৰ প্ৰয়োজন, কিন্তু আপোনাৰ কেৱল %(installedMem)s MB আছে।"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"আপুনি কোনো শ্বাপ বিভাজন নিৰ্দ্দিষ্ট কৰা নাই। যদিও সকলো ক্ষেত্ৰতে কঠোৰ ভাবে প্ৰয়োজন "
+"নহয়, এইটোৱে সৰহভাগ ইনস্টলৰ যোগ্যতা গুৰুতৰ ভাবে বঢ়াব।"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"আপোনাৰ শ্বাপ ডিভাইচসমূহৰ অন্তত এটাৰ এটা UUID নাই, যি mkswap ৰ পুৰনি সংস্কৰণসমূহ "
+"ব্যৱহাৰ কৰি সৃষ্টি কৰা শ্বাপ স্থানৰ বাবে সাধাৰণ। এই ডিভাইচসমূহক /etc/fstab ত "
+"ডিভাইচ পথৰে প্ৰসংগ কৰা হব, যি সংগত নহয় যিহেতু ডিভাইচ পথসমূহ বিভিন্ন ক্ষেত্ৰত সলনি "
+"হব পাৰে। "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "এই মাউন্ট-বিন্দু বৈধ নহয়। %s ডাইৰেকটৰি / ফাইলচিস্টেমত স্থাপিত হোৱা আৱশ্যক।"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s মাউন্ট-বিন্দু linux ফাইলচিস্টেমৰ ওপৰত স্থাপিত হোৱা আৱশ্যক।"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "পাচফ্ৰেইছ:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -601,53 +1371,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "প্ৰদান কৰা VNC পাছৱাৰ্ড অন্তত ৬ আখৰ দীঘল আছিল।\n"
 "অনুগ্ৰহ কৰি নতুন এটা সুমুৱাওক। পাছৱাৰ্ড নিদিলে খালি এৰক।"
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "Fedora (_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ইনস্টল উৎস সংস্থাপন কৰিবলে ব্যৰ্থ"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "পেকেইজ মেটাডাটা ডাউনল'ড কৰোতে ত্ৰুটি..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "কোনো ইনস্টল উৎস উপলব্ধ নাই"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "চফ্টৱেৰ ইনস্টল কৰা হৈছে"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "পেকেইজ ইনস্টল প্ৰক্ৰিয়া আৰম্ভ কৰা হৈছে"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "নিম্নমলিখিত ফাইল চিস্টেম সমূহৰ বাবে আপোনাক আৰু স্থানৰ প্ৰয়োজন:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ইনস্টল উৎসস্থলৰ পৰা তথ্য বিনিময়ৰ প্ৰস্তুতি চলিছে"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "ইনস্টল কৰা হৈছে"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "পেকেইজ মেটাডাটা ডাউনল'ড কৰা হৈছে..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ইনস্টল কৰা হৈছে"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ইনস্টলৰ প্ৰস্তুতি"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰা হৈছে..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "অবিকল্পিত শীৰ্ষক"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "স্থানীয়কৰণ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "স্থানীয়কৰণ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "চফ্টৱেৰ"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "চিস্টেম"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "ব্যৱহাৰকাৰী সংহতিসমূহ"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -656,34 +1511,101 @@ msgstr ""
 "বৰ্তমান চফ্টৱেৰ নিৰ্বাচনৰ বাবে ফাইলচিস্টেমসমূহত পৰ্যাপ্ত স্থান নাই। এটা অতিৰিক্ত %s ৰ "
 "প্ৰয়োজন।"
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ইনস্টলেষণ হাব"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr " স্বচালিত ইনস্টল আৰম্ভ কৰা হৈছে"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "অাদেশ বাক্যৰ ধৰণত প্ৰশ্ন হ'ব নোৱাৰে !"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  অনুগ্ৰহ কৰি ওপৰৰ পৰা আপোনাৰ পছন্দ [প্ৰস্থান কৰিবলে 'q' | আগবাঢ়িবলে 'c']: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "অনুগ্ৰহ কৰি আগবঢ়াৰ আগত সকলো স্পৌক সম্পূৰ্ণ কৰক"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "অবিকল্পিত HUB শীৰ্ষক"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "অনুগ্ৰহ কৰি আগবঢ়াৰ আগত সকলো স্পৌক সম্পূৰ্ণ কৰক"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ভুল"
 
@@ -707,32 +1629,35 @@ msgstr "হয়"
 msgid "no"
 msgstr "নহয়"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "আপুনি সঁচাকৈ প্ৰস্থান কৰিব বিচাৰে নেকি?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  অনুগ্ৰহ কৰি ওপৰৰ পৰা আপোনাৰ পছন্দ [প্ৰস্থান কৰিবলে 'q' | আগবাঢ়িবলে 'c']: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -747,219 +1672,258 @@ msgstr ""
 "সংযোগ কৰি VNC আৰম্ভ কৰিব খোজে নেকি যাতে চিত্ৰাংকিত ইনস্টল কৰিব পাৰি নে লিখিত "
 "ধৰণৰ ইনস্টলত আগবাঢ়িব খোজে ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC পাছৱাৰ্ড"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "অনুগ্ৰহ কৰি VNC পাছৱাৰ্ড প্ৰদান কৰক। আপুনি ইয়াক দুবাৰ টাইপ কৰিব লাগিব।  \n"
 "কোনো পাছৱাৰ্ড নিদিলে খালি এৰক"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "পাছৱাৰ্ড: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "পাছৱাৰ্ড (সুনিশ্চিত কৰক): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "পাছৱাৰ্ডসমূহ মিল নাখায়!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "পাছৱাৰ্ড অতি কমেও ৬টা আখৰ দীঘল হ'ব লাগে।"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "পাছৱাৰ্ড অতি কমেও ৬টা আখৰ দীঘল হ'ব লাগে।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "সময়অঞ্চল সংহতিসমূহ"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "সময়অঞ্চল সংহতি কৰা হোৱা নাই।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "উপলব্ধ অঞ্চলসমূহ"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "উপলব্ধ অঞ্চলসমূহ"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "নেটৱাৰ্ক সংৰূপ লিখা হৈছে"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "তাঁৰযুক্ত (%s) সংযুক্ত"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "তাঁৰযুক্ত (%s) সংযুক্ত"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "হস্টনাম:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "হস্টনাম"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "হস্টনাম"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "হস্টনাম বৈধ নহয়: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "সংৰূপ সম্পূৰ্ণ কৰক (_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "গেইটৱে"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ফাইলচিস্টেমৰ সংৰূপত এটা ধৰণ নাই"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "ইনস্টল্ড চিস্টেম সংৰূপণ কৰা হৈছে"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "ৰুট পাছৱাৰ্ড:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "পাছৱাৰ্ড সংহতি কৰা আছে।"
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "ৰুট একাওন্ট অসামৰ্থবান।"
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "পাছৱাৰ্ড সংহতি কৰা হোৱা নাই।"
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "অনুগ্ৰহ কৰি নতুন ৰুট পাছৱাৰ্ড বাছক। আপুনি ইয়াক দুবাৰ টাইপ কৰিব লাগিব।"
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "পাছৱাৰ্ড: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "সকলো স্থান ব্যৱহাৰ কৰক"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "স্থায়ী Linux চিস্টেম(সমূহ) প্ৰতিস্থাপন কৰক"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "ৰিক্ত স্থান ব্যৱহাৰ কৰক"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ইনস্টল গন্তব্য"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "কোনো ডিস্ক নিৰ্বাচন কৰা হোৱা নাই"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰোতে ত্ৰুটি"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰোতে ত্ৰুটি"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "স্বচালিত বিভাজন নিৰ্বাচন কৰা হৈছে"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "স্বনিৰ্বাচিত বিভাজন নিৰ্বাচন কৰা হৈছে"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -967,39 +1931,61 @@ msgstr ""
 "কোনো ডিস্ক নিৰ্বাচন কৰা হোৱা নাই। অনুগ্ৰহ কৰি কমপিউটাৰ বন্ধ কৰক, অন্তত এটা ডিস্ক "
 "সংযোগ কৰক, আৰু ইনস্টলেষণ সম্পূৰ্ণ কৰিবলে পুনৰাম্ভ কৰক।"
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "কোনো ডিস্ক নিৰ্বাচন কৰা হোৱা নাই; অনুগ্ৰহ কৰি ইনস্টল কৰিবলে অন্তত এটা ডিস্ক বাছক।"
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "সংৰক্ষণ বিশ্লেষণ কৰা হৈছে..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "বাছক (_S)"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "আপডেইটেড সংৰক্ষণ সংৰূপ সৃজন কৰা হৈছে"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "সংৰক্ষণ সংৰূপ ব্যৰ্থ হল: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰা হৈছে..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "স্ববিভাজন বিকল্পসমূহ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1008,41 +1994,41 @@ msgstr ""
 "ইনস্টলেষণ কৰিবলে আপোনাৰ হাৰ্ড ড্ৰাইভ বিভাজন কৰিব লাগিব।  ইনস্টল লক্ষ্যৰ বাবে কোন "
 "স্থান ব্যৱহাৰ কৰা হব  বাছক।"
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "বিভাজন আঁচনি সংৰূপ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "বিভাজন আঁচনি সংৰূপ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "সময়অঞ্চল সংহতিসমূহ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s সময়অঞ্চল"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "সময়অঞ্চল সংহতি কৰা হোৱা নাই।"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "অঞ্চল %s ত উপলব্ধ সময়অঞ্চলসমূহ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "উপলব্ধ অঞ্চলসমূহ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1051,178 +2037,196 @@ msgstr ""
 "নম্বৰসমূহ ব্যৱহাৰ কৰক অথবা নামসমূহ প্ৰত্যক্ষভাৱে টাইপ কৰক [অঞ্চল তালিকাৰ বাবে b, "
 "প্ৰস্থান কৰিবলে q]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC আৰম্ভ কৰক"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ইনস্টলৰ প্ৰগতি"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "নিকটতম মিৰৰ"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS চাৰ্ভাৰ %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "চফ্টৱেৰ উৎস সংস্থাপন কৰোতে ত্ৰুটি"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "একো নিৰ্বাচন কৰা হোৱা নাই"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "সংযোগ কৰা হৈছে..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD ড্ৰাইভ"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO ফাইল (_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "নেটৱাৰ্ক সময়"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "কোনো ইনস্টল উৎস উপলব্ধ নাই"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ইনস্টল উৎস সংস্থাপন কৰিবলে ব্যৰ্থ"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "পেকেইজ মেটাডাটা ডাউনল'ড কৰোতে ত্ৰুটি..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "কোনো ইনস্টল উৎস উপলব্ধ নাই"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS চাৰ্ভাৰ %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS মাউন্ট বিকল্পসমূহ:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "ইনস্টল উৎস সংস্থাপন কৰিবলে ব্যৰ্থ, ভঁৰাল url নীৰিক্ষণ কৰক"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot থকা ডিভাইচটো"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "ইনস্টল উৎস সংস্থাপন কৰিবলে ব্যৰ্থ"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "চফ্টৱেৰ নিৰ্বাচন পৰিবৰ্তন কৰক (_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "চফ্টৱেৰ নিৰ্বাচন নীৰিক্ষণ কৰোতে ত্ৰুটি"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "ইনস্টলেষণ উৎস সংস্থাপন কৰা হোৱা নাই"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "উৎস পৰিবৰ্তন হৈছে - অনুগ্ৰহ কৰি সতাসত্য নিৰূপণ কৰক"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "স্বনিৰ্বাচিত চফ্টৱেৰ নিৰ্বাচন কৰা হৈছে"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "ইনস্টলেষণ উৎস সংস্থাপন কৰা হোৱা নাই"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "আপোনাৰ পৰিৱেশ বাছক"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "প্ৰমাণীকৰণ ব্যৱহাৰ কৰক (_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "আপুনি এটা পাছৱাৰ্ড প্ৰদান কৰি সুনিশ্চিত কৰিব লাগিব।"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "সকীয়নী"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1238,36 +2242,36 @@ msgstr "চলমান"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tইনস্টলেষণ সম্পূৰ্ণ।  প্ৰস্থান কৰিবলে return টিপক"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "অবিকল্পিত স্পৌক শীৰ্ষক"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "অৱস্থা পৰিক্ষা কৰা হৈছে..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "নতুন ডিভাইচ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "পাছৱাৰ্ড (সুনিশ্চিত কৰক): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1276,7 +2280,7 @@ msgstr ""
 "আপুনি এটা দূৰ্বল পাছৱাৰ্ড প্ৰদান কৰিছে: %s।  ইয়াক তথাপিও ব্যৱহাৰ কৰিবলে কৰা হল "
 "টিপক।"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1285,70 +2289,58 @@ msgstr ""
 "আপুনি এটা দূৰ্বল পাছৱাৰ্ড প্ৰদান কৰিছে: %s।  ইয়াক তথাপিও ব্যৱহাৰ কৰিবলে কৰা হল "
 "টিপক।"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "পাছৱাৰ্ড সংহতি কৰা আছে।"
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "ইনস্টলাৰ প্ৰস্থান কৰক (_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "সহায়"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "প্ৰস্থান কৰক (_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "নহয় (_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "হয় (_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "অবিকল্পিত শীৰ্ষক"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "স্থানীয়কৰণ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "স্থানীয়কৰণ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "চফ্টৱেৰ"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "চিস্টেম"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "ব্যৱহাৰকাৰী সংহতিসমূহ"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 "অনুগ্ৰহ কৰি পৰৱৰ্তী স্তৰত আগবঢ়াৰ আগত এই আইকনৰ সৈতে চিহ্নিত বস্তুবোৰ সম্পূৰ্ণ কৰক।"
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "সম্পূৰ্ণ!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1357,168 +2349,66 @@ msgstr ""
 "%s এতিয়া আপোনাৰ চিস্টেমত সফলভাৱে ইনস্টল কৰা হল আৰু ব্যৱহাৰ\n"
 "কৰিবলে প্ৰস্তুত!  আগবাঢ়ক আৰু ইয়াক ব্যৱহাৰ কৰিবলে চিস্টেম পুনৰাম্ভ কৰক!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "সম্পূৰ্ণ!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "নতুন %s %s ইনস্টলেষণ"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s ক আপোনাৰ চিস্টেমত এতিয়া সফলভাৱে ইনস্টল কৰা হৈছে, কিন্তু কিছুমান সংৰূপণ এতিয়াও "
+"কৰিব লগিয়া আছে।  \n"
+"ইয়াক সম্পূৰ্ণ কৰক আৰু তাৰ পিছত অনুগ্ৰহ কৰি সংৰূপ সম্পূৰ্ণ কৰক বুটাম ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s এতিয়া আপোনাৰ চিস্টেমত সফলভাৱে ইনস্টল কৰা হল আৰু ব্যৱহাৰ\n"
+"কৰিবলে প্ৰস্তুত!  আগবাঢ়ক আৰু ইয়াক ব্যৱহাৰ কৰিবলে চিস্টেম পুনৰাম্ভ কৰক!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "এটা নতুন ভলিউম দল সৃষ্টি কৰা হৈছে ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "ডিভাইচ পুনৰ সংৰূপ ব্যৰ্থ হল। বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"অনুগ্ৰহ কৰি আপোনাৰ ভলিউম দলৰ বাবে এটা নাম সৃষ্টি কৰক আৰু তলত অন্তত এটা ডিস্ক বাছক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "ভলিউম দল:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "স্তম্ভ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "সংৰক্ষণ সংৰূপ উদ্ধাৰ কৰিব নোৱাৰি ত্ৰুটিৰ বাবে পুনৰ সংহতি হল। বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "ডিভাইচ পুনৰ সংৰূপ ব্যৰ্থ হল। বিৱৰণৰ বাবে ক্লিক কৰক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "অনুগ্ৰহ কৰি এটা বৈধ মাউন্টবিন্দু সুমুৱাওক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "সেই মাউন্ট বিন্দু অবৈধ। অন্য কিবা চেষ্টা কৰিব?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "সেই মাউন্ট বিন্দু ইতিমধ্যে ব্যৱহৃত। অন্য কিবা চেষ্টা কৰিব?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"আপুনি নিৰ্বাচন কৰা RAID স্তৰৰ বাবে আপুনি বৰ্তমানে নিৰ্বাচন কৰা ডিস্কসমূহতকে অধিক "
-"ডিস্কৰ প্ৰয়োজন।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "অনুগ্ৰহ কৰি এটা বৈধ মাউন্টবিন্দু সুমুৱাওক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "সেই মাউন্ট বিন্দু অবৈধ। অন্য কিবা চেষ্টা কৰিব?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "প্ৰামাণিক বিভাজন"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "ডিস্ক"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "কোনো নহয়"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s ৰুটতো অন্য সকলো ফাইলচিস্টেম মচি পেলাওক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "আপুনি %s ত উপলব্ধ সকলো তথ্য মচি পেলাবলে নিশ্চিত নে?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "আপুনি %s ত উপলব্ধ সকলো তথ্য মচি পেলাবলে নিশ্চিত নে?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "হস্তচালিত বিভাজন প্ৰক্ৰিয়া"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d সংৰক্ষণ ডিভাইচ চিনাক্ত কৰা হৈছে"
 msgstr[1] "%d সংৰক্ষণ ডিভাইচসমূহ চিনাক্ত কৰা হৈছে"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1527,129 +2417,110 @@ msgstr ""
 "যেতিয়া আপুনি আপোনাৰ %s %s ইনস্টলৰ বাবে মাউন্ট বিন্দুসমূহ সৃষ্টি কৰে,\n"
 "আপুনি সিহতৰ বিৱৰণসমূহ ইয়াত চাব পাৰিব।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"আপোনাৰ কমপিউটাৰৰ 'swap' স্থান মেমৰি কম থকা অৱস্থাত অপাৰেটিং\n"
-"চিস্টেম দ্বাৰা ব্যৱহাৰ কৰা হৈছে।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"আপোনাৰ কমপিউটাৰৰ 'boot' স্থান হল যত অপাৰেটিং চিস্টেম\n"
-"আৰম্ভ কৰিবলে প্ৰয়োজনীয় ফাইলসমূহ সংৰক্ষণ কৰা হয়।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"আপোনাৰ কমপিউটাৰৰ 'root' স্থান হল যত কেন্দ্ৰীয় চিস্টেম ফাইল আৰি এপ্লিকেচনসমূহ\n"
-"সংৰক্ষণ কৰা হয়।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"আপোনাৰ কমপিউটাৰৰ 'home' স্থান হল যত আপোনাৰ সকলো ব্যক্তিগত\n"
-"তথ্য সংৰক্ষণ কৰা হয়।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"বুটিং সামৰ্থবান কৰিবলে BIOS হাৰ্ডৱেৰত GPT-বিভাজিত ডিস্কসমূহৰ পৰা\n"
-"BIOS বুট বিভাজনৰ প্ৰয়োজন।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PRep বুট বিভাজনক কিছুমান PPC প্লেটফৰ্মত বুটল'ডাৰ সংৰূপৰ এটা অংশ\n"
-"হিচাপে প্ৰয়োজন হয়।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi এটা %s ধৰণৰ ডিভাইচত থাকিব লাগিব"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s এটা ধৰণ %s ৰ ডিভাইচত থাকিব লাগিব"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s ইনক্ৰিপ্ট কৰিব নোৱাৰি"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "আপুনি ৰুট ডিভাইচত এটা নতুন ফাইল চিস্টেম সৃষ্টি কৰিব লাগিব।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "ধৰণ %s ডিভাইচসমূহৰ এটা বৈধ RAID স্তৰ নিৰ্বাচনৰ প্ৰয়োজন।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "ডিভাইচ পুনৰ আকাৰ অনুৰোধ ব্যৰ্থ হল। বিৱৰণ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "ডিভাইচ পুনৰ ফৰমেট অনুৰোধ ব্যৰ্থ হল। বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "ধাৰ্য্যত নাম %s ইতিমধ্যে ব্যৱহৃত।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "এই ফাইল চিস্টেমে লেবেলসমূহ সমৰ্থন নকৰে।"
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "কোনো ডিস্ক নিৰ্বাচন কৰা হোৱা নাই"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "এই ফাইল চিস্টেম পুনৰ আকাৰ নকৰা হব পাৰে।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰোতে ত্ৰুটি।   বিৱৰণৰ বাবে ক্লিক কৰক।"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰোতে ত্ৰুটি।   বিৱৰণৰ বাবে ক্লিক কৰক।"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "স্থায়ী বৈয়াম %s লে নতুন %s যোগ কৰা হল।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "নতুন ডিভাইচ যোগ কৰিবলে ব্যৰ্থ। বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "অবৈধ বিভাজন আকাৰ সংহতি। এটা বৈধ পূৰ্ণসংখ্যা ব্যৱহাৰ কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "ডিভাইচ অপসাৰণ অনুৰোধ ব্যৰ্থ হল। বিৱৰণ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "ভলিউম দল নাম %s ইতিমধ্যে ব্যৱহৃত। পৰিবৰ্তনসমূহ সংৰক্ষণ কৰা হোৱা নাই।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs মুক্ত"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1658,7 +2529,7 @@ msgstr ""
 "এই চফ্টৱেৰ RAID এৰেত %d সদস্য বিভাজনসমূহৰ %d নাই। আপুনি ইয়াক আতৰাব পাৰিব অথবা "
 "এটা ভিন্ন ডিভাইচ বাছিব পাৰিব।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1667,284 +2538,144 @@ msgstr ""
 "এই LVM আয়তন দলত %d ভৌতিক আয়তনসমূহৰ %d নাই। আপুনি ইয়াক আতৰাব পাৰিব অথবা এটা "
 "ভিন্ন ডিভাইচ বাছিব পাৰিব।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "কোনো ডিস্ক নিৰ্বাচন কৰা হোৱা নাই।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "নিৰ্বাচিত ডিস্কসমূহত পৰ্যাপ্ত খালি ঠাই নাই।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "স্বচালিত বিভাজন প্ৰক্ৰিয়া ব্যৰ্থ হল। বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "চফ্টৱেৰ নিৰ্বাচন পৰিবৰ্তন কৰক (_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "ইনক্ৰিপ্টেড খণ্ড ডিভাইচ আনলক কৰিবলে ব্যৰ্থ। বিৱৰণসমূহৰ বাবে ক্লিক কৰক"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"আপুনি আপোনাৰ নতুন %(productName)s ইনস্টলেষণৰ বাবে ফাইলচিস্টেমসমূহ হস্তচালিতভাৱে "
-"সংস্থাপন কৰিবলে নিৰ্বাচন কৰিছে। আপুনি আৰম্ভ কৰাৰ আগত, কাৰ্য্যপ্ৰণালী শিকিবলে অলপ "
-"সময় ব্যয় কৰিলে ভাল হয়। ভালেমান পৰিবৰ্তন হৈছে।\n"
-"\n"
-"আটাইতকৈ গুৰুত্বপূৰ্ণ পৰিবৰ্তন হল নতুন ফাইলচিস্টেমসমূহৰ সৃষ্টি সীমিত কৰা হৈছে। আপোনাক "
-"জটিল ডিভাইচসমূহ যেনে LVM যৌক্তিক আয়তনসমূহক স্তৰত নিৰ্মাণ কৰিব নালাগে (ভৌতিক আয়তন, "
-"তাৰ পিছত আয়তন দল, তাৰ পিছত যৌক্তিক আয়তন) -- এতিয়া আপুনি কেৱল যৌক্তিক আয়তন সৃষ্টি "
-"কৰক আৰু আমি ইয়াক অন্তৰ্ভুক্ত কৰিবলে ভৌতিক আয়তনসমূহ আৰু আয়তন দলৰ সংস্থাপন কৰিম। আমি "
-"লগতে আয়তন দল সজোৱাৰ প্ৰক্ৰিয়াও নিয়ন্ত্ৰণ কৰিম যেতিয়া আপুনি যৌক্তিক আয়তনসমূহ যোগ "
-"কৰে, আতৰায়, আৰু পুনৰ আকাৰ দিয়ে যাতে আপুনি পাৰ্থিৱ বিৱৰণসমূহৰ বিষয়ে ভািবব লগিয়া "
-"নহয়।\n"
-"\n"
-"\n"
-"পৰ্দাৰ বিন্যাস\n"
-"\n"
-"পৰ্দাৰ বাঁওফালে আমি এই কমপিউটাৰত বিচাৰি পোৱা OS ইনস্টলেষণসমূহ দেখুৱায়। নতুন "
-"%(productName)s ইনস্টলেষণ তালিকাৰ ওপৰত আছে। ইনস্টলেষণসমূহে কি ফাইলচিস্টেম "
-"অন্তৰ্ভুক্ত কৰে চাবলে আপুনি সিহতৰ নামৰ ওপৰত ক্লিক কৰিব পাৰে।\n"
-"\n"
-"বাঁও-হাতৰ বিভিন্ন ইনস্টলেষণ আৰু মাউন্টবিন্দুসমূহৰ তলত বুটামবোৰ আছে যাৰ সহায়ত এটা নতুন "
-"ফাইলচিস্টেম যোগ কৰিব পাৰি, নিৰ্বাচিত ফাইলচিস্টেম আতৰাব পাৰি, অথবা নিৰ্বাচিত "
-"ফাইলচিস্টেম সংৰূপণ কৰিব পাৰি।\n"
-"\n"
-"পৰ্দাৰ সোঁ-হাতত আপুনি বৰ্তামনে নিৰ্বাচন কৰা মাউন্টবিন্দু স্বনিৰ্বাচন কৰিব পাৰে।\n"
-"\n"
-"তলৰ-বাঁওফালে আপুনি ইনস্টলেষণৰ বাবে ব্যৱহাৰ কৰিবলে নিৰ্বাচন কৰা ডিস্কসমূহৰ সাৰাংশ "
-"দেখা পাব। আপোনাৰ নিৰ্বাচিত ডিস্কসমূহৰ বিষয়ে বিৱৰিত তথ্যৰ বাবে আপুনি নীলা লিখনীত "
-"ক্লিক কৰিব পাৰে।\n"
-"\n"
-"এটা নতুন ডিভাইচত এটা নতুন ফাইলচিস্টেম কেনেকৈ সৃষ্টি কৰিব\n"
-"\n"
-"১. + বুটামত ক্লিক কৰক।\n"
-"২. মাউন্টবিন্দু আৰু আকাৰ সুমুৱাওক। (সহায়: সহায়ৰ বাবে যিকোনো লিখনী প্ৰৱিষ্টি স্থানত "
-"ওপৰত মাউছ পইন্টাৰ ঘুৰাওক।)\n"
-"৩. পৰ্দাৰ বাঁও-হাতত \"নতুন %(productName)s ইনস্টলেষণ\" ৰ অন্তৰ্গত নতুন মাউন্টবিন্দু "
-"বাছক আৰু আপোনাৰ প্ৰয়োজনীয়তা পূৰ্ণ কৰিবলে ইয়াক স্বনিৰ্বাচন কৰক।\n"
-"\n"
-"\n"
-"আপোনাৰ ডিস্কত ইতিমধ্যে অস্তিত্ববান এটা ডিভাইচ/ফাইলচিস্টেমক কিধৰণে পুনৰফৰমেট কৰিব\n"
-"\n"
-"১. পৰ্দাৰ বাঁও-ফালৰ পৰা ফাইলচিস্টেম নিৰ্বাচন কৰক।\n"
-"২. পৰ্দাৰ সোঁ-ফালৰ পৰা মাউন্টবিন্দু স্বনিৰ্বাচন স্থানত \"স্বনিৰ্বাচন কৰক\" প্ৰসাৰকত "
-"ক্লিক কৰক।\n"
-"৩. \"পুনৰফৰমেট কৰক\" চেকবুটাম সক্ৰিয় কৰক, এটা ফাইলচিস্টেম ধৰণ বাছক আৰু, যদি "
-"প্ৰযোজ্য, ওপৰৰ \"মাউন্টবিন্দু\" লিখনী প্ৰৱিষ্টি স্থানত এটা মাউন্টবিন্দু সুমুৱাওক।\n"
-"৪. \"পৰিবৰ্তনসমূহ প্ৰয়োগ কৰক\" ত ক্লিক কৰক\n"
-"\n"
-"\n"
-"আপোনাৰ ডিস্কত ইতিমধ্যে অস্তিত্ববান এটা ফাইলচিস্টেমৰ বাবে এটা মাউন্টবিন্দু কিধৰণে "
-"সংস্থাপন কৰিব\n"
-"\n"
-"১. পৰ্দাৰ বাঁওফালৰ পৰা ফাইলচিস্টেম বাছক।\n"
-"২. মাউন্টবিন্দু স্বনিৰ্বাচন স্থানত \"মাউন্টবিন্দু\" লিখনী প্ৰৱিষ্টি স্থানত এটা মাউন্টবিন্দু "
-"সুমুৱাওক।\n"
-"৩. \"পৰিবৰ্তনসমূহ প্ৰয়োগ কৰক\" ত ক্লিক কৰক\n"
-"\n"
-"\n"
-"আপোনাৰ ডিস্কত ইতিমধ্যে অস্তিত্ববান এটা ফাইলচিস্টেমক কিধৰণে আতৰাব\n"
-"\n"
-"১. পৰ্দাৰ বাঁওফালে আপুনি আতৰাব বিচৰা ফাইলচিস্টেম বাছক।\n"
-"২. - বুটাম ক্লিক কৰক।\n"
-"\n"
-"সহায়: \"নতুন %(productName)s ইনস্টলেষণ\" ৰ পৰা এটা ডিভাইচ যি ইতিমধ্যে আপোনাৰ "
-"ডিস্কত অস্তিত্ববান তাক আতৰালে ডিস্কৰ পৰা ই আতৰি নাযায়। ই কেৱল সেই ডিভাইচক তাৰ "
-"প্ৰকৃত অৱস্থালে পুনৰসলহতি কৰে। আপোনাৰ ডিস্কক ইতিমধ্যে অস্তিত্ববান এটা ডিভাইচক "
-"আতৰাবলে, আপুনি ইয়াক অন্য চিনাক্ত ইনস্টলেষণ (অথবা \"অজ্ঞাত\") ৰ যিকোনো এটাৰ অন্তৰ্গত "
-"বাছিব লাগিব আৰু - বুটাম টিপিব লাগিব।\n"
-"\n"
-"\n"
-"বুদ্ধি আৰু সহায়\n"
-"\n"
-"আপুনি নতুন ফাইলচিস্টেমসমূহৰ বাবে সৰ্বমুঠ উপলব্ধ খালি ঠাইতকে ডাঙৰ আকাৰ সুমুৱাব পাৰে। "
-"ইনস্টলাৰে আপুনি অনুৰোধ কৰা আকাৰৰ যিমান সম্ভব ওচৰৰ বনাব চেষ্টা কৰিব।\n"
-"\n"
-"অবিকল্পিতভাৱে, নতুন ডিভাইচসমূহে আপোনাৰ নিৰ্বাচিত ডিস্কসমূহৰ যিকোনো/সকলো ব্যৱহাৰ "
-"কৰে।\n"
-"\n"
-"আপুনি এটা নতুন ডিভাইচক কোনোবোৰ ডিস্ক আবন্টন কৰা হব সংৰূপণ বুটাম (সঁজুলি গ্ৰাফিক থকা) "
-"ক্লিক কৰি পৰিবৰ্তন কৰিব পাৰিব যেতিয়া সেই ডিভাইচ নিৰ্বাচিত থাকে।\n"
-"\n"
-"+ বুটাম ক্লিক কৰি এটা নতুন মাউন্টবিন্দু যোগ কৰোতে, আকাৰ প্ৰৱিষ্টি খালি এৰিব যাতে নতুন "
-"ডিভাইচে সকলো উপলব্ধ খালি ঠাই ব্যৱহাৰ কৰিব পাৰে।\n"
-"\n"
-"যেতিয়া আপুনি এটা বৈয়াম ডিভাইচৰ পৰা সৰ্বশেষ ডিভাইচ আতৰায় যেনে এটা LVM আয়তন দল, "
-"আমি নতুন ডিভাইচসমূহৰ বাবে স্থান উপলব্ধ কৰিবলে স্বচালিতভাৱে সেই বৈয়াম ডিভাইচ আতৰাই "
-"দিম।\n"
-"\n"
-"এটা ডিস্কৰ পৰা যেতিয়া সৰ্বশেষ বিভাজন আতৰোৱা হয়, সেই ডিস্কক এটা নতুন বিভাজন টেবুলৰ "
-"সৈতে পুনাৰম্ভ কৰা হয় যদি আমি ভাবো সেই ডিস্কৰ বাবে অধিক সঠিক ধৰণ উপলব্ধ আছে।\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "তাৰিখ আৰু সময়"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "অবৈধ সময়অঞ্চল"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 "যদি আপুনি NTP ব্যৱহাৰ কৰিব বিচাৰে আপুনি প্ৰথমতে নেটৱাৰ্কিং সংস্থাপন কৰিব লাগিব"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "আপোনাৰ কোনো কাৰ্য্যকৰী NTP চাৰ্ভাৰ সংৰূপিত নাই"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "ইনস্টলেষণৰ গন্তব্য"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d সংৰক্ষণ ডিভাইচ চিনাক্ত কৰা হৈছে"
+msgstr[1] "%d সংৰক্ষণ ডিভাইচসমূহ চিনাক্ত কৰা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "বিন্যাসমূহ সলনি কৰিবলে %s।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "কি'বৰ্ড"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "পৰিক্ষণ বিন্যাস সংৰূপ উপলব্ধ নাই।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "অৱস্থা পৰিক্ষা কৰা হৈছে..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "বিন্যাস সলনি কৰাটো সংৰূপণ কৰা হোৱা নাই।"
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "ভাষা"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "অৱস্থা অজ্ঞাত (সন্ধানহিন)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "অৱস্থা অজ্ঞাত"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "অব্যৱস্থাপিত"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "উপলব্ধ নাই"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "ফাৰ্মৱেৰ সন্ধানহিন"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "কেবুল আনপ্লাগ্গড"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "উপলব্ধ নাই"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "বিচ্ছিন্নিত"
@@ -1969,153 +2700,169 @@ msgstr "বিচ্ছিন্ন কৰা হৈছে"
 msgid "Connection failed"
 msgstr "সংযোগ ব্যৰ্থ"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "আনপ্লাগ্গড"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "ইথাৰনেট"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "বেতাঁৰ"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "আনপ্লাগ্গড"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ঠিকনা"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ঠিকনা"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP ঠিকনা"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "এন্টাৰপ্ৰাইজ"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "কোনো নহয়"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "প্ৰমাণীকৰণ প্ৰয়োজন"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "পাছৱাৰ্ড: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "নেটৱাৰ্ক সংৰূপ"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ৰুট পাছৱাৰ্ড"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "পাছৱাৰ্ড সংহতি কৰা আছে।"
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "ৰুট পাছৱাৰ্ড সংহতি কৰা আছে।"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "ৰুট একাওন্ট অসামৰ্থবান"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "ৰুট পাছৱাৰ্ড সংহতি কৰা হোৱা নাই"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "চফ্টৱেৰ নিৰ্বাচন"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "চফ্টৱেৰ নিৰ্ভৰতাসমূহ নীৰিক্ষণ কৰা হৈছে..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "চফ্টৱেৰ নিৰ্ভৰতাসমূহ নীৰিক্ষণ কৰোতে ত্ৰুটি"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "পেকেইজ মেটাডাটা ডাউনল'ড কৰা হৈছে..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "দল মেটাডাটা ডাউনল'ড কৰা হৈছে..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "চফ্টৱেৰ নিৰ্ভৰতাসমূহ নীৰিক্ষণ কৰা হৈছে..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "চফ্টৱেৰ নিৰ্ভৰতাসমূহ নীৰিক্ষণ কৰোতে ত্ৰুটি"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "চফ্টৱেৰ নিৰ্ভৰতাসমূহ নীৰিক্ষণ কৰোতে ত্ৰুটি।   বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "ইনস্টলেষণৰ বাবে চিহ্নিত নিম্নলিখিত চফ্টৱেৰৰ ত্ৰুটি আছে।   ই সম্ভবত আপোনাৰ ইনস্টল "
 "উৎসৰ সৈতে এটা ত্ৰুটিৰ বাবে হৈছে।\n"
@@ -2123,143 +2870,156 @@ msgstr ""
 "ইনস্টলেষণ উৎস পৰিবৰ্তন কৰক,\n"
 "অথবা ইনস্টলাৰ প্ৰস্থান কৰক।"
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "বাতিল কৰক (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "চফ্টৱেৰ উৎস পৰিবৰ্তন কৰক (_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "চফ্টৱেৰ নিৰ্বাচন পৰিবৰ্তন কৰক (_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "ইনস্টলেষণ উৎস সংস্থাপন কৰা হৈছে..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "পেকেইজ মেটাডাটা ডাউনল'ড কৰোতে ত্ৰুটি..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "প্ৰমাণীকৰণ প্ৰয়োজন"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "এই মাধ্যমৰ পৰা ইনস্টল কৰিবলে ভাল।"
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "এই মাধ্যমৰ পৰা ইনস্টল কৰাটো ভাল নহয়।"
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ইনস্টলেষণৰ উৎস"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "ইনস্টল উৎস সংস্থাপন কৰিবলে ব্যৰ্থ, ভঁৰাল url নীৰিক্ষণ কৰক"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "ভঁৰাল প্ৰতিষ্ঠা কৰোঁতে ভুল"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "চফ্টৱেৰ উৎস সংস্থাপন কৰোতে ত্ৰুটি"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "ইনস্টল উৎস সংস্থাপন কৰিবলে ব্যৰ্থ, ভঁৰাল url আৰু প্ৰক্সি সংহতিসমূহ নীৰিক্ষণ কৰক"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "ভঁৰাল প্ৰতিষ্ঠা কৰোঁতে ভুল"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "চফ্টৱেৰ উৎস সংস্থাপন কৰোতে ত্ৰুটি"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "ডিভাইচ:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS চাৰ্ভাৰ %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "অবৈধ সময়অঞ্চল"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "অবৈধ সময়অঞ্চল"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "অবৈধ সময়অঞ্চল"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "অনুগ্ৰহ কৰি অপেক্ষা কৰক... চফ্টৱেৰ মেটাডাট এতিয়াও ল'ড হৈ আছে।"
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "আপুনি নিৰ্বাচন কৰা ডিস্কসমূহৰ নিম্নলিখিত পৰিমাণ খালি ঠাই উপলব্ধ আছে:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "অনুগ্ৰহ কৰি অপেক্ষা কৰক... চফ্টৱেৰ মেটাডাট এতিয়াও ল'ড হৈ আছে।"
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2269,7 +3029,7 @@ msgstr ""
 "<b>আপোনাৰ ওচৰত %s ইনস্টল কৰিবলে পৰ্যাপ্ত স্থান নাই</b>, কিন্তু আমি স্থায়ী বিভাজনসমূহ "
 "সংকেচন কৰি অথবা আতৰাই আপোনাক স্থান উদ্ধাৰ কৰাত সহায় কৰিব পাৰো।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2280,7 +3040,7 @@ msgstr ""
 "ডিস্কসমূহত উপলব্ধ সকলো খালি ঠাই\n"
 "ব্যৱহাৰ কৰে।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2294,49 +3054,60 @@ msgstr ""
 "ৰ এটা সৰু সংস্কৰণ ইনস্টল কৰিবলে\n"
 "আপোনাৰ চফ্টৱেৰ নিৰ্বাচন পৰিবৰ্তন কৰিব পাৰে, অথবা ইনস্টলাৰ প্ৰস্থান কৰিব পাৰে।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "ইনস্টলেষণৰ গন্তব্য"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "সংগ্ৰহৰ সংৰূপ সংৰক্ষণ কৰা হৈছে..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "সংৰক্ষণ সংৰূপ সংৰক্ষণ কৰিবলে ব্যৰ্থ..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ডিভাইচ ফৰমেট কৰা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰোতে ত্ৰুটি।   বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "সংৰক্ষণ সংৰূপ নীৰিক্ষণ কৰোতে ত্ৰুটি।   বিৱৰণৰ বাবে ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs মুক্ত"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d ডিস্ক নিৰ্বাচিত; %s ক্ষমতা; %s মুক্ত"
 msgstr[1] "%d ডিস্কসমূহ নিৰ্বাচিত; %s ক্ষমতা; %s মুক্ত"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 "আপুনি বুটল'ডাৰ ইনস্টলেষণ বাদ দিবলে নিৰ্বাচন কৰিছে।   আপোনাৰ চিস্টেম বুট নহবও পাৰে।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2346,11 +3117,19 @@ msgstr ""
 "সংৰক্ষণ বিন্যাস পৰিবৰ্তন কৰিব পাৰে\n"
 "অথবা ইনস্টলাৰ প্ৰস্থান কৰিব পাৰে।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "সংৰক্ষণ বিন্যাস পৰিবৰ্তন কৰক (_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2361,76 +3140,80 @@ msgstr ""
 "সংৰক্ষণ বিন্যাস পৰিবৰ্তন কৰিব পাৰে\n"
 "অথবা ইনস্টলাৰ প্ৰস্থান কৰিব পাৰে।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ঠিক অাছে"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "ব্যৱহাৰকাৰী সংহতিসমূহ"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "অবৈধ সময়অঞ্চল"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s লে স্বাগতম।"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "তথ্য"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "আপুনি আপোনাৰ %s %s ইনস্টলেষণৰ বাবে এতিয়াও কোনো মাউন্ট বিন্দু সৃষ্টি কৰা নাই:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "সিহতক স্বচালিতভাৱে সৃষ্টি কৰিবলে ইয়াত ক্লিক কৰক।"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "অথবা, তলত '+' আইকনৰ সৈতে নতুন মাউন্ট বিন্দু সৃষ্টি কৰক।"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2442,55 +3225,162 @@ msgstr[0] "<b>%d ডিস্ক; %s ক্ষমতা; %s ৰিক্ত স
 msgstr[1] ""
 "<b>%d ডিস্কসমূহ; %s ক্ষমতা; %s ৰিক্ত স্থান</b> (অবিভাজিত আৰু ফাইলচিস্টেমসমূহত)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "বুটল'ডাৰ ইনস্টল নকৰিব (_D)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "বুট ডিভাইচ হিচাপে সংহতি কৰক (_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"আপুনি নিৰ্বাচন কৰা RAID স্তৰৰ বাবে আপুনি বৰ্তমানে নিৰ্বাচন কৰা ডিস্কসমূহতকে অধিক "
+"ডিস্কৰ প্ৰয়োজন।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"অনুগ্ৰহ কৰি আপোনাৰ ভলিউম দলৰ বাবে এটা নাম সৃষ্টি কৰক আৰু তলত অন্তত এটা ডিস্ক বাছক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "ভলিউম দল:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "স্তম্ভ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s মাউন্ট-বিন্দু linux ফাইলচিস্টেমৰ ওপৰত স্থাপিত হোৱা আৱশ্যক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "সেই মাউন্ট বিন্দু ইতিমধ্যে ব্যৱহৃত। অন্য কিবা চেষ্টা কৰিব?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "অনুগ্ৰহ কৰি এটা বৈধ মাউন্টবিন্দু সুমুৱাওক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "সেই মাউন্ট বিন্দু অবৈধ। অন্য কিবা চেষ্টা কৰিব?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s ৰুটতো অন্য সকলো ফাইলচিস্টেম মচি পেলাওক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "আপুনি %s ত উপলব্ধ সকলো তথ্য মচি পেলাবলে নিশ্চিত নে?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "আপুনি %s ত উপলব্ধ সকলো তথ্য মচি পেলাবলে নিশ্চিত নে?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "অবৈধ সময়অঞ্চল"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "আপুনি এটা দূৰ্বল পাচফ্ৰেইছ প্ৰদান কৰিছে: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "পাচফ্ৰেইছসমূহ মিল নাখায়।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "সংৰক্ষণ কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "সংকোচিত কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "মচি পেলাওক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "এই ডিভাইচে ইনস্টলেষণ উৎস অন্তৰ্ভুক্ত কৰে।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s ত %(type)s সৃষ্টি কৰা হৈছে"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "প্ৰস্তুত নহয়"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "ৰিক্ত স্থান ব্যৱহাৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2502,14 +3392,14 @@ msgstr ""
 "এই ইনস্টলেষণৰ বাবে স্থান মুক্ত কৰিবলে আপুনি নিবচৰা স্থায়ী ফাইলচিস্টেম আতৰাব "
 "পাৰিব।   এটা ফাইলচিস্টেম আতৰালে ই অন্তৰ্ভুক্ত কৰা সকলো তথ্য স্থায়ীভাৱে মচি যাব।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2517,353 +3407,762 @@ msgid_plural ""
 msgstr[0] "<b>%s ডিস্ক; %s পুনৰুদ্ধাৰ কৰিব পৰা স্থান</b> (ফাইলচিস্টেমসমূহত)"
 msgstr[1] "<b>%s ডিস্কসমূহ; %s পুনৰুদ্ধাৰ কৰিব পৰা স্থান</b> (ফাইলচিস্টেমসমূহত)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "পুনৰুদ্ধাৰ কৰিবলে নিৰ্বাচন কৰা সৰ্বমুঠ স্থান: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "মচি পেলাওক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "সংৰক্ষণ কৰক"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "বিতৰন ইনস্টলেষণ"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "স্পৌক নাম"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "পূৰ্ব-উন্মোচন/পৰিক্ষণ"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "নতুন ডিভাইচ"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "নতুন নিৰ্বাচক"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "কৰা হল (_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "আগবাঢ়ক (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "পৰিবৰ্তনসমূহ প্ৰয়োগ কৰক (_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "নেটৱাৰ্ক সংৰূপ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "দলৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ঠিক অাছে"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "তাৰিখ আৰু সময়"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "ব্যৱহাৰ NTP চাৰ্ভাৰসমূহৰ বাবে যোগ কৰক আৰু চিহ্নিত কৰক"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ৱেব চাৰ্ভাৰ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "কৰ্মৰত"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "ব্যৱহাৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "সংৰূপণ কৰক (_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "তাৰিখ আৰু সময়"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "অঞ্চল:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "অঞ্চল:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "শহৰ:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "শহৰ:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "নেটৱাৰ্কৰ নাম (_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "নেটৱাৰ্কৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "২৪-ঘন্টা"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "ইনস্টলেষণৰ গন্তব্য"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ক্ষমতা"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "সংযুক্ত নহয়"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "নিৰ্বাচিত ডিভাইচ"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "একো নিৰ্বাচন কৰা হোৱা নাই"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>লেবেল:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "ফাৰ্মৱেৰ সন্ধানহিন"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "নহয় (_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN ধৰণ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "নিৰ্বাচিত ডিভাইচ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "সাৰাংশ"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ডিভাইচ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "যোগ কৰক(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "অবিকল্পিত পথ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "চাবনেট মাস্ক"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "গতি"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "হাৰ্ডৱেৰ ঠিকনা"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "সংৰূপণ কৰক (_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "সুৰক্ষা"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "নেটৱাৰ্কৰ নাম (_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "নেটৱাৰ্কৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "সুৰক্ষা কি'"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "হটস্পট হিচাপে ব্যৱহাৰ কৰক (_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "হটস্পট বন্ধ কৰক (_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "সংৰূপণ কৰক (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "প্ৰদানকাৰী"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "সংৰূপণ কৰক (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN ধৰণ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "গেইটৱে"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "দলৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "দল পাছৱাৰ্ড"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "সংৰূপণ কৰক (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "পদ্ধতি (_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "সংৰূপ URL (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP প্ৰক্সি (_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTP প্ৰক্সি (_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP প্ৰক্সি (_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "চক্স হস্ট (_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "নেটৱাৰ্ক সংৰূপ লিখা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "আনলক কৰক"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "বিমান অৱস্থা (_p)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "নেটৱাৰ্ক সংৰূপ লিখা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "হস্টনাম:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "নেটৱাৰ্ক সংৰূপ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2873,282 +4172,204 @@ msgstr ""
 "কৰাবলে\n"
 "আপোনাৰ নেটৱাৰ্ক অভিগমৰ প্ৰয়োজন হব।"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "অবিকল্পিত পথ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "চাবনেট মাস্ক"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "গতি"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "হাৰ্ডৱেৰ ঠিকনা"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "সংৰূপণ কৰক (_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "সুৰক্ষা"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "নেটৱাৰ্কৰ নাম (_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "নেটৱাৰ্কৰ নাম"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "সুৰক্ষা কি'"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "হটস্পট হিচাপে ব্যৱহাৰ কৰক (_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "হটস্পট বন্ধ কৰক (_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "সংৰূপণ কৰক (_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "প্ৰদানকাৰী"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN ধৰণ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "গেইটৱে"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "দলৰ নাম"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "দল পাছৱাৰ্ড"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ব্যৱহাৰকাৰীৰ নাম"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "পদ্ধতি (_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "সংৰূপ URL (_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP প্ৰক্সি (_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTP প্ৰক্সি (_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP প্ৰক্সি (_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "চক্স হস্ট (_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "আনলক কৰক"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "বিমান অৱস্থা (_p)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "হস্টনাম:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "প্ৰমাণীকৰণ ব্যৱহাৰ কৰক (_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "প্ৰমাণীকৰণ প্ৰয়োজন"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "সংযুক্ত"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "চফ্টৱেৰ নিৰ্বাচন"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "আপোনাৰ পৰিৱেশ বাছক"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "স্তম্ভ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "বাতিল কৰক আৰু অধিক ডিস্ক যোগ কৰক (_a)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ইনস্টলেষণৰ বিকল্পসমূহ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>বিভাজনৰ ধৰণ:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "মোৰ তথ্য ইনক্ৰিপ্ট কৰক। মই এটা পাচফ্ৰেইছ পিছত সংহতি কৰিম।"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "স্বনিৰ্বাচিত বিভাজন নিৰ্বাচন কৰা হৈছে"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "স্থান পুনৰুদ্ধাৰ কৰক (_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ইনস্টলেষণৰ বিকল্পসমূহ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "বৰ্তমান চফ্টৱেৰ নিৰ্বাচনৰ বাবে কিমান স্থানৰ প্ৰয়োজন তাৰ বিৱৰণ আমি ইয়াত দিম।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "ডিস্ক মুক্ত"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "ব্যৱহাৰৰ বাবে উপলব্ধ খালি ঠাই।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs মুক্ত"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "খালি ঠাই উপলব্ধ নাই কিন্তু স্থায়ী বিভাজনসমূহৰ পৰা প্ৰাপ্ত কৰিব পাৰি।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "ইয়াত আমি বিৱৰণ দিম আপোনাৰ বিকল্পসমূহ কি।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "ৰিক্ত স্থান ব্যৱহাৰ কৰক"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "ইনস্টলাৰ প্ৰস্থান কৰক (_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "ডিভাইচৰ বিৱৰণ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "স্থানীয় প্ৰামাণিক ডিস্কসমূহ"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "বিভাজন প্ৰক্ৰিয়া সমাপ্ত কৰক (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "ইনক্ৰিপ্ট কৰক (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "স্বচালিত বিভাজন নিৰ্বাচন কৰা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "বিভাজন প্ৰক্ৰিয়া সমাপ্ত কৰক (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "ইনক্ৰিপ্ট কৰক (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "মোৰ তথ্য ইনক্ৰিপ্ট কৰক। মই এটা পাচফ্ৰেইছ পিছত সংহতি কৰিম।"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "স্ববিভাজন বিকল্পসমূহ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "সাৰাংশ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "সম্পূৰ্ণ ডিস্ক সাৰাংশ আৰু বিকল্পসমূহ..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "এটা কি'বৰ্ড বিন্যাস যোগ কৰক"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "আপুনি তলত নিৰ্বাচন কৰি এটা কিবৰ্ড বিন্যাস যোগ কৰিব পাৰে:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "নাম"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "কিবৰ্ডৰ বিন্যাস"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3156,7 +4377,7 @@ msgstr ""
 "এই চিস্টেমত আপুনি কোনবোৰ কিবৰ্ড বিন্যাস ব্যৱহাৰ কৰিব বিচাৰে?  অবিকল্পিত হিচাপে "
 "বাছিবলেআপুনি যিকোনো বিন্যাসক তালিকাৰ ওপৰত স্থানান্তৰ কৰিব পাৰে।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3164,116 +4385,198 @@ msgstr ""
 "ইয়াত কৰা পৰিবৰ্তনসমূহ কেৱল ইনস্টল চিস্টেমৰ বাবে প্ৰযোজ্য হব। কি'বৰ্ডক ইনস্টলেষণ "
 "প্ৰক্ৰিয়াৰ বাবে  সংৰূপণ কৰিবলে ডেস্কটপৰ সঁজুলি ব্যৱহাৰ কৰক।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "নাম"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "বিন্যাস যোগ কৰক"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "বিন্যাস আতৰাওক"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "নিৰ্বাচিত বিন্যাসক ওপৰত স্থানান্তৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "বিন্যাস যোগ কৰক"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "বিন্যাস আতৰাওক"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "নিৰ্বাচিত বিন্যাসক ওপৰত স্থানান্তৰ কৰক"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "নিৰ্বাচিত বিন্যাসক তলত স্থানান্তৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "বিন্যাস পূৰ্বদৰ্শন কৰক"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "পৰিক্ষণ বিন্যাস সংৰূপ উপলব্ধ নাই।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "বিন্যাসসমূহ সলনি কৰিবলে Alt + Shift"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "বিকল্পসমূহ (_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "যোগ কৰক(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "এটা কি'বৰ্ড বিন্যাস যোগ কৰক"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "আপুনি তলত নিৰ্বাচন কৰি এটা কিবৰ্ড বিন্যাস যোগ কৰিব পাৰে:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "নাম"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "উপলব্ধ অঞ্চলসমূহ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "বিন্যাস যোগ কৰক"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "বিন্যাস সলনি কৰা বিকল্পসমূহ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "কিবৰ্ড বিন্যাসসমূহ সলনি কৰিবলে কোনবোৰ সংযুক্তি আপুনি পছন্দ কৰিব?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "ব্যৱহাৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "বিৱৰণ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS মাউন্ট বিকল্পসমূহ:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "ভাষা"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "একো নিৰ্বাচন কৰা হোৱা নাই"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ৰুট পাছৱাৰ্ড"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "ৰুট পাছৱাৰ্ড:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "সুনিশ্চিত কৰক:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC পাছৱাৰ্ড"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "ৰুট পাছৱাৰ্ড সংহতি কৰক"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3281,237 +4584,285 @@ msgstr ""
 "ৰুট একাওন্ট চিস্টেম প্ৰশাসন কৰাৰ বাবে ব্যৱহাৰ কৰা হয়।  ৰুট ব্যৱহাৰকাৰীৰ বাবে এটা "
 "পাছৱাৰ্ড সুমুৱাওক।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "কৰা হল (_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "মাধ্যমৰ সতা সত্য নিৰূপণ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "মাধ্যম সতা সত্য নিৰূপণ কৰা হৈছে, অনুগ্ৰহ কৰি অপেক্ষা কৰক..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "যোগ কৰক(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP প্ৰক্সি সামৰ্থবান কৰক (_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>প্ৰক্সি URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>উদাহৰণ:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "প্ৰমাণীকৰণ ব্যৱহাৰ কৰক (_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>ব্যৱহাৰকাৰীনাম</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>পাছৱাৰ্ড</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "পাছৱাৰ্ড: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ইনস্টলেষণৰ উৎস"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "কোনটো ইনস্টল উৎস আপুনি ব্যৱহাৰ কৰিব বিচাৰে?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "স্ব-চিনাক্ত কৰা ইনস্টল মাধ্যম (_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "ডিভাইচ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>লেবেল:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "সতা সত্য নিৰূপণ কৰক (_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO ফাইল (_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "ডিভাইচ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "এটা ISO বাছক (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "নেটৱাৰ্কত (_n):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "প্ৰস্কি সংস্থাপন (_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "এই URL এ এটা মিৰৰ তালিকালে প্ৰসংগ কৰে (_m)।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS মাউন্ট বিকল্পসমূহ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "এই ক্ষেত্ৰ বৈকল্পিক।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People ভঁৰালসমূহ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "এটা নতুন মাউন্টবিন্দু যোগ কৰক।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "যোগ কৰক(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "নিৰ্বাচিত মাউন্টবিন্দু(সমূহ) আতৰাওক"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "আতৰাওক (_R)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "কাৰ্য্য ত্ৰুটি"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ৰুট পাছৱাৰ্ড সংহতি কৰক"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "এই URL এ এটা মিৰৰ তালিকালে প্ৰসংগ কৰে (_m)।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "নাম:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>প্ৰক্সি URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ব্যৱহাৰকাৰীৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "পাছৱাৰ্ড: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "সেই মাউন্ট বিন্দু অবৈধ। অন্য কিবা চেষ্টা কৰিব?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "মোক ইয়াৰ পৰা বাহিৰ উলিয়াওক (_G)!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "মোৰ অদৃষ্ট মই গ্ৰহণ কৰিছো (_I)।"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "ই অস্থিৰ, পূৰ্ব-উন্মোচন চফ্টৱেৰ।"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3522,203 +4873,264 @@ msgstr ""
 "ইয়াত বাগ আছে।  চৌপাশে বাগ। বাগ যাৰ সৈতে আপুনি চলিব লাগিব।  এই ভৱিষ্যতৰ OS আপুনি "
 "নিৰ্ভৰ কৰিব পৰা এটা স্থিৰ OS নহয়।  ই কেৱল পৰিক্ষণ নিমিত্ত।"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s লে স্বাগতম।"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ইনস্টলৰ সময়ত আপুনি কোনতো ভাষা ব্যৱহাৰ কৰিব খোজে ?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "আগবাঢ়ক (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ব্যৱহাৰকাৰীৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "দলৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "পাছৱাৰ্ড: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC পাছৱাৰ্ড"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "মাউন্ট বিন্দু যোগ কৰক (_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>প্ৰত্যাশিত ক্ষমতা:</b>"
+msgid "Add a new mount point."
+msgstr "এটা নতুন মাউন্টবিন্দু যোগ কৰক।"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>মাউন্ট বিন্দু:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "যোগ কৰক(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "এটা নতুন মাউন্ট বিন্দু যোগ কৰক"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"তলত মাউন্ট বিন্দু সৃষ্টি কৰাৰ পিছত\n"
-"অতিৰিক্ত স্বনিৰ্বাচন বিকল্পসমূহ উপলব্ধ।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"সেই মাউন্ট বিন্দু ইতিমধ্যে ব্যৱহৃত।\n"
-"অন্য কিবা চেষ্টা কৰিব?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "উদাহৰণ: \"20 GB\", \"500mb\" (কৌটেষণ চিহ্নসমূহ বাদ দি)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "ইয়াক মচি পেলাওক (_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "সংৰক্ষণ কৰক (_S)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "মাউন্ট বিন্দু সংৰূপণ কৰক"
+msgid "Remove the selected mount point(s)."
+msgstr "নিৰ্বাচিত মাউন্টবিন্দু(সমূহ) আতৰাওক"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"অনুগ্ৰহ কৰি আপোনাৰ ভলিউম দলৰ বাবে এটা নাম সৃষ্টি কৰক আৰু তলত অন্তত এটা ডিস্ক বাছক।"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "আতৰাওক (_R)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "মুক্ত"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ডিভাইচ"
+msgid "Reload storage configuration from disk."
+msgstr "সংৰক্ষণ সংৰূপ ব্যৰ্থ হল: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "ইনক্ৰিপ্ট কৰক (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "নিৰ্বাচিত ডিভাইচ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "ডিভাইচৰ বিৱৰণ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>মাউন্ট বিন্দু:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>প্ৰত্যাশিত ক্ষমতা:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>লেবেল:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>ডিভাইচৰ ধৰণ:</b>"
+msgid "Device(s):"
+msgstr "ডিভাইচ:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>ফাইল চিস্টেম:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "ইনক্ৰিপ্ট কৰক (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "পুনৰ ফৰমেট কৰক"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "ভলিউম দল:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "পৰিবৰ্তন কৰক ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "নাম:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>ডিভাইচৰ ধৰণ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "ইনক্ৰিপ্ট কৰক (_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "ফাইলচিস্টেম"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "পুনৰ ফৰমেট কৰক"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "ভলিউম দল:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "পৰিবৰ্তন কৰক ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID ডিভাইচ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3726,17 +5138,19 @@ msgstr ""
 "এই ডিভাইচ ইনক্ৰিপ্টেড আৰু এটা বৈধ পাচফ্ৰেইছ নহোৱাকৈ পঢ়িব নোৱাৰি। আপুনি ইয়াক তলত "
 "আনলক কৰিব পাৰিব।"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "পাচফ্ৰেইছ:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "আনলক কৰক (_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3744,295 +5158,571 @@ msgstr ""
 "এই ডিভাইচক প্ৰত্যক্ষভাৱে সম্পাদন কৰিব নোৱাৰি। আপুনি ইয়াক আতৰাব পাৰিব অথবা এটা অন্য "
 "ডিভাইচ বাছিব পাৰিব।"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "এটা নতুন মাউন্টবিন্দু যোগ কৰক।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "নিৰ্বাচিত মাউন্টবিন্দু(সমূহ) আতৰাওক"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "নিৰ্বাচিত মাউন্টবিন্দু সংৰূপণ কৰক।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "সংৰূপণ কৰক (_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "সংৰক্ষণ সংৰূপ ব্যৰ্থ হল: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "সহায়ৰ বাবে ক্লিক কৰক"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "সহায়"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">উপলব্ধ স্থান</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">সৰ্বমুঠ স্থান</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "বাছক (_S)"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "মাউন্ট বিন্দু সংৰূপণ কৰক"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "এই ডিস্ক থকা এটা বা অধিক ডিস্ক বাছক।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP ঠিকনা"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "এটা iSCSI আৰম্ভকৰ নাম দিব লাগিব"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "প্ৰমাণীকৰণ ব্যৱহাৰ কৰক (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>উদাহৰণ:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ব্যৱহাৰকাৰীৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC পাছৱাৰ্ড"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC পাছৱাৰ্ড"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC পাছৱাৰ্ড"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "নেটৱাৰ্কৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "প্ৰমাণীকৰণ ব্যৱহাৰ কৰক (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC পাছৱাৰ্ড"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC পাছৱাৰ্ড"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "ব্যৱহাৰকাৰীৰ নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC পাছৱাৰ্ড"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "সংযোগ ব্যৰ্থ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "ডিভাইচ:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "নিৰ্বাচিত ডিস্কসমূহ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "বন্ধ কৰক (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "বুট কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "বিৱৰণ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "মুক্ত"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "আতৰাওক (_R)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "ডিস্কৰ সাৰাংশ ইয়াত আহিব"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "ইয়াক মচি পেলাওক (_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "বাছক (_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "মাউন্ট বিন্দু সংৰূপণ কৰক"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "এই ডিস্ক থকা এটা বা অধিক ডিস্ক বাছক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "মাউন্ট বিন্দু যোগ কৰক (_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>প্ৰত্যাশিত ক্ষমতা:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>মাউন্ট বিন্দু:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "এটা নতুন মাউন্ট বিন্দু যোগ কৰক"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"তলত মাউন্ট বিন্দু সৃষ্টি কৰাৰ পিছত\n"
+"অতিৰিক্ত স্বনিৰ্বাচন বিকল্পসমূহ উপলব্ধ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"সেই মাউন্ট বিন্দু ইতিমধ্যে ব্যৱহৃত।\n"
+"অন্য কিবা চেষ্টা কৰিব?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "উদাহৰণ: \"20 GB\", \"500mb\" (কৌটেষণ চিহ্নসমূহ বাদ দি)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "সংৰক্ষণ কৰক (_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "মাউন্ট বিন্দু সংৰূপণ কৰক"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"অনুগ্ৰহ কৰি আপোনাৰ ভলিউম দলৰ বাবে এটা নাম সৃষ্টি কৰক আৰু তলত অন্তত এটা ডিস্ক বাছক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "নাম:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ডিভাইচ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "ইনক্ৰিপ্ট কৰক (_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "অনুগ্ৰহ কৰি এটা বৈধ মাউন্টবিন্দু সুমুৱাওক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ডিভাইচ ফৰমেট কৰা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "ইনস্টলেষণৰ সময়ত এটা অজ্ঞাত ত্ৰুটি দেখা দিলে।   বিৱৰণ তলত দিয়া আছে।"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ডিস্ক ইনক্ৰিপষণ পাচফ্ৰেইছ"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "পাচফ্ৰেইছ সংৰক্ষণ কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ডিস্ক ইনক্ৰিপষণ পাচফ্ৰেইছ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4042,7 +5732,19 @@ msgstr ""
 "কৰিব লাগিব যাক আপুনি আপোনাৰ তথ্য অভিগম কৰিবলে ব্যৱহাৰ কৰিব যেতিয়া আপুনি আপোনাৰ "
 "কমপিউটাৰ আৰম্ভ কৰে।"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "পাচফ্ৰেইছ:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "সুনিশ্চিত কৰক:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4051,117 +5753,172 @@ msgstr ""
 "সতৰ্কবাৰ্তা: আপোনাৰ বৰ্তমান কি'বৰ্ড বিন্যাস হল <b>%s</b>। যদি আপুনি আপোনাৰ কি'বৰ্ড "
 "বিন্যাস পৰিবৰ্তন কৰে, আপুনি ইনস্টলৰ পিছত আপোনাট ডিস্কসমূহ ডিক্ৰিপ্ট কৰিব নোৱাৰিব।"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ডিস্ক স্থান পুনৰুদ্ধাৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ঠিক অাছে"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "বাতিল কৰক (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "স্থান পুনৰুদ্ধাৰ কৰক (_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ডিস্ক স্থান পুনৰুদ্ধাৰ কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "বিৱৰণ ইয়াত যাব"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "ফাইলচিস্টেম"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "পুনৰুদ্ধাৰ কৰিব পৰা ঠাই"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "কাৰ্য্য"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "সংৰক্ষণ কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "মচি পেলাওক"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "সংকোচিত কৰক"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "স্বনিৰ্বাচিত বিভাজন নিৰ্বাচন কৰা হৈছে"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "পৰিবৰ্তনসমূহ প্ৰয়োগ কৰক (_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "ডিভাইচ:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "মাউন্ট বিন্দু যোগ কৰক (_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "ইনস্টলাৰ প্ৰস্থান কৰক (_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "নহয় (_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "হয় (_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4169,51 +5926,50 @@ msgstr ""
 "আপুনি ইনস্টলেষণ প্ৰক্ৰিয়া প্ৰস্থান কৰিবলে\n"
 "নিশ্চিত নে?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ইনস্টলেষণৰ সাৰাংশ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "ইনস্টলেষণ আৰম্ভ কৰক (_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "সংৰূপ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ইনস্টলৰ প্ৰস্তুতি"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s ক আপোনাৰ চিস্টেমত এতিয়া সফলভাৱে ইনস্টল কৰা হৈছে, কিন্তু কিছুমান সংৰূপণ এতিয়াও "
-"কৰিব লগিয়া আছে।  \n"
-"ইয়াক সম্পূৰ্ণ কৰক আৰু তাৰ পিছত অনুগ্ৰহ কৰি সংৰূপ সম্পূৰ্ণ কৰক বুটাম ক্লিক কৰক।"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "সংৰূপ সম্পূৰ্ণ কৰক (_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s এতিয়া আপোনাৰ চিস্টেমত সফলভাৱে ইনস্টল কৰা হল আৰু ব্যৱহাৰ\n"
-"কৰিবলে প্ৰস্তুত!  আগবাঢ়ক আৰু ইয়াক ব্যৱহাৰ কৰিবলে চিস্টেম পুনৰাম্ভ কৰক!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "পুনৰাম্ভ কৰক (_R)"
 
@@ -4229,40 +5985,41 @@ msgstr "ইনস্টল"
 msgid "Install the live CD to your hard disk"
 msgstr "লাইভ CD ক আপোনাৰ হাৰ্ড ডিষ্কত ইনস্টল কৰক"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "হাৰ্ড ড্ৰাইভলে ইনস্টল আৰম্ভ কৰা হৈছে "
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Fedora লৈ স্বাগতম"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr "%s ৰ %s MB ৰ প্ৰয়োজন ইনস্টল হবলে, কিন্তু আপোনাৰ মেচিনত কেৱল %s MB আছে\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s গ্ৰাফিকেল ইনস্টলাৰৰ %s MB মেমৰিৰ প্ৰয়োজন, কিন্তু আপোনাৰ কেৱল %s MB আছে।"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "পৰ্যাপ্ত RAM নাই"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4276,24 +6033,24 @@ msgstr ""
 "\n"
 " এটা ৰুট টাৰ্মিনেলৰ পৰা।"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "লিখনী অৱস্থা আৰম্ভ কৰা হৈছে।"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ভুল"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY চলকৰ মান নিৰ্ধাৰণ কৰা নহয়। টেক্সট অৱস্থাত আৰম্ভ কৰা হৈছে।"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "চিত্ৰাঙ্কিত ইনস্টল ব্যৱস্থা উপস্থিত নাই। টেক্সট অৱস্থা আৰম্ভ কৰা হৈছে।"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4304,20 +6061,20 @@ msgstr ""
 "বিভাজন সংৰূপ অথবা পেকেইজ বাছনিসমূহৰ অনুমতি নিদিয়ে। আপুনি VNC অৱস্থা ব্যৱহাৰ কৰিব "
 "বিচাৰে নেকি?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "ইনস্টল আৰম্ভ কৰিবলে অনুগ্ৰহ কৰি ssh install@%s কৰক।"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "ইনস্টলেষণ চলাই থাকিবলে অনুগ্ৰহ কৰি ssh install@<host>।"
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora ব্যৱহাৰ কৰি চাওক"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4327,7 +6084,7 @@ msgstr ""
 "আপুনি Fedora ক এতিয়া ইনস্টল কৰিব পাৰে, অথবা পিছত যিকোনো সময়ত কাৰ্য্যসমূহ অভাৰভিউত "
 "\"হাৰ্ড ড্ৰাইভলে ইনস্টল কৰক\" নিৰ্বাচন কৰিব পাৰে।"
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4335,10 +6092,284 @@ msgstr ""
 "আপুনি পিছত যিকোনো সময় কাৰ্য্যসমূহ অভাৰভিউত\n"
 "\"হাৰ্ড ড্ৰাইভলে ইনস্টল কৰক\" নিৰ্বাচন কৰিব পাৰে।"
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "বন্ধ কৰক"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "হস্টৰ নাম 'a-z', 'A-Z', বা '0-9' অঞ্চলৰ কোনো বৈধ আখৰৰে আৰম্ভ হ'ব লাগিব।"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "নিম্নমলিখিত ফাইল চিস্টেম সমূহৰ বাবে আপোনাক আৰু স্থানৰ প্ৰয়োজন:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "অাদেশ বাক্যৰ ধৰণত প্ৰশ্ন হ'ব নোৱাৰে !"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "সেই মাউন্ট বিন্দু অবৈধ। অন্য কিবা চেষ্টা কৰিব?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "আপুনি আপোনাৰ নতুন %(productName)s ইনস্টলেষণৰ বাবে ফাইলচিস্টেমসমূহ হস্তচালিতভাৱে "
+#~ "সংস্থাপন কৰিবলে নিৰ্বাচন কৰিছে। আপুনি আৰম্ভ কৰাৰ আগত, কাৰ্য্যপ্ৰণালী শিকিবলে অলপ "
+#~ "সময় ব্যয় কৰিলে ভাল হয়। ভালেমান পৰিবৰ্তন হৈছে।\n"
+#~ "\n"
+#~ "আটাইতকৈ গুৰুত্বপূৰ্ণ পৰিবৰ্তন হল নতুন ফাইলচিস্টেমসমূহৰ সৃষ্টি সীমিত কৰা হৈছে। আপোনাক "
+#~ "জটিল ডিভাইচসমূহ যেনে LVM যৌক্তিক আয়তনসমূহক স্তৰত নিৰ্মাণ কৰিব নালাগে (ভৌতিক "
+#~ "আয়তন, তাৰ পিছত আয়তন দল, তাৰ পিছত যৌক্তিক আয়তন) -- এতিয়া আপুনি কেৱল যৌক্তিক "
+#~ "আয়তন সৃষ্টি কৰক আৰু আমি ইয়াক অন্তৰ্ভুক্ত কৰিবলে ভৌতিক আয়তনসমূহ আৰু আয়তন দলৰ "
+#~ "সংস্থাপন কৰিম। আমি লগতে আয়তন দল সজোৱাৰ প্ৰক্ৰিয়াও নিয়ন্ত্ৰণ কৰিম যেতিয়া আপুনি "
+#~ "যৌক্তিক আয়তনসমূহ যোগ কৰে, আতৰায়, আৰু পুনৰ আকাৰ দিয়ে যাতে আপুনি পাৰ্থিৱ "
+#~ "বিৱৰণসমূহৰ বিষয়ে ভািবব লগিয়া নহয়।\n"
+#~ "\n"
+#~ "\n"
+#~ "পৰ্দাৰ বিন্যাস\n"
+#~ "\n"
+#~ "পৰ্দাৰ বাঁওফালে আমি এই কমপিউটাৰত বিচাৰি পোৱা OS ইনস্টলেষণসমূহ দেখুৱায়। নতুন "
+#~ "%(productName)s ইনস্টলেষণ তালিকাৰ ওপৰত আছে। ইনস্টলেষণসমূহে কি ফাইলচিস্টেম "
+#~ "অন্তৰ্ভুক্ত কৰে চাবলে আপুনি সিহতৰ নামৰ ওপৰত ক্লিক কৰিব পাৰে।\n"
+#~ "\n"
+#~ "বাঁও-হাতৰ বিভিন্ন ইনস্টলেষণ আৰু মাউন্টবিন্দুসমূহৰ তলত বুটামবোৰ আছে যাৰ সহায়ত এটা "
+#~ "নতুন ফাইলচিস্টেম যোগ কৰিব পাৰি, নিৰ্বাচিত ফাইলচিস্টেম আতৰাব পাৰি, অথবা "
+#~ "নিৰ্বাচিত ফাইলচিস্টেম সংৰূপণ কৰিব পাৰি।\n"
+#~ "\n"
+#~ "পৰ্দাৰ সোঁ-হাতত আপুনি বৰ্তামনে নিৰ্বাচন কৰা মাউন্টবিন্দু স্বনিৰ্বাচন কৰিব পাৰে।\n"
+#~ "\n"
+#~ "তলৰ-বাঁওফালে আপুনি ইনস্টলেষণৰ বাবে ব্যৱহাৰ কৰিবলে নিৰ্বাচন কৰা ডিস্কসমূহৰ সাৰাংশ "
+#~ "দেখা পাব। আপোনাৰ নিৰ্বাচিত ডিস্কসমূহৰ বিষয়ে বিৱৰিত তথ্যৰ বাবে আপুনি নীলা "
+#~ "লিখনীত ক্লিক কৰিব পাৰে।\n"
+#~ "\n"
+#~ "এটা নতুন ডিভাইচত এটা নতুন ফাইলচিস্টেম কেনেকৈ সৃষ্টি কৰিব\n"
+#~ "\n"
+#~ "১. + বুটামত ক্লিক কৰক।\n"
+#~ "২. মাউন্টবিন্দু আৰু আকাৰ সুমুৱাওক। (সহায়: সহায়ৰ বাবে যিকোনো লিখনী প্ৰৱিষ্টি স্থানত "
+#~ "ওপৰত মাউছ পইন্টাৰ ঘুৰাওক।)\n"
+#~ "৩. পৰ্দাৰ বাঁও-হাতত \"নতুন %(productName)s ইনস্টলেষণ\" ৰ অন্তৰ্গত নতুন মাউন্টবিন্দু "
+#~ "বাছক আৰু আপোনাৰ প্ৰয়োজনীয়তা পূৰ্ণ কৰিবলে ইয়াক স্বনিৰ্বাচন কৰক।\n"
+#~ "\n"
+#~ "\n"
+#~ "আপোনাৰ ডিস্কত ইতিমধ্যে অস্তিত্ববান এটা ডিভাইচ/ফাইলচিস্টেমক কিধৰণে পুনৰফৰমেট "
+#~ "কৰিব\n"
+#~ "\n"
+#~ "১. পৰ্দাৰ বাঁও-ফালৰ পৰা ফাইলচিস্টেম নিৰ্বাচন কৰক।\n"
+#~ "২. পৰ্দাৰ সোঁ-ফালৰ পৰা মাউন্টবিন্দু স্বনিৰ্বাচন স্থানত \"স্বনিৰ্বাচন কৰক\" প্ৰসাৰকত "
+#~ "ক্লিক কৰক।\n"
+#~ "৩. \"পুনৰফৰমেট কৰক\" চেকবুটাম সক্ৰিয় কৰক, এটা ফাইলচিস্টেম ধৰণ বাছক আৰু, যদি "
+#~ "প্ৰযোজ্য, ওপৰৰ \"মাউন্টবিন্দু\" লিখনী প্ৰৱিষ্টি স্থানত এটা মাউন্টবিন্দু সুমুৱাওক।\n"
+#~ "৪. \"পৰিবৰ্তনসমূহ প্ৰয়োগ কৰক\" ত ক্লিক কৰক\n"
+#~ "\n"
+#~ "\n"
+#~ "আপোনাৰ ডিস্কত ইতিমধ্যে অস্তিত্ববান এটা ফাইলচিস্টেমৰ বাবে এটা মাউন্টবিন্দু কিধৰণে "
+#~ "সংস্থাপন কৰিব\n"
+#~ "\n"
+#~ "১. পৰ্দাৰ বাঁওফালৰ পৰা ফাইলচিস্টেম বাছক।\n"
+#~ "২. মাউন্টবিন্দু স্বনিৰ্বাচন স্থানত \"মাউন্টবিন্দু\" লিখনী প্ৰৱিষ্টি স্থানত এটা "
+#~ "মাউন্টবিন্দু সুমুৱাওক।\n"
+#~ "৩. \"পৰিবৰ্তনসমূহ প্ৰয়োগ কৰক\" ত ক্লিক কৰক\n"
+#~ "\n"
+#~ "\n"
+#~ "আপোনাৰ ডিস্কত ইতিমধ্যে অস্তিত্ববান এটা ফাইলচিস্টেমক কিধৰণে আতৰাব\n"
+#~ "\n"
+#~ "১. পৰ্দাৰ বাঁওফালে আপুনি আতৰাব বিচৰা ফাইলচিস্টেম বাছক।\n"
+#~ "২. - বুটাম ক্লিক কৰক।\n"
+#~ "\n"
+#~ "সহায়: \"নতুন %(productName)s ইনস্টলেষণ\" ৰ পৰা এটা ডিভাইচ যি ইতিমধ্যে আপোনাৰ "
+#~ "ডিস্কত অস্তিত্ববান তাক আতৰালে ডিস্কৰ পৰা ই আতৰি নাযায়। ই কেৱল সেই ডিভাইচক তাৰ "
+#~ "প্ৰকৃত অৱস্থালে পুনৰসলহতি কৰে। আপোনাৰ ডিস্কক ইতিমধ্যে অস্তিত্ববান এটা ডিভাইচক "
+#~ "আতৰাবলে, আপুনি ইয়াক অন্য চিনাক্ত ইনস্টলেষণ (অথবা \"অজ্ঞাত\") ৰ যিকোনো এটাৰ "
+#~ "অন্তৰ্গত বাছিব লাগিব আৰু - বুটাম টিপিব লাগিব।\n"
+#~ "\n"
+#~ "\n"
+#~ "বুদ্ধি আৰু সহায়\n"
+#~ "\n"
+#~ "আপুনি নতুন ফাইলচিস্টেমসমূহৰ বাবে সৰ্বমুঠ উপলব্ধ খালি ঠাইতকে ডাঙৰ আকাৰ সুমুৱাব "
+#~ "পাৰে। ইনস্টলাৰে আপুনি অনুৰোধ কৰা আকাৰৰ যিমান সম্ভব ওচৰৰ বনাব চেষ্টা কৰিব।\n"
+#~ "\n"
+#~ "অবিকল্পিতভাৱে, নতুন ডিভাইচসমূহে আপোনাৰ নিৰ্বাচিত ডিস্কসমূহৰ যিকোনো/সকলো ব্যৱহাৰ "
+#~ "কৰে।\n"
+#~ "\n"
+#~ "আপুনি এটা নতুন ডিভাইচক কোনোবোৰ ডিস্ক আবন্টন কৰা হব সংৰূপণ বুটাম (সঁজুলি গ্ৰাফিক "
+#~ "থকা) ক্লিক কৰি পৰিবৰ্তন কৰিব পাৰিব যেতিয়া সেই ডিভাইচ নিৰ্বাচিত থাকে।\n"
+#~ "\n"
+#~ "+ বুটাম ক্লিক কৰি এটা নতুন মাউন্টবিন্দু যোগ কৰোতে, আকাৰ প্ৰৱিষ্টি খালি এৰিব যাতে "
+#~ "নতুন ডিভাইচে সকলো উপলব্ধ খালি ঠাই ব্যৱহাৰ কৰিব পাৰে।\n"
+#~ "\n"
+#~ "যেতিয়া আপুনি এটা বৈয়াম ডিভাইচৰ পৰা সৰ্বশেষ ডিভাইচ আতৰায় যেনে এটা LVM আয়তন "
+#~ "দল, আমি নতুন ডিভাইচসমূহৰ বাবে স্থান উপলব্ধ কৰিবলে স্বচালিতভাৱে সেই বৈয়াম "
+#~ "ডিভাইচ আতৰাই দিম।\n"
+#~ "\n"
+#~ "এটা ডিস্কৰ পৰা যেতিয়া সৰ্বশেষ বিভাজন আতৰোৱা হয়, সেই ডিস্কক এটা নতুন বিভাজন "
+#~ "টেবুলৰ সৈতে পুনাৰম্ভ কৰা হয় যদি আমি ভাবো সেই ডিস্কৰ বাবে অধিক সঠিক ধৰণ উপলব্ধ "
+#~ "আছে।\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "নেটৱাৰ্ক সংৰূপ"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "পেকেইজ মেটাডাটা ডাউনল'ড কৰোতে ত্ৰুটি..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "একো নিৰ্বাচন কৰা হোৱা নাই"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "ফাৰ্মৱেৰ সন্ধানহিন"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "প্ৰমাণীকৰণ প্ৰয়োজন"
+
+#~ msgid "column"
+#~ msgstr "স্তম্ভ"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>বিভাজনৰ ধৰণ:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>প্ৰক্সি URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>ব্যৱহাৰকাৰীনাম</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>পাছৱাৰ্ড</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "সেই মাউন্ট বিন্দু অবৈধ। অন্য কিবা চেষ্টা কৰিব?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>লেবেল:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>ফাইল চিস্টেম:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ডিভাইচ"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "নিৰ্বাচিত মাউন্টবিন্দু সংৰূপণ কৰক।"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "সহায়ৰ বাবে ক্লিক কৰক"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">উপলব্ধ স্থান</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">সৰ্বমুঠ স্থান</span>"
+
 #~ msgid "Completed"
 #~ msgstr "সম্পূৰ্ণ"
 
@@ -4390,41 +6421,9 @@ msgstr "বন্ধ কৰক"
 #~ msgid "Install on System"
 #~ msgstr "চিস্টেমত ইনস্টল কৰক"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "ইনস্টল ভঁৰাল ইনস্টল কৰোতে নিম্নলিখিত ত্ৰুটি দেখা দিলে:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "ইনস্টল প্ৰক্ৰিয়া আগবাঢ়িব নোৱাৰে।"
-
 #~ msgid "Exit installer"
 #~ msgstr "ইনস্টলাৰৰ পৰা বাহিৰ হওক"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "ইনস্টল প্ৰক্ৰিয়া আপোনাৰ হাৰ্ডৱেৰৰ এটা সমস্যাৰ বাবে বন্ধ কৰা হৈছে। সঠিক ত্ৰুটি "
-#~ "বাৰ্তা হল:\n"
-#~ "\n"
-#~ "%s।\n"
-#~ "\n"
-#~ "ইনস্টলাৰ এতিয়া প্ৰস্থান কৰিব।"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "হাৰ্ডৱেৰ ত্ৰুটি পোৱা গল"
-
 #~ msgid "_Exit installer"
 #~ msgstr "ইনস্টলাৰৰ পৰা বাহিৰ হওক (_E)"
 
@@ -4716,9 +6715,6 @@ msgstr "বন্ধ কৰক"
 #~ msgid "Software Development"
 #~ msgstr "চফ্টৱেৰৰ বিকাশ"
 
-#~ msgid "Web Server"
-#~ msgstr "ৱেব চাৰ্ভাৰ"
-
 #~ msgid "Minimal"
 #~ msgstr "নুন্যতম"
 
@@ -4761,47 +6757,6 @@ msgstr "বন্ধ কৰক"
 #~ "এই ডিভাইচ এটা সম্প্ৰসাৰিত বিভাজন য'ত আঁতৰাব নোৱাৰা যৌক্তিক বিভাজন আছে:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "আপুনি কোনো মূল বিভাজন (/) সংজ্ঞাবদ্ধ কৰা নাই, যাৰ %s ৰ ইনস্টলত আগবাঢ়িব'লৈ "
-#~ "প্ৰয়োজন আছে।"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "আপোনাৰ মূল বিভাজন ২৫০ MBকৈ কম যিটো সাধাৰণতে %s ইনস্টলৰ বাবে বৰ সৰু।"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "এই প্লেটফৰ্মৰ এটা বিভাজন অথবা যৌক্তিক আয়তনত /boot ৰ প্ৰয়োজন। যদি আপুনি এটা /"
-#~ "boot আয়তন নিবিচাৰে, আপুনি এটা নন-LVM বিভাজনত / দিব লাগিব।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "আপোনাৰ  %(mount)s বিভাজন %(size)s মেগাবাইটতকে কে কম যোনটো এটা স্বাভাৱিক "
-#~ "%(productName)s ইনস্টলৰ বাবে উপদেশিতকে কম।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "আপোনাৰ %(mount)s বিভাজন %(format)s ফৰমেটিংৰ বাবে অতি সৰু (অনুমোদিত আকাৰ হল "
-#~ "%(minSize)d MB ৰ পৰা %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "আপোনাৰ %(mount)s বিভাজন %(format)s ফৰমেটিংৰ বাবে অতি ডাঙৰ (অনুমোদিত আকাৰ "
-#~ "হল %(minSize)d MB ৰ পৰা %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4818,55 +6773,6 @@ msgstr "বন্ধ কৰক"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "আপুনি এটা বুটল'ডাৰ স্তৰ১ লক্ষ্য ডিভাইচ সৃষ্টি কৰা নাই"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "এটা boot কৰাৰ যোগ্য বিভাজন নিৰ্মাণ কৰা নহয়।"
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "আপোনাৰ BIOS-ভিত্তিয় চিস্টেমৰ %s ৰ নতুন ডিস্ক লেবেল বিন্যাস (GPT) ৰ সৈতে বুট "
-#~ "হবলে এটা বিশেষ বিভাজনৰ প্ৰয়োজন। আগবাঢ়িবলে, অনুগ্ৰহ কৰি এটা ১MB 'BIOS বুট' ধৰণ "
-#~ "বিভাজন সৃষ্টি কৰক।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "আপুনি এটা শ্বাপ বিভাজন ধাৰ্য্য কৰা নাই। এটা শ্বাপ বিভাজনৰ বাহিৰে ইনস্টল চলাই "
-#~ "নিবলে %(requiredMem)s MB মেমৰিৰ প্ৰয়োজন, কিন্তু আপোনাৰ কেৱল %(installedMem)s "
-#~ "MB আছে।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "আপুনি কোনো শ্বাপ বিভাজন নিৰ্দ্দিষ্ট কৰা নাই। যদিও সকলো ক্ষেত্ৰতে কঠোৰ ভাবে "
-#~ "প্ৰয়োজন নহয়, এইটোৱে সৰহভাগ ইনস্টলৰ যোগ্যতা গুৰুতৰ ভাবে বঢ়াব।"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "আপোনাৰ শ্বাপ ডিভাইচসমূহৰ অন্তত এটাৰ এটা UUID নাই, যি mkswap ৰ পুৰনি সংস্কৰণসমূহ "
-#~ "ব্যৱহাৰ কৰি সৃষ্টি কৰা শ্বাপ স্থানৰ বাবে সাধাৰণ। এই ডিভাইচসমূহক /etc/fstab ত "
-#~ "ডিভাইচ পথৰে প্ৰসংগ কৰা হব, যি সংগত নহয় যিহেতু ডিভাইচ পথসমূহ বিভিন্ন ক্ষেত্ৰত "
-#~ "সলনি হব পাৰে। "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "এই মাউন্ট-বিন্দু বৈধ নহয়। %s ডাইৰেকটৰি / ফাইলচিস্টেমত স্থাপিত হোৱা আৱশ্যক।"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s মাউন্ট-বিন্দু linux ফাইলচিস্টেমৰ ওপৰত স্থাপিত হোৱা আৱশ্যক।"
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s ত Linux"
 
@@ -4876,11 +6782,6 @@ msgstr "বন্ধ কৰক"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(arch)s ৰ বাবে %(product)s Linux %(version)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ডিভাইচ ফৰমেট কৰা হৈছে"
-#~ msgstr[1] "DASD ডিভাইচসমূহ ফৰমেট কৰা হৈছে"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux ৰ সৈতে ব্যৱহাৰৰ বাবে %d DASD ডিভাইচ প্ৰস্তুত কৰা হৈছে..."
@@ -5148,9 +7049,6 @@ msgstr "বন্ধ কৰক"
 #~ msgid "Error setting root password"
 #~ msgstr "ৰূট পাছৱাৰ্ড সংহতি কৰোতে ত্ৰুটি"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "আপুনি এটা পাছৱাৰ্ড প্ৰদান কৰি সুনিশ্চিত কৰিব লাগিব।"
-
 #~ msgid "_Remove Packages"
 #~ msgstr "পেকেইজসমূহ আতৰাওক (_R)"
 
@@ -5185,24 +7083,12 @@ msgstr "বন্ধ কৰক"
 #~ msgid "%s of %s"
 #~ msgstr "%s ৰ %s"
 
-#~ msgid "Region:"
-#~ msgstr "অঞ্চল:"
-
-#~ msgid "City:"
-#~ msgstr "শহৰ:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "২৪-ঘন্টা"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "আপোনাৰ এড-অনসমূহ বাছক"
 
@@ -5288,9 +7174,6 @@ msgstr "বন্ধ কৰক"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "বিভাজন প্ৰক্ৰিয়া সমাপ্ত কৰক (_F)"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "ভলিউম দল সংৰূপণ কৰক"
 
diff --git a/anaconda/po/ast.po b/anaconda/po/ast.po
index d7ac806..f90f587 100644
--- a/anaconda/po/ast.po
+++ b/anaconda/po/ast.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/fedora/language/"
@@ -20,211 +20,444 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Entamar VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Usar mou testu"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Aceutar"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Executando los scripts de pre-instalación"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Aniciando'l procesu d'instalación"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Executando configuración post-instalación"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -236,86 +469,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Executando los scripts de pre-instalación"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "El nome d'equipu tien de ser de 255 o menos carauteres de llargu."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"el nome del host entama con un caráuter válidu nel rangu 'a-z', 'A-Z' o '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -324,7 +848,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s instalación"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -337,8 +866,8 @@ msgstr "Cuando heba finao salga de la shell y el so sistema reiniciaráse."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Nun pudo atopase /bin/sh pa executalu. Nun va aniciase'l shell."
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescatar"
 
@@ -376,28 +905,22 @@ msgstr "Sistema a rescatar"
 msgid "Which device holds the root partition of your installation?"
 msgstr "¿Qué preséu caltién la partición de raigañu de la to instalación?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Aceutar"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Colar"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -410,7 +933,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -419,28 +942,209 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nun hai denguna partición Linux. Va reaniciase'l sistema. \n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mou de Rescate"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "El sistema ta montáu baxo'l direutoriu %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"La partición root tien menos de 250 megabytes, tamañu que davezu nun ye "
+"bastante pa instalar %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Nun definiste una partición root (/), necesaria pa que la instalación de %s "
+"sigui."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"La to partición %(mount)s ye de menos de %(size)s megabytes, que ye menos de "
+"lo que s'encamienta nuna instalación normal de %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "No has creáu una partición d'arranque."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Nun s'especificó denguna partición swap. Magar que nun ye indispensable, "
+"meyorará considerablemente el rendimientu na mayoría de les instalaciones."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Esti puntu de montaxe nun ye válidu.  El direutoriu %s tien de tar nel "
+"sistema de ficheros /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "El puntu de montaxe %s tien de tar nun sistema de ficheros linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -554,84 +1258,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Linux pa Empreses de Red Hat"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Tresnando la trensaición dende la fonte d'instalación."
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Fallu instalando paquete"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Necesites más espaciu nos siguientes sistemes de ficheros:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Tresnando la trensaición dende la fonte d'instalación."
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Fallu instalando paquete"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Post-instalación"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Tresnando la instalación"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Post-instalación"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "¡Nun puede tener una entruga nel mou de llinia de comandos!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fallu"
 
@@ -655,31 +1507,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -694,451 +1548,522 @@ msgstr ""
 "esti computador dende otra máquina y facer una instalación gráfica o siguir "
 "con una instalación en mou testu?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "La contraseña tien de tener al menos 6 carauteres de llargu."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "La contraseña tien de tener al menos 6 carauteres de llargu."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "A la configuración del sistema de ficheros falta-y un tipu"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Aniciu de la instalación"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Executando configuración post-anovamientu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Entamar VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progresu de la instalación"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Tresnando la trensaición dende la fonte d'instalación."
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Fallu instalando paquete"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Desendolcu de software"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Avisu"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1154,580 +2079,405 @@ msgstr "En progresu"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s instalación"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Desendolcu de software"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1754,279 +2504,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Desendolcu de software"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Fallu al Configurar Repositoriu"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Fallu al Configurar Repositoriu"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2034,14 +2808,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2050,128 +2824,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formateando preséu DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Aceutar"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2182,68 +2977,164 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "El puntu de montaxe %s tien de tar nun sistema de ficheros linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2251,951 +3142,1363 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Siguir"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Aceutar"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Sirvidor Web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Nun hai Rede disponible"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Usar mou testu"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacidá"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Preseos RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Amestar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Nun hai Rede disponible"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nome d'usuariu:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "¡Coneutáu!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Partición de Sistema EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "Colar d_l'instalador"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Partición de Sistema EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Cifráu"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Partición de Sistema EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Amestar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Aceutar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirmar"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Amestar"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Aceutar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Preseos RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Amestar"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Fallu operativu."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Fallu operativu."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3203,648 +4506,1028 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "¿Qué llingua quies usar na instalación?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Siguir"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Confirmar"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Llibre"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Preseos RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Amestar"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Cifráu"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Capacidá"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Preseos RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Preseos RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Cifráu"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Preseos RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Confirmar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Aceutar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Has d'apurrir un nome d'aniciador iSCSI."
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nome d'usuariu:"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Aceutar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Preseos RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Llibre"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Capacidá"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nome d'usuariu:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Preseos RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Cifráu"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Aceutar"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formateando preséu DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Aceutar"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Partición de Sistema EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Post-instalación"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Tresnando la instalación"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Executando configuración post-anovamientu"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Re_aniciar"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3858,40 +5541,41 @@ msgstr "Instalar"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalar el CD vivu nel discu duru"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Aniciando Instalación nel Discu Duru"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nun hai RAM bastante"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3900,60 +5584,81 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Aniciar en mou testu"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fallu"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Nun s'afitó la variable DISPLAY. Aniciando en mou testu."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "La instalación gráfica nun ta disponible. Aniciando en mou testu."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "el nome del host entama con un caráuter válidu nel rangu 'a-z', 'A-Z' o "
+#~ "'0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Necesites más espaciu nos siguientes sistemes de ficheros:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "¡Nun puede tener una entruga nel mou de llinia de comandos!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Nome d'usuariu:"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Preseos RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Completáu"
 
@@ -3988,9 +5693,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Colar del instalador"
 
-#~ msgid "_Exit installer"
-#~ msgstr "Colar d_l'instalador"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Falta la direición IP."
 
@@ -4038,9 +5740,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Falta un nome na configuración del repositoriu %r; va usase id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Nun hai Rede disponible"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4048,9 +5747,6 @@ msgstr ""
 #~ "Dellos de los repositorios del to software requieren coneutividá de "
 #~ "redes, pero hebo un problema habilitando la rede nel sistema."
 
-#~ msgid "Re_boot"
-#~ msgstr "Re_aniciar"
-
 #~ msgid "_Eject"
 #~ msgstr "_Espulsar"
 
@@ -4203,9 +5899,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Escritoriu gráficu"
 
-#~ msgid "Web Server"
-#~ msgstr "Sirvidor Web"
-
 #~ msgid "Minimal"
 #~ msgstr "Mínimu"
 
@@ -4244,27 +5937,6 @@ msgstr ""
 #~ "lóxiques que nun pueden desaniciase:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Nun definiste una partición root (/), necesaria pa que la instalación de "
-#~ "%s sigui."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "La partición root tien menos de 250 megabytes, tamañu que davezu nun ye "
-#~ "bastante pa instalar %s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "La to partición %(mount)s ye de menos de %(size)s megabytes, que ye menos "
-#~ "de lo que s'encamienta nuna instalación normal de %(productName)s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4277,32 +5949,6 @@ msgstr ""
 #~ "Instalando nun preséu FireWire. Esto puede o non criar un sistema "
 #~ "funcional."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "No has creáu una partición d'arranque."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Nun s'especificó denguna partición swap. Magar que nun ye indispensable, "
-#~ "meyorará considerablemente el rendimientu na mayoría de les instalaciones."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Esti puntu de montaxe nun ye válidu.  El direutoriu %s tien de tar nel "
-#~ "sistema de ficheros /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "El puntu de montaxe %s tien de tar nun sistema de ficheros linux."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formateando preséu DASD"
-#~ msgstr[1] "Formateando preseos DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Tresnando'l preséu DASD %d pa usar con Linux..."
diff --git a/anaconda/po/be.po b/anaconda/po/be.po
index 71c780e..e32d2cb 100644
--- a/anaconda/po/be.po
+++ b/anaconda/po/be.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,208 +21,441 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Запуск VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Выкарыстоўваць тэкставы рэжым"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Добра"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -231,85 +464,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -318,7 +843,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -331,8 +861,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Выратаваньне"
 
@@ -370,28 +900,22 @@ msgstr "Сыстэма для выратаваньня"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Добра"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Выйсьці"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -404,7 +928,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -413,28 +937,199 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Выратавальны рэжым"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr ""
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -529,83 +1224,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, python-format
+msgid "Installing %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 msgid "Installation"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Немагчыма запытацца ў рэжыме загаднага разка!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Памылка"
 
@@ -629,31 +1471,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -664,444 +1508,517 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Пароль мусіць быць даўжэйшым за пяць знакаў."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Пароль мусіць быць даўжэйшым за пяць знакаў."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Запуск VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 msgid "Installation source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Увага"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1116,262 +2033,149 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
@@ -1379,319 +2183,260 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1718,277 +2463,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1996,14 +2764,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2012,33 +2780,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2047,95 +2821,109 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Добра"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2148,68 +2936,163 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2219,945 +3102,1348 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "П_рацяг"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Добра"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Выкарыстоўваць тэкставы рэжым"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID прылада"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "Д_адаць"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "П_рацяг"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "П_рацяг"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "П_рацяг"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Далучэньне ўсталявана!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Увага"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "Д_адаць"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Добра"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "Д_адаць"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Добра"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID прылада"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "Д_адаць"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3165,641 +4451,1002 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "На якой мовы вы жадаеце весьці ўсталёўку?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "П_рацяг"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID прылада"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "Д_адаць"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID прылада"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID прылада"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID прылада"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Добра"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Добра"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID прылада"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID прылада"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Добра"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Добра"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr ""
 
@@ -3815,40 +5462,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3857,60 +5505,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Памылка"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Немагчыма запытацца ў рэжыме загаднага разка!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID прылада"
+
 #~ msgid "Completed"
 #~ msgstr "Завершана"
 
diff --git a/anaconda/po/bg.po b/anaconda/po/bg.po
index 0d07f99..fa46754 100644
--- a/anaconda/po/bg.po
+++ b/anaconda/po/bg.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Bulgarian <trans-bg@lists.fedoraproject.org>\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "файлова система /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "RAID масивът, съдържащ '%s' трябва да е измежду следните raid нива: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -45,7 +45,7 @@ msgstr ""
 "RAID масивът, съдържащ '%s' трябва да има някоя от следните версии "
 "метаданни: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -54,108 +54,129 @@ msgstr ""
 "RAID масивът, съдържащ '%s' трябва да има устройство от някой от следните "
 "типове: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s трябва да имат един от следните типове етикет на диск: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s не може да е от тип %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s трябва да е монтиран в едно от %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s трябва да е с големина между %d и %d MB"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s не може да е по-малък от %d MB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s не може да е по-голям от %d MB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s трябва да е в първите %d MB от диска."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s трябва да е в primary дял."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s не може да е върху криптирано блоково устройство."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s не може да е от тип %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s може да няма достатъчно пространство grub2 да вгради core.img, когато се "
 "ползва %s файловата система на %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Стартиране на VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Използвай текстов режим"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Паролата е зададена."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Не са еднакви!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Задали сте лесна парола: %s.  Цъкнете Готово отново за да я ползвате въпреки "
 "това."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -163,87 +184,337 @@ msgstr ""
 "това."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Лесна"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Средна"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Добра"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Много добра"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Добре"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Да"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Не"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Възникна следната грешка при задаване на хранилището за инсталиране:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Инсталирането не може да продължи."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Възникна следната грешка при задаване на хранилището за инсталиране:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Инсталирането не може да продължи."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Следния софтуер, маркиран за инсталиране, съдържа грешки.  Това вероятно е "
+"поради грешка в източника\n"
+"за инсталиране.  Може да опитате да премахнете тези пакети от инсталацията,\n"
+"да промените източника, или да излезете от инсталатора."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Инсталирането беше прекратено, тъй като, изглежда, има проблем с хардуера "
+"Ви. Съобщението за грешка е:\n"
+"\n"
+"%s.\n"
+"\n"
+" Инсталаторът ще прекрати работата си сега."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Инсталирането беше прекратено, тъй като, изглежда, има проблем с хардуера "
+"Ви. Съобщението за грешка е:\n"
+"\n"
+"%s.\n"
+"\n"
+" Инсталаторът ще прекрати работата си сега."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Получи се хардуерна грешка"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Инсталирането беше прекратено, тъй като, изглежда, има проблем с хардуера "
+"Ви. Съобщението за грешка е:\n"
+"\n"
+"%s.\n"
+"\n"
+" Инсталаторът ще прекрати работата си сега."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Конфигуриране на инсталираната система"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Записване конфигурацията на мрежата"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Създаване на потребители"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Конфигуриране на инсталираната система"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Изпълнение скриптове предхождащи инсталирането"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Задаване източник за инсталирането..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Инсталиране на програма за първоначално зареждане"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Изпълнение на задачи, завършващи инсталирането"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Инсталиране на програма за първоначално зареждане"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow сертификат %s изисква мрежа."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -255,32 +526,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s липсва. Не мога да настроя защитната стена."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s липсва. Не мога да настроя защитната стена."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Тази файлова система не поддържа етикети."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Зададеното име %s вече се ползва."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Името %s на групата томове (VG) вече се ползва. Не записвам промените."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Изпълнение скриптове предхождащи инсталирането"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Името на хоста не може да е None или празно"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Името на машината трябва да е дълго не повече от 255 символа."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Името на машината трябва да започва с валиден символ измежду 'a-z', 'A-Z' "
-"или '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -290,55 +851,55 @@ msgstr ""
 "or '.', parts between periods трябва да съдържат нещо и не могат да започват "
 "или завършват с '-'."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Непознат"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Свързвам се..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Прекратявам връзката..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Жично (%s) свързан"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Свързан безжично към %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Не е свързан"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Няма достъпни мрежови устройства"
 
@@ -347,7 +908,12 @@ msgstr "Няма достъпни мрежови устройства"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Нова %s %s инсталация"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Стартирайте %s за да демонтирате системата, когато завършите."
@@ -362,8 +928,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "Не мога да намеря /bin/sh за да стартирам!  Няма интерпретатор за стартиране"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Спасяване"
 
@@ -411,23 +977,17 @@ msgstr "Система за спасяване"
 msgid "Which device holds the root partition of your installation?"
 msgstr "На кое устройство се намира основният дял на Вашата инсталация?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Добре"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Изход"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "Системата ще се рестартира автоматично, когато излезете от командния "
 "интерпретатор."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -438,7 +998,7 @@ msgstr ""
 "интерпретатор, от където ще можете да почистите системата с fsck и да "
 "монтирате дяловете. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -459,7 +1019,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -472,32 +1032,243 @@ msgstr ""
 "\n"
 "Натиснете <Enter> за да влезете в команден интерпретатор."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Няма никакви Линукс дялове.  Рестартирам се.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " Системата ще се рестартира автоматично, когато излезете (exit) от командния "
 "интерпретатор."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Спасителен режим"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Нямате никакви Линукс дялове. Натиснете return за да влезете в команден "
 "интерпретатор. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Системата е монтирана в директория %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Стандартен дял"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Диск"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"'swap' областта на Вашия компютър се използва от операционната\n"
+" система, когато има нужда от още памет."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"'boot' областта на Вашия компютър е мястото, където се разполагат\n"
+" файловете за стартиране на операционната система."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"'root' областта на компютъра Ви е мястото, където се\n"
+" съхраняват основни системни файлове и приложения."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"'home' областта на компютъра Ви е мястото, където се\n"
+" съхраняват всичките Ви лични данни."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS зареждащият дял е необходим да осъществи зареждането\n"
+"от GPT-partitioned дискове на BIOS хардуер."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PReP зареждащият дял е необходим като част от\n"
+"зареждащата конфигурация на някои PPC платформи."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Вашия основен дял е по-малко от 250 мегабайта, което обикновено е твърде "
+"малко за инсталация на %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Не сте задали главен дял (/), който е необходим за да инсталация на %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Тази платформа изисква /boot в специално създаден дял или логически том.  "
+"Ако не искате /boot том, ще трябва да поставите / в специално създаден не-"
+"LVM дял."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Вашият %(mount)s дял е по-малък от %(size)s мегабайта, което е по-малко от "
+"препоръчителното за нормална инсталация на %(productName)s ."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Вашият %(mount)s дял е твърде малък за %(format)s форматиране (допустимият "
+"размер е от %(minSize)d MB до %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Вашият %(mount)s дял е твърде голям за %(format)s форматиране (допустимият "
+"размер е от %(minSize)d MB до %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Добавянето на ново устройство се провали. Цъкнете за подробности."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Не сте създали дял за първоначално зареждане"
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Вашата BIOS-базирана система се нуждае от специален зареждащ дял с %s's нов "
+"формат на етикет на диска (GPT). За да продължите, моля, създайте 1MB дял с "
+"тип 'BIOS Boot'."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Не сте задали swap дял.  Необходими са %(requiredMem)s MB памет за "
+"инсталиране без swap дял, но в системата има само %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Не е зададен swap дял.  Въпреки че не се изисква задължително във всички "
+"случаи, той чувствително подобрява производителността на повечето инсталации."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Поне едно от swap устройствата няма UUID, което най-често е поради "
+"използването на по-стара версия на mkswap за създаването на swap "
+"пространството. Неудобството е, че тези устройства се означават във файла /"
+"etc/fstab с път, който може да се окаже друг при други обстоятелства. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Тази точка за монтиране не е валидна.  Директорията %s трябва да е в / "
+"файловата система."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Точката за монтиране %s трябва да е в Линукс файлова система."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Парола:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -609,87 +1380,239 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Зададената VNC парола не беше по-дълга от 6 знака.\n"
 "Моля, въведете нова.  Оставете празно за без парола."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Провал при задаване източника за инсталирането"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Грешка при сваляне метаданни на пакетите..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Няма достъпен източник за инсталиране"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Инсталиране на софтуер"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Стартиране на процеса, инсталиращ пакетите"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Необходимо Ви е повече място на следните файлови системи:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Подготовка на транзакция от инсталационния източник"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Инсталиране"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Сваляне метаданни на пакети..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Инсталиране"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Подготовка за инсталиране"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Проверка конфигурацията на устройствата за съхранение на данни..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "ПОДРАЗБИРАЩО СЕ ЗАГЛАВИЕ"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "ЛОКАЛИЗАЦИЯ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "ЛОКАЛИЗАЦИЯ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "СОФТУЕР"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "СИСТЕМА"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "ПОТРЕБИТ. НАСТРОЙКИ"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Пост-инсталиране"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Стартиране на автоматично инсталиране"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Не се допускат въпроси в режим на команден ред!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  Моля изберете като натиснете ['q' за изход | 'c' продължение]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Моля попълнете където трябва, преди да продължите"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Моля попълнете където трябва, преди да продължите"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Грешка"
 
@@ -713,32 +1636,35 @@ msgstr "да"
 msgid "no"
 msgstr "не"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Наистина ли искате да излезете?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  Моля изберете като натиснете ['q' за изход | 'c' продължение]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -753,221 +1679,260 @@ msgstr ""
 "свържа към този компютър от друг компютър и да извърша графична инсталация "
 "или да продължа инсталацията в текстов режим?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC парола"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Моля, задайте VNC парола. Ще трябва да я напишете два пъти. \n"
 "Оставете празно за без парола"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Парола:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Парола (отново):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Не са еднакви!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Паролата трябва да съдържа поне 6 символа."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Паролата трябва да съдържа поне 6 символа."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Настройка на часовата зона"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Часовата зона не не зададена."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Налични региони"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Налични региони"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Записване конфигурацията на мрежата"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Жично (%s) свързан"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Жично (%s) свързан"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Име на хост"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Име на хост"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Име на хост"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Край на конфигурирането"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "липсва тип в конфигурацията на файловата система"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Конфигуриране на инсталираната система"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root Парола:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Паролата е зададена."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root акаунтът е забранен."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Не е зададена парола."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Моля задайте нова парола на root. Ще трябва да я напишете два пъти."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Парола:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Използвай цялото пространство"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Замени съществуващата Линукс систем(а/и)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Използвай свободното пространство"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Местоположение на инсталацията"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Няма избрани дискове"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 "Грешка при проверка конфигурацията на устройствата за съхранение на данни"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr ""
 "Грешка при проверка конфигурацията на устройствата за съхранение на данни"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Избрано е автоматично разделяне"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Избрано е ръчно разделяне"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -975,40 +1940,61 @@ msgstr ""
 "Не са открити дискове.  Моля, изключете компютъра, свържете поне един диск и "
 "рестартирайте за да завършите инсталацията."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Не са избрани дискове. Моля, изберете поне един диск, на който да се "
 "инсталира."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Проверка на устройството за съхранение на данни..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Генериране на нова конфигурация на запаметяващите устройства"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "конфигурирането на запаметяв. устройства се провали: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Проверка конфигурацията на устройствата за съхранение на данни..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Опции на автоматичното разделяне"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1017,41 +2003,41 @@ msgstr ""
 "Инсталацията изисква разделяне на твърдия Ви диск.  Изберете кое "
 "пространство да се използва за местоположение на инсталацията."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Конфигурация схемата на дялове"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Конфигурация схемата на дялове"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Настройка на часовата зона"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s времева зона"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Часовата зона не не зададена."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Налични часови зони в регион %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Налични региони"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1059,180 +2045,198 @@ msgstr ""
 "Моля изберете часовата зона.\n"
 "Използвайте номерата или пишете директно имена [b за списък, q за изход]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Стартиране на VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Ход на инсталацията"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Най-близко огледало"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS сървър %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Грешка при задаване източника на софтуера"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Няма нищо избрано"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Свързвам се..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD устройство"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO файл:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Мрежово време"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Няма достъпен източник за инсталиране"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Провал при задаване източника за инсталирането"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Грешка при сваляне метаданни на пакетите..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Няма достъпен източник за инсталиране"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS сървър %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Опции за монтиране на NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Провал при задаване източника за инсталирането, проверете url-а на "
 "хранилището"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "устройството съдържа /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Провал при задаване източника за инсталирането"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Про_мяна избора на софтуер"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Грешка при проверката на избрания софтуер"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Не е зададен източник за инсталирането"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Избран е потребителски софтуер"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Не е зададен източник за инсталирането"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Изберете Вашата среда"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "Използвай _удостоверяване"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Вие трябва да зададете и потвърдите парола."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Предупреждение"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1248,36 +2252,36 @@ msgstr "Работи се"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tИнсталирането завърши.  Натиснете Enter за да излезете"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "тестване на състоянието..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Ново устройство"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Парола (отново):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1286,7 +2290,7 @@ msgstr ""
 "Задали сте лесна парола: %s.  Цъкнете Готово отново за да я ползвате въпреки "
 "това."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1295,63 +2299,46 @@ msgstr ""
 "Задали сте лесна парола: %s.  Цъкнете Готово отново за да я ползвате въпреки "
 "това."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Паролата е зададена."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Изход от инсталатора"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Изход"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Не"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Да"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "ПОДРАЗБИРАЩО СЕ ЗАГЛАВИЕ"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "ЛОКАЛИЗАЦИЯ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "ЛОКАЛИЗАЦИЯ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "СОФТУЕР"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "СИСТЕМА"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "ПОТРЕБИТ. НАСТРОЙКИ"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1359,7 +2346,11 @@ msgstr ""
 "Моля, довършете елементите, маркирани с този знак, преди да продължите към "
 "следващата стъпка."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Готово!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1368,170 +2359,67 @@ msgstr ""
 "%s е успешно инсталирана на Вашата система и е готова\n"
 " за употреба! Рестартирайте за да започнете работа с нея!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Готово!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Изход"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Нова %s %s инсталация"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s е успешно инсталирана на Вашата система, но все още трябва да се "
+"конфигурира туй-онуй. \n"
+"Моля, довършете го и цъкнете бутона Край на конфигурирането."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s е успешно инсталирана на Вашата система и е готова\n"
+" за употреба! Рестартирайте за да започнете работа с нея!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Създаване на нова група томове (VG) ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Преконфигурирането на устройството се провали. Цъкнете за подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Моля, задайте име на Вашата група томове (VG) и изберете поне един диск по-"
-"долу."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Група томове (VG):"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "колона"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Конфигурирането на устройствата за данни е анулирано поради невъзстановима "
 "грешка. Цъкнете за подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Преконфигурирането на устройството се провали. Цъкнете за подробности."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Моля въведете валидна точка на монтиране."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Тази точка на монтиране е невалидна. Да опитаме друга?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Тази точка на монтиране вече се ползва. Да опитаме друга?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Избраното от Вас RAID ниво изисква по-голям брой дискове от избраните от Вас "
-"в момента."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Моля въведете валидна точка на монтиране."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Тази точка на монтиране е невалидна. Да опитаме друга?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Стандартен дял"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Диск"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Нищо"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Изтрий също и всички други файлови системи в %s root."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Сигурни ли сте, че искате да изтриете всички данни на %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Сигурни ли сте, че искате да изтриете всички данни на %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "РЪЧНО РАЗДЕЛЯНЕ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d избрано устройство за съхранение на данни"
 msgstr[1] "%d избрани устройства за съхранение на данни"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1540,134 +2428,119 @@ msgstr ""
 "Когато създадете точки на монтиране за %s %s инсталацията,\n"
 "тук  Вие ще можете да видите подробности за тях."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"'swap' областта на Вашия компютър се използва от операционната\n"
-" система, когато има нужда от още памет."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"'boot' областта на Вашия компютър е мястото, където се разполагат\n"
-" файловете за стартиране на операционната система."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"'root' областта на компютъра Ви е мястото, където се\n"
-" съхраняват основни системни файлове и приложения."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"'home' областта на компютъра Ви е мястото, където се\n"
-" съхраняват всичките Ви лични данни."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS зареждащият дял е необходим да осъществи зареждането\n"
-"от GPT-partitioned дискове на BIOS хардуер."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PReP зареждащият дял е необходим като част от\n"
-"зареждащата конфигурация на някои PPC платформи."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi трябва да е на устройство от тип %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s трябва да е на устройство от тип %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s не може да бъде криптиран"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Трябва да създадете нова файлова система на root устройството."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Устройствата тип %s изискват избор на валидно RAID ниво."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Заявката за преоразмеряване на устройството се провали. Цъкнете за "
 "подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Заявката за преформатиране на устройството се провали. Цъкнете за "
 "подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Зададеното име %s вече се ползва."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Тази файлова система не поддържа етикети."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Няма избрани дискове"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Тази файлова система не може да бъде преоразмерена."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Грешка при проверка конфигурацията на запаметяващите устройства.  Цъкнете за "
+"подробности."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Грешка при проверка конфигурацията на запаметяващите устройства.  Цъкнете за "
+"подробности."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Добавен нов %s към съществуващ контейнер %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Добавянето на ново устройство се провали. Цъкнете за подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Зададена е невалидна големина на дял. Трябва да е валидно цяло число."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "Заявката за премахване на устройство се провали. Цъкнете за подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Името %s на групата томове (VG) вече се ползва. Не записвам промените."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "фс своб."
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1676,7 +2549,7 @@ msgstr ""
 "Това устройство не може да бъде редактирано директно. Вие можете да го "
 "премахнете или да изберете друго устройство."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1685,196 +2558,145 @@ msgstr ""
 "Това устройство не може да бъде редактирано директно. Вие можете да го "
 "премахнете или да изберете друго устройство."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Няма избрани дискове."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "На избраните дискове няма достатъчно свободно пространство."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Автоматичното разделяне се провали. Цъкнете за подробности."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Про_мяна избора на софтуер"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Провал при отключването на криптирано блоково устройство. Цъкнете за "
 "подробности"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "ДАТА И ЧАС"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Невалидна часова зона"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Ако искате да ползвате NTP, настройте първо работата в мрежа"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Нямате конфигурирани работещи NTP сървъри"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "МЕСТОНАЗНАЧЕНИЕ НА ИНСТАЛАЦИЯТА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d избрано устройство за съхранение на данни"
+msgstr[1] "%d избрани устройства за съхранение на данни"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s за превключване на подредба."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "КЛАВИАТУРА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Тестването на конфигурацията не е достъпно."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "тестване на състоянието..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Превключването на подредбата не е конфигурирано."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "ЕЗИК"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Неизвестно (липсва) състояние"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Неизвестно състояние"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Неуправляем"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Недостъпен"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Липсва фирмуер"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Кабелът е изваден"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Недостъпен"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Изключен"
@@ -1899,203 +2721,250 @@ msgstr "Изключване"
 msgid "Connection failed"
 msgstr "Връзката пропадна"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "изключен"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Wireless"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "изключен"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 адрес"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 адрес"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP Адрес"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Нищо"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Изисква се удостоверяване"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Парола:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "КОНФИГУРИРАНЕ НА МРЕЖАТА"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT ПАРОЛА"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Паролата е зададена."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root паролата е зададена"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root акаунтът е забранен"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Не е зададена парола на root"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "ИЗБОР НА СОФТУЕР"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Проверка на софтуерните зависимости..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Грешка при проверката на софтуерните зависимости"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Сваляне метаданни на пакети..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Сваляне метаданни на групи..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Проверка на софтуерните зависимости..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Грешка при проверката на софтуерните зависимости"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Грешка при проверката на софтуерните зависимости.\n"
 " Цъкнете за детайли."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Следния софтуер, маркиран за инсталиране, съдържа грешки.  Това вероятно е "
 "поради грешка в източника\n"
 "за инсталиране.  Може да опитате да премахнете тези пакети от инсталацията,\n"
 "да промените източника, или да излезете от инсталатора."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Отказ"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Изход"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "Про_мени източника на софтуер"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Про_мяна избора на софтуер"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Задаване източник за инсталирането..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Грешка при сваляне метаданни на пакетите..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Изисква се удостоверяване"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Тази медия е подходяща за източник за инсталиране."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Тази медия не е подходяща за източник за инсталиране."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ИЗТОЧНИК ЗА ИНСТАЛИРАНЕ"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Провал при задаване източника за инсталирането, проверете url-а на "
 "хранилището"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Грешка при задаването на хранилище"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Грешка при задаване източника на софтуера"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2103,86 +2972,73 @@ msgstr ""
 "Провал при задаване източника за инсталирането, проверете url-а на "
 "хранилището и proxy настройките"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Грешка при задаването на хранилище"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Грешка при задаване източника на софтуера"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS сървър %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Невалидна часова зона"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Невалидна часова зона"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Невалидна часова зона"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Моля почакайте...все още се зареждат метаданни за софтуера."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
@@ -2190,12 +3046,7 @@ msgstr ""
 " Избраните от Вас дискове разполагат със следните количества свободно "
 "пространство:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Моля почакайте...все още се зареждат метаданни за софтуера."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2206,7 +3057,7 @@ msgstr ""
 "Ви помогнем\n"
 " да освободите пространство като смалим или премахнем съществуващи дялове."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2217,7 +3068,7 @@ msgstr ""
 "използвате всичкото\n"
 " свободно пространство, налично на избраните дискове."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2232,46 +3083,53 @@ msgstr ""
 " да промените избора си на софтуер за да инсталирате по-малка версия на <b>"
 "%s</b>, или да излезете от инсталатора."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "МЕСТОНАЗНАЧЕНИЕ НА ИНСТАЛАЦИЯТА"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Записвам конфигурацията на запаметяв. устройства..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Записването конфигурацията на устройствата се провали..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Форматиране на DASD устройство"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Грешка при проверка конфигурацията на запаметяващите устройства.  Цъкнете за "
 "подробности."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Грешка при проверка конфигурацията на запаметяващите устройства.  Цъкнете за "
 "подробности."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "фс своб."
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d избран диск; капацитет %s; свободни %s"
 msgstr[1] "%d избрани диска; капацитет %s; свободни %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2279,7 +3137,11 @@ msgstr ""
 "Избрали сте да пропуснете инсталирането на програма за първоначално "
 "зареждане.  Системата Ви може да не зарежда."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2289,11 +3151,19 @@ msgstr ""
 "устройства.  Можете да я промените\n"
 "или да излезете от инсталатора."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Изход"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Промяна използването на дисковете"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2304,76 +3174,80 @@ msgstr ""
 "устройства.  Можете да я промените\n"
 "или да излезете от инсталатора."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Добре"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "ПОТРЕБИТ. НАСТРОЙКИ"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Невалидна часова зона"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "ДОБРЕ ДОШЛИ В %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Не сте създали никакви точки за монтиране за Вашата %s %s инсталация:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Цъкнете тук за да ги създадете автоматично."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Или създайте нови точки за монтиране по-долу с иконата '+'."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2388,55 +3262,163 @@ msgstr[1] ""
 "<b>%d диска; капацитет %s; свободно пространство %s</b> (незаделено и във "
 "файлови системи)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Не инсталирай програма за първонач. зареждане"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Това устройство да е зареждащо"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Избраното от Вас RAID ниво изисква по-голям брой дискове от избраните от Вас "
+"в момента."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Моля, задайте име на Вашата група томове (VG) и изберете поне един диск по-"
+"долу."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Група томове (VG):"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "колона"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Точката за монтиране %s трябва да е в Линукс файлова система."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Тази точка на монтиране вече се ползва. Да опитаме друга?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Моля въведете валидна точка на монтиране."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Тази точка на монтиране е невалидна. Да опитаме друга?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Изтрий също и всички други файлови системи в %s root."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Сигурни ли сте, че искате да изтриете всички данни на %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Сигурни ли сте, че искате да изтриете всички данни на %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Невалидна часова зона"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Изход"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Задали сте лесна парола: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Паролите не съвпадат."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Запазване"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Смаляване"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Изтриване"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Това устройство съдържа източника за инсталиране."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Създаване на %(type)s върху %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Не е готов"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Използвай свободното пространство"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2449,14 +3431,14 @@ msgstr ""
 "нуждаете за да освободите пространство за тази инсталация.  Премахването на "
 "файлова система ще изтрие всички данни, които тя съдържа."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2464,352 +3446,763 @@ msgid_plural ""
 msgstr[0] "<b>%s диск; %s възстановим обем</b> (във файлови системи)"
 msgstr[1] "<b>%s диска; %s възстановим обем</b> (във файлови системи)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Общо избрано пространство за възстановяване: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Изтриване"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Запазване"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "ИНСТАЛИРАНЕ НА ДИСТРИБУЦИЯ"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "ПРЕ-ИЗДАНИЕ / ТЕСТВАЩО"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Ново устройство"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Нов разделител"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Готово"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Продължи"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Приложи промените"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "КОНФИГУРИРАНЕ НА МРЕЖАТА"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Отказ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Добре"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "ДАТА И ЧАС"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Добавете и маркирайте NTP сървъри за ползване"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web сървър"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Работещ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Използвай"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Конфигуриране..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "ДАТА И ЧАС"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Регион:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Регион:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Град:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Град:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Име на _мрежата"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Име на мрежата"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+"\t\n"
+"24-часов"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "МЕСТОНАЗНАЧЕНИЕ НА ИНСТАЛАЦИЯТА"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Капацитет"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Не е свързан"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Избрано устройство"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Няма нищо избрано"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Етикет:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Липсва фирмуер"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Не"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Тип VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Избрано устройство"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "обобщение"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID устройство"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "Добавяне"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Подразбиращ се маршрут"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Мрежова маска"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Скорост"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Хардуерен адрес"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "К_онфигуриране..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Сигурност"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Име на _мрежата"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Име на мрежата"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Ключ за сигурност"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Ползване като Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Stop Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Конфигуриране..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Доставчик"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Конфигуриране..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Тип VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Потребителско име"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Конфигуриране..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Метод"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Конфигуриращ URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks Host"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Записване конфигурацията на мрежата"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Отключи"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Режим \"В _самолет\""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Записване конфигурацията на мрежата"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Име на хост"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "КОНФИГУРИРАНЕ НА МРЕЖАТА"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2819,284 +4212,206 @@ msgstr ""
 "Ви\n"
 " и да направим софтуерните обновления достъпни за Вас."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Подразбиращ се маршрут"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Мрежова маска"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Скорост"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Хардуерен адрес"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "К_онфигуриране..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Сигурност"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "Име на _мрежата"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Име на мрежата"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Ключ за сигурност"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Ползване като Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Stop Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Конфигуриране..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Доставчик"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Тип VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Потребителско име"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Метод"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Конфигуриращ URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks Host"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Отключи"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Режим \"В _самолет\""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Име на хост"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "Използвай _удостоверяване"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Изисква се удостоверяване"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Свързан"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "ИЗБОР НА СОФТУЕР"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Изберете Вашата среда"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "колона"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Прекратяване и доб_авяне на дискове"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ИНСТАЛАЦИОННИ ОПЦИИ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Тип дял:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Криптирай моите данни. По-късно ще задам парола."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Избрано е ръчно разделяне"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Възстанови пространството"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ИНСТАЛАЦИОННИ ОПЦИИ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "Тук ще показваме какъв обем е необходим за текущия избор на софтуер."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "диск своб."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Свободно пространство, достъпно за ползване."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "фс своб."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Свободно пространство не е достъпно, но може да се вземе от съществуващи "
 "дялове."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Тук ще опишем какви са опциите Ви."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Използвай свободното пространство"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Изход от инсталатора"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Описание на устройството"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Локални стандартни дискове"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Край на разделянето"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "К_риптирай"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Избрано е автоматично разделяне"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Край на разделянето"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "К_риптирай"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Криптирай моите данни. По-късно ще задам парола."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Опции на автоматичното разделяне"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "обобщение"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Пълна информация за диска и опциите..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ДОБАВИ КЛАВИАТУРНА ПОДРЕДБА"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Можете да добавите клавиатурна подредба като я изберете по-долу:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Име"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "КЛАВИАТУРНА ПОДРЕДБА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3104,123 +4419,205 @@ msgstr ""
 "Кои клавиатурни подредби искате да се ползват на тази система?  Можете да "
 "преместите която и да е подредба най-горе, за да я направите подразбираща се."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "име"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Добави подредба"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Премахни подредбата"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Премести избраната подредба нагоре"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Добави подредба"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Премахни подредбата"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Премести избраната подредба нагоре"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Премести избраната подредба надолу"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Преглед на подредбата"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Тестването на конфигурацията не е достъпно."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift за смяна на подредбите."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Опции"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "Добавяне"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ДОБАВИ КЛАВИАТУРНА ПОДРЕДБА"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Можете да добавите клавиатурна подредба като я изберете по-долу:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Име"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Налични региони"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Добави подредба"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Добре"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ОПЦИИ ЗА ПРЕВКЛЮЧВАНЕ НА ПОДРЕДБАТА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Коя комбинация(и) предпочитате за превключване на клавиатурните подредби?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "използвай"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "описание"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Опции за монтиране на NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "ЕЗИК"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Няма нищо избрано"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT ПАРОЛА"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root Парола:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Отново:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC парола"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Задайте root парола"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3228,237 +4625,285 @@ msgstr ""
 "Акаунтът root се използва за администриране на системата.  Въведете парола "
 "за потребителя root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Готово"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "ПРОВЕРКА НА МЕДИЯТА"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Проверка на медията. Моля почакайте..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "Добавяне"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Добре"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "Разр_еши HTTP Proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Пример:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "Използвай _удостоверяване"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Име</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Потребителско име"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Парола</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Парола:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ИЗТОЧНИК ЗА ИНСТАЛИРАНЕ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Кой източник за инсталиране искате да използвате?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Автоматично намерени инсталационни медии:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Етикет:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "Про_вери"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO файл:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Изберете ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "В _мрежата:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxy настройки..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Този URL сочи къ_м mirror списък."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Опции за монтиране на NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Това поле не е задължително."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People Repositories"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Добавяне на точка на монтиране."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "Добавяне"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Премахване на избраната точка(и) на монтиране."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Премахни подредбата"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Оперативна грешка."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Задайте root парола"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Този URL сочи къ_м mirror списък."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Име:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Потребителско име"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Парола:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Тази точка на монтиране е невалидна. Да опитаме друга?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Измъкни ме от тук!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Приемам съдбата си."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Това е нестабилна, предварителна версия."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3470,204 +4915,264 @@ msgstr ""
 "живеете.  Тази ОС на бъдещето не е стабилна ОС, на която може да разчитате.  "
 "Тя е предназначена само за тестове."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "ДОБРЕ ДОШЛИ В %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Какъв език желаете да ползвате по време на инсталационния процес?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Изход"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Продължи"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Потребителско име"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Име"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Парола:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC парола"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Добави точка на монтиране"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Желан капацитет:</b>"
+msgid "Add a new mount point."
+msgstr "Добавяне на точка на монтиране."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Точка на монтиране:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "Добавяне"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "ДОБАВЯНЕ НОВА ТОЧКА НА МОНТИРАНЕ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Повече настройки са достъпни след създаването\n"
-" на точките на монтиране по-долу."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Тази точка на монтиране вече се\n"
-" ползва.  Ще пробвате ли другаде?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "напр.: \"20 GB\", \"500mb\" (без кавичките)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Изтрий ги"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Запиши"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "КОНФИГУРИРАНЕ ТОЧКА НА МОНТИРАНЕ"
+msgid "Remove the selected mount point(s)."
+msgstr "Премахване на избраната точка(и) на монтиране."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Моля, задайте име на Вашата група томове (VG) и изберете поне един диск по-"
-"долу."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Премахни подредбата"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Свободен"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID устройство"
+msgid "Reload storage configuration from disk."
+msgstr "конфигурирането на запаметяв. устройства се провали: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "К_риптирай"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Избрано устройство"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Описание на устройството"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Точка на монтиране:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Желан капацитет:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Етикет:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Тип устройство:</b>"
+msgid "Device(s):"
+msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Файлова система:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "К_риптирай"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Преформатиране"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Група томове (VG):"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Промени ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Име:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Тип устройство:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "К_риптирай"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Файлова система"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Преформатиране"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Група томове (VG):"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Промени ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID устройство"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3675,17 +5180,19 @@ msgstr ""
 "Това устройство е криптирано и не може да бъде четено без валидна парола. "
 "Можете да го отключите по-долу:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Парола:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Отключване"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3693,295 +5200,573 @@ msgstr ""
 "Това устройство не може да бъде редактирано директно. Вие можете да го "
 "премахнете или да изберете друго устройство."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Добавяне на точка на монтиране."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Премахване на избраната точка(и) на монтиране."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Конфигуриране на избраната точка на монтиране."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Конфигуриране..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "конфигурирането на запаметяв. устройства се провали: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ДОСТЪПЕН ОБЕМ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ВСИЧКО ОБЕМ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Отказ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "КОНФИГУРИРАНЕ ТОЧКА НА МОНТИРАНЕ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Изберете един или повече дискове, където може да е това устройство."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Добре"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP Адрес"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Трябва да зададете име на iSCSI инициатор"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "Използвай _удостоверяване"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Пример:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Потребителско име"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC парола"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Потребителско име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC парола"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Потребителско име"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC парола"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Име на мрежата"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "Използвай _удостоверяване"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Потребителско име"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC парола"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Потребителско име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC парола"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Потребителско име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC парола"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Връзката пропадна"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Добре"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Устройство:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "ИЗБРАНИ ДИСКОВЕ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Затвори"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Зареждащ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Описание"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Свободен"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Премахни подредбата"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Тук ще е обобщението на дисковете"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Изтрий ги"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Няма нищо избрано"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "КОНФИГУРИРАНЕ ТОЧКА НА МОНТИРАНЕ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Изберете един или повече дискове, където може да е това устройство."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Добави точка на монтиране"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Желан капацитет:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Точка на монтиране:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "ДОБАВЯНЕ НОВА ТОЧКА НА МОНТИРАНЕ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Повече настройки са достъпни след създаването\n"
+" на точките на монтиране по-долу."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Тази точка на монтиране вече се\n"
+" ползва.  Ще пробвате ли другаде?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "напр.: \"20 GB\", \"500mb\" (без кавичките)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Запиши"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "КОНФИГУРИРАНЕ ТОЧКА НА МОНТИРАНЕ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Моля, задайте име на Вашата група томове (VG) и изберете поне един диск по-"
+"долу."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Име:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID устройство"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "К_риптирай"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Моля въведете валидна точка на монтиране."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Добре"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Форматиране на DASD устройство"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "По време на инсталирането възникна непозната грешка.  Следват подробности."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ПАРОЛА ЗА КРИПТИРАНЕ НА ДИСК"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Запиши паролата"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ПАРОЛА ЗА КРИПТИРАНЕ НА ДИСК"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3991,7 +5776,19 @@ msgstr ""
 "фраза, която ще използвате за достъп до данните си, когато стартирате "
 "компютъра."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Парола:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Отново:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4001,117 +5798,172 @@ msgstr ""
 "подредбата, е възможно, да не можете да декриптирате Вашите дискове след "
 "инсталирането."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ВЪЗСТАНОВЯВАНЕ НА ДИСКОВ ОБЕМ"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Отказ"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Добре"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Отказ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Възстанови пространството"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ВЪЗСТАНОВЯВАНЕ НА ДИСКОВ ОБЕМ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Описанието ще е тук."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Файлова система"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Възстановимо пространство"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Действие"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Запазване"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Изтриване"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Смаляване"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Избрано е ръчно разделяне"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Приложи промените"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Добави точка на монтиране"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Изход от инсталатора"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Не"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Да"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4119,51 +5971,50 @@ msgstr ""
 "Наистина ли искате да излезете\n"
 " от инсталационния процес?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Изход"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ОБОБЩЕНИЕ НА ИНСТАЛАЦИЯТА"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Изход"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Начало на инсталирането"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "КОНФИГУРАЦИЯ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Подготовка за инсталиране"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s е успешно инсталирана на Вашата система, но все още трябва да се "
-"конфигурира туй-онуй. \n"
-"Моля, довършете го и цъкнете бутона Край на конфигурирането."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Край на конфигурирането"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s е успешно инсталирана на Вашата система и е готова\n"
-" за употреба! Рестартирайте за да започнете работа с нея!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Рестартиране"
 
@@ -4179,16 +6030,16 @@ msgstr "_Инсталиране"
 msgid "Install the live CD to your hard disk"
 msgstr "Инсталиране на живото CD на вашия твърд диск"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Стартиране инсталирането на твърдия диск"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Добре дошли във Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4197,24 +6048,25 @@ msgstr ""
 "%s изисква %s MB памет за да се инсталира, но на тази машина има само %s "
 "MB.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "Графичният инсталатор на %s изисква %s MB памет, но имате само %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Няма достатъчно памет (RAM)"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4228,24 +6080,24 @@ msgstr ""
 "\n"
 " в терминал с root права."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Стартиране на текстов режим."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Грешка"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Променливата DISPLAY не е зададена. Стартиране в текстов режим."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Графично инсталиране не е налично. Стартиране в текстов режим."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4256,20 +6108,20 @@ msgstr ""
 "Няма да можете да направите собствено разделяне на диска и да изберете "
 "пакети.  Искате ли вместо това, да изберете VNC режим?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Моля направете ssh install@%s за да започнете инсталирането."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Моля направете ssh install@<host> за да продължите инсталирането."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Пробвайте Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4279,7 +6131,7 @@ msgstr ""
 "Вие можете да инсталирате Fedora сега, или да изберете \"Инсталиране на "
 "твърдия диск\" от изгледа Дейности в който и да е по-късен момент."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4287,10 +6139,90 @@ msgstr ""
 "Вие можете да изберете \"Инсталиране на твърдия диск\"\n"
 " от изгледа Дейности в който и да е по-късен момент."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Затвори"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Името на машината трябва да започва с валиден символ измежду 'a-z', 'A-Z' "
+#~ "или '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Необходимо Ви е повече място на следните файлови системи:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Не се допускат въпроси в режим на команден ред!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Тази точка на монтиране е невалидна. Да опитаме друга?"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "КОНФИГУРИРАНЕ НА МРЕЖАТА"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Грешка при сваляне метаданни на пакетите..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Няма нищо избрано"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Липсва фирмуер"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Изисква се удостоверяване"
+
+#~ msgid "column"
+#~ msgstr "колона"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Тип дял:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Име</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Парола</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Тази точка на монтиране е невалидна. Да опитаме друга?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Етикет:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Файлова система:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID устройство"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Конфигуриране на избраната точка на монтиране."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ДОСТЪПЕН ОБЕМ</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ВСИЧКО ОБЕМ</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Готово"
 
@@ -4343,41 +6275,9 @@ msgstr "Затвори"
 #~ msgid "Install on System"
 #~ msgstr "Инсталиране на системата"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Възникна следната грешка при задаване на хранилището за инсталиране:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Инсталирането не може да продължи."
-
 #~ msgid "Exit installer"
 #~ msgstr "Изход от инсталатора"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Инсталирането беше прекратено, тъй като, изглежда, има проблем с хардуера "
-#~ "Ви. Съобщението за грешка е:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Инсталаторът ще прекрати работата си сега."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Получи се хардуерна грешка"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Изход от инсталатора"
 
@@ -4677,9 +6577,6 @@ msgstr "Затвори"
 #~ msgid "Software Development"
 #~ msgstr "Разработка на софтуер"
 
-#~ msgid "Web Server"
-#~ msgstr "Web сървър"
-
 #~ msgid "Minimal"
 #~ msgstr "Минимален"
 
@@ -4723,49 +6620,6 @@ msgstr "Затвори"
 #~ "да бъдат изтрити:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Не сте задали главен дял (/), който е необходим за да инсталация на %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Вашия основен дял е по-малко от 250 мегабайта, което обикновено е твърде "
-#~ "малко за инсталация на %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Тази платформа изисква /boot в специално създаден дял или логически том.  "
-#~ "Ако не искате /boot том, ще трябва да поставите / в специално създаден не-"
-#~ "LVM дял."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Вашият %(mount)s дял е по-малък от %(size)s мегабайта, което е по-малко "
-#~ "от препоръчителното за нормална инсталация на %(productName)s ."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Вашият %(mount)s дял е твърде малък за %(format)s форматиране "
-#~ "(допустимият размер е от %(minSize)d MB до %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Вашият %(mount)s дял е твърде голям за %(format)s форматиране "
-#~ "(допустимият размер е от %(minSize)d MB до %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4782,57 +6636,6 @@ msgstr "Затвори"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "не сте създали целево устройство за stage1 на зареждащата програма."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Не сте създали дял за първоначално зареждане"
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Вашата BIOS-базирана система се нуждае от специален зареждащ дял с %s's "
-#~ "нов формат на етикет на диска (GPT). За да продължите, моля, създайте 1MB "
-#~ "дял с тип 'BIOS Boot'."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Не сте задали swap дял.  Необходими са %(requiredMem)s MB памет за "
-#~ "инсталиране без swap дял, но в системата има само %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Не е зададен swap дял.  Въпреки че не се изисква задължително във всички "
-#~ "случаи, той чувствително подобрява производителността на повечето "
-#~ "инсталации."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Поне едно от swap устройствата няма UUID, което най-често е поради "
-#~ "използването на по-стара версия на mkswap за създаването на swap "
-#~ "пространството. Неудобството е, че тези устройства се означават във "
-#~ "файла /etc/fstab с път, който може да се окаже друг при други "
-#~ "обстоятелства. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Тази точка за монтиране не е валидна.  Директорията %s трябва да е в / "
-#~ "файловата система."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Точката за монтиране %s трябва да е в Линукс файлова система."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Линукс на %s"
 
@@ -4842,11 +6645,6 @@ msgstr "Затвори"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Линукс %(version)s за %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Форматиране на DASD устройство"
-#~ msgstr[1] "Форматиране на DASD устройства"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Подготовка на %d DASD устройство за ползване с Linux..."
@@ -5049,9 +6847,6 @@ msgstr "Затвори"
 #~ msgid "Error setting root password"
 #~ msgstr "Трешка при задаване паролата на root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Вие трябва да зададете и потвърдите парола."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "П_ремахни пакетите"
 
@@ -5071,26 +6866,12 @@ msgstr "Затвори"
 #~ msgid "%s of %s"
 #~ msgstr "%s от %s"
 
-#~ msgid "Region:"
-#~ msgstr "Регион:"
-
-#~ msgid "City:"
-#~ msgstr "Град:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr ""
-#~ "\t\n"
-#~ "24-часов"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Изберете добавки"
 
@@ -5156,9 +6937,6 @@ msgstr "Затвори"
 #~ msgid "_Customize..."
 #~ msgstr "На_стройка..."
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Край на разделянето"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "КОНФИГУРИРАНЕ НА ГРУПА ТОМОВЕ (VG)"
 
diff --git a/anaconda/po/bn.po b/anaconda/po/bn.po
index 3a5998c..5d67ccb 100644
--- a/anaconda/po/bn.po
+++ b/anaconda/po/bn.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Bengali <info@ankur.org.bd>\n"
@@ -31,11 +31,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ফাইল-সিস্টেম"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -44,7 +44,7 @@ msgstr ""
 "'%s' সহ RAID সংকলনের ক্ষেত্রে নিম্নলিখিত raid-র স্তরের মধ্যে একটি স্তর থাকা আবশ্যক: "
 "%s"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -53,7 +53,7 @@ msgstr ""
 "'%s' সহ RAID সংকলনের ক্ষেত্রে নিম্নলিখিত মিটা-ডাটা সংকলনের মধ্যে একটি  থাকা "
 "আবশ্যক: %s"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -61,186 +61,450 @@ msgid ""
 msgstr ""
 "'%s' সহ RAID সংকলনের ক্ষেত্রে নিম্নলিখিত একটি ধরনের ডিভাইস  থাকা আবশ্যক: %s"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s-র ক্ষেত্রে নিম্নলিখিত একটি ধরনের ডিস্ক লেবেল উপস্থিত থাকা আবশ্যক: %s"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s-টি %s ধরনের হওয়া অনুচিত।"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s-র মাপ %d থেকে %d মেগাবাইটের মধ্যে সীমাবদ্ধ রাখা আবশ্যক।"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s-র মাপ %d মেগাবাইটের থেকে বেশি হওয়া আবশ্যক।"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s-র মাপ %d মেগাবাইটের কম হওয়া আবশ্যক।"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s, ডিস্কের প্রথম %d মেগাবাইট অংশের মধ্যে উপস্থিত থাকা আবশ্যক।"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s-কে এনক্রিপ্ট করা ব্লক ডিভাইসের উপর স্থাপন করা যাবে না।"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s-টি %s ধরনের হওয়া অনুচিত।"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC আরম্ভ করা হবে"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "টেক্সট মোড ব্যবহার করা হবে"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"ইনস্টলেশনের সংগ্রহস্থল নির্ধারণ করতে নিম্নলিখিত সমস্যা দেখা দিয়েছে:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ইনস্টলেশনে এগিয়ে যাওয়া যাবে না"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"ইনস্টলেশনের সংগ্রহস্থল নির্ধারণ করতে নিম্নলিখিত সমস্যা দেখা দিয়েছে:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ইনস্টলেশনে এগিয়ে যাওয়া যাবে না"
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন ত্রুটির "
+"বার্তা হল:\n"
+"\n"
+"%s.\n"
+"\n"
+" ইনস্টলার এখন বন্ধ করা হবে।"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন ত্রুটির "
+"বার্তা হল:\n"
+"\n"
+"%s.\n"
+"\n"
+" ইনস্টলার এখন বন্ধ করা হবে।"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "হার্ডওয়্যার সংক্রান্ত ত্রুটি দেখা দিয়েছে"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন ত্রুটির "
+"বার্তা হল:\n"
+"\n"
+"%s.\n"
+"\n"
+" ইনস্টলার এখন বন্ধ করা হবে।"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ইনস্টলেশনের প্রাক্কালের স্ক্রিপ্ট সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ইনস্টলেশন আরম্ভ করা হচ্ছে"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "ইনস্টলেশনের পরের কনফিগারেশন সঞ্চালিত হচ্ছে..."
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -252,87 +516,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ইনস্টলেশনের প্রাক্কালের স্ক্রিপ্ট সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "হোস্ট-নেম ২৫৫ অক্ষরের মধ্যে সীমাবদ্ধ রাখা আবশ্যক।"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"হোস্ট-নেমের প্রারম্ভে 'a-z', 'A-Z' অথবা '0-9' সীমার মধ্যে বৈধ অক্ষর ব্যবহার করা "
-"আবশ্যক"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -341,7 +895,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s-র ইনস্টলেশন"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "কর্ম সমাপ্ত হলে %s সঞ্চালন করে সিস্টেমটি আন-মাউন্ট করুন।"
@@ -354,8 +913,8 @@ msgstr "কর্ম সম্পন্ন হলে, শেল থেকে প
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "সঞ্চালনযোগ্য /bin/sh ফাইল পাওয়া যায়নি!  শেল আরম্ভ করা হবে না"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescue"
 
@@ -393,21 +952,15 @@ msgstr "উদ্ধার করার জন্য চিহ্নিত স
 msgid "Which device holds the root partition of your installation?"
 msgstr "আপনার সিস্টেমের root পার্টিশন ধারণকারী ডিভাইস কোনটি?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ঠিক আছে"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "প্রস্থান"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "শেল থেকে প্রস্থান করলে সিস্টেমটি স্বয়ংক্রিয়ভাবে পুনরায় বুট করা হবে।"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -417,7 +970,7 @@ msgstr ""
 "চালিয়ে ফাইল-সিস্টেমের সমস্যাসমাধান করে সেগুলি মাউন্ট করার জন্য কি-বোর্ড থেকে "
 "Return চেপে একটি শেল চালু করুন। %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -438,7 +991,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -451,28 +1004,222 @@ msgstr ""
 "\n"
 "শেল আরম্ভ করতে কি-বোর্ড থেকে &lt;return&gt; চাপুন।"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "কোনো Linux পার্টিশন উপস্থিত নেই।  পুনরায় বুট করা হচ্ছে।\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "শেল থেকে প্রস্থান করলে সিস্টেমটি স্বয়ংক্রিয়ভাবে পুনরায় বুট করা হবে।"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "রেসকিউ (rescue) মোড"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "কোনো Linux পার্টিশন উপস্থিত নেই।  return টিপে শেল প্রাপ্ত করুন। %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "আপনার সিস্টেম %s ডিরেক্টরির অধীন মাউন্ট করা হয়েছে।"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Root পার্টিশনের জন্য, আপনার উল্লিখিত মাপ ২৫০ মেগাবাইট %s ইনস্টলেশনের জন্য "
+"অতিমাত্রায় ক্ষুদ্র।"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"কোনো root পার্টিশন (/) উল্লেখ করা হয়নি।  %s-র ইনস্টলেশন প্রক্রিয়া এগিয়ে নিয়ে "
+"যাওয়ার জন্য এটি আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"এই প্ল্যাটফর্মে /boot পার্টিশনটি একটি সুনির্ধারিত পার্টিশন অথবা লজিক্যাল ভলিউমের "
+"মধ্যে স্থাপিত হওয়া আবশ্যক।  /-কে একটি সুনির্দিষ্ট LVM ব্যাতীত পার্টিশনে স্থাপন করা "
+"আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s পার্টিশনের মাপ %(size)s মেগাবাইটের থেকে কম, যা %(productName)s-র "
+"স্বাভাবিক ইনস্টলেশনের জন্য আবশ্যক মাপের থেকেও কম।"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় ছোট (অনুমোদিত মাপ "
+"হল %(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় বড় (অনুমোদিত মাপ হল "
+"%(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "একটি boot করার যোগ্য পার্টিশন নির্মাণ করা হয়নি।"
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"কোনো swap পার্টিশন উল্লেখ করা হয়নি। swap পার্টিশন বিনা ইনস্টলেশন করার জন্য "
+"%(requiredMem)s মেগাবাইট পরিমাণ মেমরি আবশ্যক, কিন্তু শুধুমাত্র %(installedMem)s "
+"মেগাবাইট উপলব্ধ রয়েছে।"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"আপনি কোনো Swap পার্টিশন উল্লেখ করেননি।  অত্যাবশ্যক না হলেও এটি যথেষ্ট পরিমাণে "
+"সিস্টেমের কার্যদক্ষতা বৃদ্ধি করে।"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"অন্তত একটি swap ডিভাইসের ক্ষেত্রে UUID উপস্থিত  নয়। mkswap-র পুরোনো সংস্করণ সহযোগে "
+"নির্মিত swap স্থানের ক্ষেত্রে এটি একটি সাধারণ সমস্যা। /etc/fstab-র মধ্যে ডিভাইসের "
+"পাথ সহযোগে এই ডিভাইসগুলি চিহ্নিত করা হবে। বিভিন্ন পরিস্থিতিতে ডিভাইসের পাথ "
+"পরিবর্তন হতে পারে এবং এই কারণে এই পদ্ধতির ব্যবহার সরর্বোত্তম নয়।"
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"এই মাউন্ট-পয়েন্ট বৈধ নয়।  %s ডিরেক্টরিটি / ফাইল-সিস্টেমের মধ্যে স্থাপিত হওয়া আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s মাউন্ট-পয়েন্ট linux ফাইল-সিস্টেমের উপর স্থাপিত হওয়া আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -585,84 +1332,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ইনস্টলেশন উৎসস্থল থেকে তথ্য বিনিময়ের প্রস্তুতি চলছে"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "প্যাকেজ ইনস্টল করতে সমস্যা"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "নিম্নলিখিত ফাইল-সিস্টেমের মধ্যে অতিরিক্ত স্থান প্রয়োজন:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ইনস্টলেশন উৎসস্থল থেকে তথ্য বিনিময়ের প্রস্তুতি চলছে"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "প্যাকেজ ইনস্টল করতে সমস্যা"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ইনস্টলেশনের পরের ব্যবস্থাপনা"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ইনস্টলেশনের প্রস্তুতিপর্ব"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ইনস্টলেশনের পরের ব্যবস্থাপনা"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "কমান্ড-লাইন মোডে কোনো প্রশ্ন লেখা যাবে না!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ত্রুটি"
 
@@ -686,31 +1581,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -725,452 +1622,523 @@ msgstr ""
 "মেশিনে সংযোগ স্থাপন করে গ্রাফিক্যাল ইনস্টলেশন চালাতে ইচ্ছুক নাকি টেক্সট মোড "
 "ইনস্টলেশনে এগিয়ে যেতে চান?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "পাসওয়ার্ডে অন্তত ৬ অক্ষর বিশিষ্ট হওয়া আবশ্যক।"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "পাসওয়ার্ডে অন্তত ৬ অক্ষর বিশিষ্ট হওয়া আবশ্যক।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ফাইল-সিস্টেম কনফিগারেশনের সময় ধরন উল্লেখ করা হয়নি"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ইনস্টলেশনের আরম্ভ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "আপগ্রেডের পরবর্তী কনফিগারেশন সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC আরম্ভ করা হবে"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ইনস্টলেশন কর্মের প্রগতি"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ইনস্টলেশন উৎসস্থল থেকে তথ্য বিনিময়ের প্রস্তুতি চলছে"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "প্যাকেজ ইনস্টল করতে সমস্যা"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot ধারণকারী ডিভাইস"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "সফ্টওয়্যার নির্মাণ ব্যবস্থা"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "সতর্কবাণী"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1186,580 +2154,405 @@ msgstr "চলমান"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s-র ইনস্টলেশন"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "root ডিভাইসের মধ্যে নতুন ফাইল-সিস্টেম তৈরি করা আবশ্যক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "root ডিভাইসের মধ্যে নতুন ফাইল-সিস্টেম তৈরি করা আবশ্যক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "সফ্টওয়্যার নির্মাণ ব্যবস্থা"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1786,279 +2579,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ঠিকানা"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ঠিকানা"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "বাতিল(_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "সফ্টওয়্যার নির্মাণ ব্যবস্থা"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "সংগ্রহস্থল নির্ধারণ করতে সমস্যা"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "সংগ্রহস্থল নির্ধারণ করতে সমস্যা"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2066,14 +2883,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2082,128 +2899,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ঠিক আছে"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2214,68 +3052,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s মাউন্ট-পয়েন্ট linux ফাইল-সিস্টেমের উপর স্থাপিত হওয়া আবশ্যক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "root ডিভাইসের মধ্যে নতুন ফাইল-সিস্টেম তৈরি করা আবশ্যক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s নির্মাণ করা হচ্ছে, %(device)s-র মধ্যে"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2283,951 +3218,1372 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "এগিয়ে চলুন (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ঠিক আছে"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ওয়েব সার্ভার"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "কোনো নোটওয়ার্ক উপলব্ধ নেই"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "টেক্সট মোড ব্যবহার করা হবে"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ধারণক্ষমতা"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "কোনো নোটওয়ার্ক উপলব্ধ নেই"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ব্যবহারকারীর নাম"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "সংযোগ স্থাপিত হয়েছে !"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI সিস্টেম পার্টিশন"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ইনস্টলার থেকে প্রস্থান করুন (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI সিস্টেম পার্টিশন"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "এনক্রিপ্ট করা"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI সিস্টেম পার্টিশন"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "নিশ্চিত করুন"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "যোগ করুন (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "যোগ করুন (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "কর্মসঞ্চালন বিষয়ক ত্রুটি।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "কর্মসঞ্চালন বিষয়ক ত্রুটি।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3235,649 +4591,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ইনস্টলেশন চলাকালীন কী ভাষা ব্যবহার করা হবে?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "এগিয়ে চলুন (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "নিশ্চিত করুন"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ফাঁকা"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ডিভাইস"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "যোগ করুন (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "এনক্রিপ্ট করা"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "ধারণক্ষমতা"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "এনক্রিপ্ট করা"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID ডিভাইস"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "নিশ্চিত করুন"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 ঠিকানা"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI ইনিশিয়েটরের নাম উল্লেখ করা আবশ্যক"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID ডিভাইস"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ফাঁকা"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "ধারণক্ষমতা"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ডিভাইস"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "এনক্রিপ্ট করা"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI সিস্টেম পার্টিশন"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ইনস্টলেশনের পরের ব্যবস্থাপনা"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ইনস্টলেশনের প্রস্তুতিপর্ব"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "আপগ্রেডের পরবর্তী কনফিগারেশন সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "পুনরায় বুট করুন (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3891,16 +5638,16 @@ msgstr "ইনস্টল করুন"
 msgid "Install the live CD to your hard disk"
 msgstr "হার্ড-ডিস্কে লাইভ CD ইনস্টল করুন"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "হার্ড-ড্রাইভের মধ্যে ইনস্টলেশন আরম্ভ করা হচ্ছে"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3909,26 +5656,27 @@ msgstr ""
 "%s ইনস্টল করার জন্য %s MB পরিমাণ মেমরি উপস্থিত থাকা আবশ্যক, কিন্তু এই সিস্টেমের "
 "মধ্যে শুধুমাত্র %s MB মেগাবাইট উপস্থিত রয়েছে।\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s গ্রাফিক্যাল ইনস্টলারের ক্ষেত্রে %s MB মেমরি উপস্থিত থাকা আবশ্যক কিন্তু শুধুমাত্র %s "
 "MB উপলব্ধ রয়েছে।"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "পর্যাপ্ত RAM উপস্থিত নেই"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3942,24 +5690,24 @@ msgstr ""
 "\n"
 " এবং টেক্সট মোড আরম্ভ করুন।"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "টেক্সট মোড আরম্ভ করা হচ্ছে।"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ত্রুটি"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ভেরিয়েবলের মান নির্ধারণ করা হয়নি। টেক্সট মোডে আরম্ভ করা হচ্ছে।"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "গ্রাফিক্যাল ইনস্টলেশন ব্যবস্থা উপস্থিত নেই। টেক্সট মোড আরম্ভ করা হচ্ছে।"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3970,36 +5718,57 @@ msgstr ""
 "প্যাকেজ ব্যবহারকারী দ্বারা নির্ধারণ করা সম্ভব নয়।  এটির পরিবর্তে VNC মোড ব্যবহার "
 "করা হবে কি?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "হোস্ট-নেমের প্রারম্ভে 'a-z', 'A-Z' অথবা '0-9' সীমার মধ্যে বৈধ অক্ষর ব্যবহার করা "
+#~ "আবশ্যক"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "নিম্নলিখিত ফাইল-সিস্টেমের মধ্যে অতিরিক্ত স্থান প্রয়োজন:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "কমান্ড-লাইন মোডে কোনো প্রশ্ন লেখা যাবে না!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "ব্যবহারকারীর নাম"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ডিভাইস"
+
 #~ msgid "Completed"
 #~ msgstr "সম্পন্ন"
 
@@ -4048,44 +5817,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "সিস্টেমের মধ্যে ইনস্টল করুন"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "ইনস্টলেশনের সংগ্রহস্থল নির্ধারণ করতে নিম্নলিখিত সমস্যা দেখা দিয়েছে:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "ইনস্টলেশনে এগিয়ে যাওয়া যাবে না"
-
 #~ msgid "Exit installer"
 #~ msgstr "ইনস্টলার থেকে প্রস্থান"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন "
-#~ "ত্রুটির বার্তা হল:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " ইনস্টলার এখন বন্ধ করা হবে।"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "হার্ডওয়্যার সংক্রান্ত ত্রুটি দেখা দিয়েছে"
-
-#~ msgid "_Exit installer"
-#~ msgstr "ইনস্টলার থেকে প্রস্থান করুন (_E)"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4182,9 +5916,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "%r সংগ্রহস্থলের কনফিগারেশনের মধ্যে নাম অনুপস্থিত, id ব্যবহার করা হবে"
 
-#~ msgid "No Network Available"
-#~ msgstr "কোনো নোটওয়ার্ক উপলব্ধ নেই"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4192,9 +5923,6 @@ msgstr ""
 #~ "আপনার সিস্টেমে নেটওয়ার্ক সক্রিয় করতে সমস্যা দেখা দিয়েছে এবং কয়েকটি সফ্টওয়্যার "
 #~ "সংগ্রহস্থল ব্যবহারের জন্য নেটওয়ার্ক ব্যবহার করা আবশ্যক।"
 
-#~ msgid "Re_boot"
-#~ msgstr "পুনরায় বুট করুন (_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "ডিস্ক বের করুন (_E)"
 
@@ -4349,9 +6077,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "গ্রাফিক্যাল ডেস্কটপ"
 
-#~ msgid "Web Server"
-#~ msgstr "ওয়েব সার্ভার"
-
 #~ msgid "Minimal"
 #~ msgstr "ন্যুনতম"
 
@@ -4393,50 +6118,6 @@ msgstr ""
 #~ "রয়েছে যা মুছে ফেলা যাবে না।:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "কোনো root পার্টিশন (/) উল্লেখ করা হয়নি।  %s-র ইনস্টলেশন প্রক্রিয়া এগিয়ে নিয়ে "
-#~ "যাওয়ার জন্য এটি আবশ্যক।"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Root পার্টিশনের জন্য, আপনার উল্লিখিত মাপ ২৫০ মেগাবাইট %s ইনস্টলেশনের জন্য "
-#~ "অতিমাত্রায় ক্ষুদ্র।"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "এই প্ল্যাটফর্মে /boot পার্টিশনটি একটি সুনির্ধারিত পার্টিশন অথবা লজিক্যাল ভলিউমের "
-#~ "মধ্যে স্থাপিত হওয়া আবশ্যক।  /-কে একটি সুনির্দিষ্ট LVM ব্যাতীত পার্টিশনে স্থাপন করা "
-#~ "আবশ্যক।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s পার্টিশনের মাপ %(size)s মেগাবাইটের থেকে কম, যা %(productName)s-র "
-#~ "স্বাভাবিক ইনস্টলেশনের জন্য আবশ্যক মাপের থেকেও কম।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় ছোট (অনুমোদিত "
-#~ "মাপ হল %(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় বড় (অনুমোদিত মাপ "
-#~ "হল %(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4453,52 +6134,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "বুট-লোডার স্টেজ ১ টার্গেট ডিভাইস তৈরি করা হয়নি"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "একটি boot করার যোগ্য পার্টিশন নির্মাণ করা হয়নি।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "কোনো swap পার্টিশন উল্লেখ করা হয়নি। swap পার্টিশন বিনা ইনস্টলেশন করার জন্য "
-#~ "%(requiredMem)s মেগাবাইট পরিমাণ মেমরি আবশ্যক, কিন্তু শুধুমাত্র %(installedMem)s "
-#~ "মেগাবাইট উপলব্ধ রয়েছে।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "আপনি কোনো Swap পার্টিশন উল্লেখ করেননি।  অত্যাবশ্যক না হলেও এটি যথেষ্ট পরিমাণে "
-#~ "সিস্টেমের কার্যদক্ষতা বৃদ্ধি করে।"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "অন্তত একটি swap ডিভাইসের ক্ষেত্রে UUID উপস্থিত  নয়। mkswap-র পুরোনো সংস্করণ "
-#~ "সহযোগে নির্মিত swap স্থানের ক্ষেত্রে এটি একটি সাধারণ সমস্যা। /etc/fstab-র মধ্যে "
-#~ "ডিভাইসের পাথ সহযোগে এই ডিভাইসগুলি চিহ্নিত করা হবে। বিভিন্ন পরিস্থিতিতে "
-#~ "ডিভাইসের পাথ পরিবর্তন হতে পারে এবং এই কারণে এই পদ্ধতির ব্যবহার সরর্বোত্তম নয়।"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "এই মাউন্ট-পয়েন্ট বৈধ নয়।  %s ডিরেক্টরিটি / ফাইল-সিস্টেমের মধ্যে স্থাপিত হওয়া "
-#~ "আবশ্যক।"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s মাউন্ট-পয়েন্ট linux ফাইল-সিস্টেমের উপর স্থাপিত হওয়া আবশ্যক।"
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
-#~ msgstr[1] "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux-র সাথে ব্যবহারের উদ্দেশ্যে %d DASD ডিভাইস প্রস্তুত করা হচ্ছে..."
diff --git a/anaconda/po/bn_IN.po b/anaconda/po/bn_IN.po
index 5e62922..eea7423 100644
--- a/anaconda/po/bn_IN.po
+++ b/anaconda/po/bn_IN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
@@ -26,11 +26,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ফাইল-সিস্টেম"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -39,7 +39,7 @@ msgstr ""
 "'%s' সহ RAID সংকলনের ক্ষেত্রে নিম্নলিখিত raid-র স্তরের মধ্যে একটি স্তর থাকা আবশ্যক: "
 "%s"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -48,7 +48,7 @@ msgstr ""
 "'%s' সহ RAID সংকলনের ক্ষেত্রে নিম্নলিখিত মিটা-ডাটা সংকলনের মধ্যে একটি  থাকা "
 "আবশ্যক: %s"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -56,186 +56,450 @@ msgid ""
 msgstr ""
 "'%s' সহ RAID সংকলনের ক্ষেত্রে নিম্নলিখিত একটি ধরনের ডিভাইস  থাকা আবশ্যক: %s"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s-র ক্ষেত্রে নিম্নলিখিত একটি ধরনের ডিস্ক লেবেল উপস্থিত থাকা আবশ্যক: %s"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s-টি %s ধরনের হওয়া অনুচিত।"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s-র মাপ %d থেকে %d মেগাবাইটের মধ্যে সীমাবদ্ধ রাখা আবশ্যক।"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s-র মাপ %d মেগাবাইটের থেকে বেশি হওয়া আবশ্যক।"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s-র মাপ %d মেগাবাইটের কম হওয়া আবশ্যক।"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s, ডিস্কের প্রথম %d মেগাবাইট অংশের মধ্যে উপস্থিত থাকা আবশ্যক।"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s-কে এনক্রিপ্ট করা ব্লক ডিভাইসের উপর স্থাপন করা যাবে না।"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s-টি %s ধরনের হওয়া অনুচিত।"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC আরম্ভ করা হবে"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "টেক্সট মোড ব্যবহার করা হবে"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"ইনস্টলেশনের সংগ্রহস্থল নির্ধারণ করতে নিম্নলিখিত সমস্যা দেখা দিয়েছে:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ইনস্টলেশনে এগিয়ে যাওয়া যাবে না"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"ইনস্টলেশনের সংগ্রহস্থল নির্ধারণ করতে নিম্নলিখিত সমস্যা দেখা দিয়েছে:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ইনস্টলেশনে এগিয়ে যাওয়া যাবে না"
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন ত্রুটির "
+"বার্তা হল:\n"
+"\n"
+"%s.\n"
+"\n"
+" ইনস্টলার এখন বন্ধ করা হবে।"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন ত্রুটির "
+"বার্তা হল:\n"
+"\n"
+"%s.\n"
+"\n"
+" ইনস্টলার এখন বন্ধ করা হবে।"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "হার্ডওয়্যার সংক্রান্ত ত্রুটি দেখা দিয়েছে"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন ত্রুটির "
+"বার্তা হল:\n"
+"\n"
+"%s.\n"
+"\n"
+" ইনস্টলার এখন বন্ধ করা হবে।"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ইনস্টলেশনের প্রাক্কালের স্ক্রিপ্ট সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ইনস্টলেশন আরম্ভ করা হচ্ছে"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "ইনস্টলেশনের পরের কনফিগারেশন সঞ্চালিত হচ্ছে..."
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -247,87 +511,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ইনস্টলেশনের প্রাক্কালের স্ক্রিপ্ট সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "হোস্ট-নেম ২৫৫ অক্ষরের মধ্যে সীমাবদ্ধ রাখা আবশ্যক।"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"হোস্ট-নেমের প্রারম্ভে 'a-z', 'A-Z' অথবা '0-9' সীমার মধ্যে বৈধ অক্ষর ব্যবহার করা "
-"আবশ্যক"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -336,7 +890,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s-র ইনস্টলেশন"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "কর্ম সমাপ্ত হলে %s সঞ্চালন করে সিস্টেমটি আন-মাউন্ট করুন।"
@@ -349,8 +908,8 @@ msgstr "কর্ম সম্পন্ন হলে, শেল থেকে প
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "সঞ্চালনযোগ্য /bin/sh ফাইল পাওয়া যায়নি!  শেল আরম্ভ করা হবে না"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescue"
 
@@ -388,21 +947,15 @@ msgstr "উদ্ধার করার জন্য চিহ্নিত স
 msgid "Which device holds the root partition of your installation?"
 msgstr "আপনার সিস্টেমের root পার্টিশন ধারণকারী ডিভাইস কোনটি?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ঠিক আছে"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "প্রস্থান"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "শেল থেকে প্রস্থান করলে সিস্টেমটি স্বয়ংক্রিয়ভাবে পুনরায় বুট করা হবে।"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -412,7 +965,7 @@ msgstr ""
 "চালিয়ে ফাইল-সিস্টেমের সমস্যাসমাধান করে সেগুলি মাউন্ট করার জন্য কি-বোর্ড থেকে "
 "Return চেপে একটি শেল চালু করুন। %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -433,7 +986,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -446,28 +999,222 @@ msgstr ""
 "\n"
 "শেল আরম্ভ করতে কি-বোর্ড থেকে &lt;return&gt; চাপুন।"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "কোনো Linux পার্টিশন উপস্থিত নেই।  পুনরায় বুট করা হচ্ছে।\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "শেল থেকে প্রস্থান করলে সিস্টেমটি স্বয়ংক্রিয়ভাবে পুনরায় বুট করা হবে।"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "রেসকিউ (rescue) মোড"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "কোনো Linux পার্টিশন উপস্থিত নেই।  return টিপে শেল প্রাপ্ত করুন। %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "আপনার সিস্টেম %s ডিরেক্টরির অধীন মাউন্ট করা হয়েছে।"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Root পার্টিশনের জন্য, আপনার উল্লিখিত মাপ ২৫০ মেগাবাইট %s ইনস্টলেশনের জন্য "
+"অতিমাত্রায় ক্ষুদ্র।"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"কোনো root পার্টিশন (/) উল্লেখ করা হয়নি।  %s-র ইনস্টলেশন প্রক্রিয়া এগিয়ে নিয়ে "
+"যাওয়ার জন্য এটি আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"এই প্ল্যাটফর্মে /boot পার্টিশনটি একটি সুনির্ধারিত পার্টিশন অথবা লজিক্যাল ভলিউমের "
+"মধ্যে স্থাপিত হওয়া আবশ্যক।  /-কে একটি সুনির্দিষ্ট LVM ব্যাতীত পার্টিশনে স্থাপন করা "
+"আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s পার্টিশনের মাপ %(size)s মেগাবাইটের থেকে কম, যা %(productName)s-র "
+"স্বাভাবিক ইনস্টলেশনের জন্য আবশ্যক মাপের থেকেও কম।"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় ছোট (অনুমোদিত মাপ "
+"হল %(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় বড় (অনুমোদিত মাপ হল "
+"%(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "একটি boot করার যোগ্য পার্টিশন নির্মাণ করা হয়নি।"
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"কোনো swap পার্টিশন উল্লেখ করা হয়নি। swap পার্টিশন বিনা ইনস্টলেশন করার জন্য "
+"%(requiredMem)s মেগাবাইট পরিমাণ মেমরি আবশ্যক, কিন্তু শুধুমাত্র %(installedMem)s "
+"মেগাবাইট উপলব্ধ রয়েছে।"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"আপনি কোনো Swap পার্টিশন উল্লেখ করেননি।  অত্যাবশ্যক না হলেও এটি যথেষ্ট পরিমাণে "
+"সিস্টেমের কার্যদক্ষতা বৃদ্ধি করে।"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"অন্তত একটি swap ডিভাইসের ক্ষেত্রে UUID উপস্থিত  নয়। mkswap-র পুরোনো সংস্করণ সহযোগে "
+"নির্মিত swap স্থানের ক্ষেত্রে এটি একটি সাধারণ সমস্যা। /etc/fstab-র মধ্যে ডিভাইসের "
+"পাথ সহযোগে এই ডিভাইসগুলি চিহ্নিত করা হবে। বিভিন্ন পরিস্থিতিতে ডিভাইসের পাথ "
+"পরিবর্তন হতে পারে এবং এই কারণে এই পদ্ধতির ব্যবহার সরর্বোত্তম নয়।"
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"এই মাউন্ট-পয়েন্ট বৈধ নয়।  %s ডিরেক্টরিটি / ফাইল-সিস্টেমের মধ্যে স্থাপিত হওয়া আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s মাউন্ট-পয়েন্ট linux ফাইল-সিস্টেমের উপর স্থাপিত হওয়া আবশ্যক।"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -580,84 +1327,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ইনস্টলেশন উৎসস্থল থেকে তথ্য বিনিময়ের প্রস্তুতি চলছে"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "প্যাকেজ ইনস্টল করতে সমস্যা"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "নিম্নলিখিত ফাইল-সিস্টেমের মধ্যে অতিরিক্ত স্থান প্রয়োজন:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ইনস্টলেশন উৎসস্থল থেকে তথ্য বিনিময়ের প্রস্তুতি চলছে"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "প্যাকেজ ইনস্টল করতে সমস্যা"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ইনস্টলেশনের পরের ব্যবস্থাপনা"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ইনস্টলেশনের প্রস্তুতিপর্ব"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ইনস্টলেশনের পরের ব্যবস্থাপনা"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "কমান্ড-লাইন মোডে কোনো প্রশ্ন লেখা যাবে না!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ত্রুটি"
 
@@ -681,31 +1576,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -720,452 +1617,523 @@ msgstr ""
 "মেশিনে সংযোগ স্থাপন করে গ্রাফিক্যাল ইনস্টলেশন চালাতে ইচ্ছুক নাকি টেক্সট মোড "
 "ইনস্টলেশনে এগিয়ে যেতে চান?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "পাসওয়ার্ডে অন্তত ৬ অক্ষর বিশিষ্ট হওয়া আবশ্যক।"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "পাসওয়ার্ডে অন্তত ৬ অক্ষর বিশিষ্ট হওয়া আবশ্যক।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ফাইল-সিস্টেম কনফিগারেশনের সময় ধরন উল্লেখ করা হয়নি"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ইনস্টলেশনের আরম্ভ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "আপগ্রেডের পরবর্তী কনফিগারেশন সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC আরম্ভ করা হবে"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ইনস্টলেশন কর্মের প্রগতি"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ইনস্টলেশন উৎসস্থল থেকে তথ্য বিনিময়ের প্রস্তুতি চলছে"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "প্যাকেজ ইনস্টল করতে সমস্যা"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot ধারণকারী ডিভাইস"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "সফ্টওয়্যার নির্মাণ ব্যবস্থা"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "সতর্কবাণী"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1181,580 +2149,405 @@ msgstr "চলমান"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s-র ইনস্টলেশন"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "root ডিভাইসের মধ্যে নতুন ফাইল-সিস্টেম তৈরি করা আবশ্যক।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "root ডিভাইসের মধ্যে নতুন ফাইল-সিস্টেম তৈরি করা আবশ্যক।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "সফ্টওয়্যার নির্মাণ ব্যবস্থা"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1781,279 +2574,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ঠিকানা"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ঠিকানা"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "বাতিল(_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "সফ্টওয়্যার নির্মাণ ব্যবস্থা"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "সংগ্রহস্থল নির্ধারণ করতে সমস্যা"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "সংগ্রহস্থল নির্ধারণ করতে সমস্যা"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2061,14 +2878,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2077,128 +2894,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ঠিক আছে"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2209,68 +3047,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s মাউন্ট-পয়েন্ট linux ফাইল-সিস্টেমের উপর স্থাপিত হওয়া আবশ্যক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "root ডিভাইসের মধ্যে নতুন ফাইল-সিস্টেম তৈরি করা আবশ্যক।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s নির্মাণ করা হচ্ছে, %(device)s-র মধ্যে"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2278,951 +3213,1372 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "এগিয়ে চলুন (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ঠিক আছে"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ওয়েব সার্ভার"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "কোনো নোটওয়ার্ক উপলব্ধ নেই"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "টেক্সট মোড ব্যবহার করা হবে"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ধারণক্ষমতা"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "কোনো নোটওয়ার্ক উপলব্ধ নেই"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ব্যবহারকারীর নাম"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "সংযোগ স্থাপিত হয়েছে !"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI সিস্টেম পার্টিশন"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ইনস্টলার থেকে প্রস্থান করুন (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI সিস্টেম পার্টিশন"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "এনক্রিপ্ট করা"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI সিস্টেম পার্টিশন"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "নিশ্চিত করুন"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "যোগ করুন (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "যোগ করুন (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "কর্মসঞ্চালন বিষয়ক ত্রুটি।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "কর্মসঞ্চালন বিষয়ক ত্রুটি।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3230,649 +4586,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ইনস্টলেশন চলাকালীন কী ভাষা ব্যবহার করা হবে?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "এগিয়ে চলুন (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "নিশ্চিত করুন"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ফাঁকা"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ডিভাইস"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "যোগ করুন (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "এনক্রিপ্ট করা"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "ধারণক্ষমতা"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID ডিভাইস"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "এনক্রিপ্ট করা"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID ডিভাইস"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "নিশ্চিত করুন"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 ঠিকানা"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI ইনিশিয়েটরের নাম উল্লেখ করা আবশ্যক"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ব্যবহারকারীর নাম"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID ডিভাইস"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ফাঁকা"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "ধারণক্ষমতা"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "ব্যবহারকারীর নাম"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ডিভাইস"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "এনক্রিপ্ট করা"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "নিশ্চিত করুন"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ঠিক আছে"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "বাতিল(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI সিস্টেম পার্টিশন"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ইনস্টলেশনের পরের ব্যবস্থাপনা"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ইনস্টলেশনের প্রস্তুতিপর্ব"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "আপগ্রেডের পরবর্তী কনফিগারেশন সঞ্চালিত হচ্ছে"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "পুনরায় বুট করুন (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3886,16 +5633,16 @@ msgstr "ইনস্টল করুন"
 msgid "Install the live CD to your hard disk"
 msgstr "হার্ড-ডিস্কে লাইভ CD ইনস্টল করুন"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "হার্ড-ড্রাইভের মধ্যে ইনস্টলেশন আরম্ভ করা হচ্ছে"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3904,26 +5651,27 @@ msgstr ""
 "%s ইনস্টল করার জন্য %s MB পরিমাণ মেমরি উপস্থিত থাকা আবশ্যক, কিন্তু এই সিস্টেমের "
 "মধ্যে শুধুমাত্র %s MB মেগাবাইট উপস্থিত রয়েছে।\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s গ্রাফিক্যাল ইনস্টলারের ক্ষেত্রে %s MB মেমরি উপস্থিত থাকা আবশ্যক কিন্তু শুধুমাত্র %s "
 "MB উপলব্ধ রয়েছে।"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "পর্যাপ্ত RAM উপস্থিত নেই"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3937,24 +5685,24 @@ msgstr ""
 "\n"
 " এবং টেক্সট মোড আরম্ভ করুন।"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "টেক্সট মোড আরম্ভ করা হচ্ছে।"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ত্রুটি"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ভেরিয়েবলের মান নির্ধারণ করা হয়নি। টেক্সট মোডে আরম্ভ করা হচ্ছে।"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "গ্রাফিক্যাল ইনস্টলেশন ব্যবস্থা উপস্থিত নেই। টেক্সট মোড আরম্ভ করা হচ্ছে।"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3965,36 +5713,57 @@ msgstr ""
 "প্যাকেজ ব্যবহারকারী দ্বারা নির্ধারণ করা সম্ভব নয়।  এটির পরিবর্তে VNC মোড ব্যবহার "
 "করা হবে কি?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "হোস্ট-নেমের প্রারম্ভে 'a-z', 'A-Z' অথবা '0-9' সীমার মধ্যে বৈধ অক্ষর ব্যবহার করা "
+#~ "আবশ্যক"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "নিম্নলিখিত ফাইল-সিস্টেমের মধ্যে অতিরিক্ত স্থান প্রয়োজন:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "কমান্ড-লাইন মোডে কোনো প্রশ্ন লেখা যাবে না!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "ব্যবহারকারীর নাম"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ডিভাইস"
+
 #~ msgid "Completed"
 #~ msgstr "সম্পন্ন"
 
@@ -4043,44 +5812,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "সিস্টেমের মধ্যে ইনস্টল করুন"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "ইনস্টলেশনের সংগ্রহস্থল নির্ধারণ করতে নিম্নলিখিত সমস্যা দেখা দিয়েছে:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "ইনস্টলেশনে এগিয়ে যাওয়া যাবে না"
-
 #~ msgid "Exit installer"
 #~ msgstr "ইনস্টলার থেকে প্রস্থান"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "সম্ভবত হার্ডওয়্যারের সমস্যার কারণে ইনস্টলেশন বন্ধ করা হয়েছে। এই ক্ষেত্রে উৎপন্ন "
-#~ "ত্রুটির বার্তা হল:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " ইনস্টলার এখন বন্ধ করা হবে।"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "হার্ডওয়্যার সংক্রান্ত ত্রুটি দেখা দিয়েছে"
-
-#~ msgid "_Exit installer"
-#~ msgstr "ইনস্টলার থেকে প্রস্থান করুন (_E)"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4177,9 +5911,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "%r সংগ্রহস্থলের কনফিগারেশনের মধ্যে নাম অনুপস্থিত, id ব্যবহার করা হবে"
 
-#~ msgid "No Network Available"
-#~ msgstr "কোনো নোটওয়ার্ক উপলব্ধ নেই"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4187,9 +5918,6 @@ msgstr ""
 #~ "আপনার সিস্টেমে নেটওয়ার্ক সক্রিয় করতে সমস্যা দেখা দিয়েছে এবং কয়েকটি সফ্টওয়্যার "
 #~ "সংগ্রহস্থল ব্যবহারের জন্য নেটওয়ার্ক ব্যবহার করা আবশ্যক।"
 
-#~ msgid "Re_boot"
-#~ msgstr "পুনরায় বুট করুন (_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "ডিস্ক বের করুন (_E)"
 
@@ -4344,9 +6072,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "গ্রাফিক্যাল ডেস্কটপ"
 
-#~ msgid "Web Server"
-#~ msgstr "ওয়েব সার্ভার"
-
 #~ msgid "Minimal"
 #~ msgstr "ন্যুনতম"
 
@@ -4388,50 +6113,6 @@ msgstr ""
 #~ "রয়েছে যা মুছে ফেলা যাবে না।:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "কোনো root পার্টিশন (/) উল্লেখ করা হয়নি।  %s-র ইনস্টলেশন প্রক্রিয়া এগিয়ে নিয়ে "
-#~ "যাওয়ার জন্য এটি আবশ্যক।"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Root পার্টিশনের জন্য, আপনার উল্লিখিত মাপ ২৫০ মেগাবাইট %s ইনস্টলেশনের জন্য "
-#~ "অতিমাত্রায় ক্ষুদ্র।"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "এই প্ল্যাটফর্মে /boot পার্টিশনটি একটি সুনির্ধারিত পার্টিশন অথবা লজিক্যাল ভলিউমের "
-#~ "মধ্যে স্থাপিত হওয়া আবশ্যক।  /-কে একটি সুনির্দিষ্ট LVM ব্যাতীত পার্টিশনে স্থাপন করা "
-#~ "আবশ্যক।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s পার্টিশনের মাপ %(size)s মেগাবাইটের থেকে কম, যা %(productName)s-র "
-#~ "স্বাভাবিক ইনস্টলেশনের জন্য আবশ্যক মাপের থেকেও কম।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় ছোট (অনুমোদিত "
-#~ "মাপ হল %(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s পার্টিশনটি %(format)s ফরম্যাটিংয়ের জন্য অতি মাত্রায় বড় (অনুমোদিত মাপ "
-#~ "হল %(minSize)d মেগাবাইট থেকে %(maxSize)d মেগাবাইট পর্যন্ত)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4448,52 +6129,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "বুট-লোডার স্টেজ ১ টার্গেট ডিভাইস তৈরি করা হয়নি"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "একটি boot করার যোগ্য পার্টিশন নির্মাণ করা হয়নি।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "কোনো swap পার্টিশন উল্লেখ করা হয়নি। swap পার্টিশন বিনা ইনস্টলেশন করার জন্য "
-#~ "%(requiredMem)s মেগাবাইট পরিমাণ মেমরি আবশ্যক, কিন্তু শুধুমাত্র %(installedMem)s "
-#~ "মেগাবাইট উপলব্ধ রয়েছে।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "আপনি কোনো Swap পার্টিশন উল্লেখ করেননি।  অত্যাবশ্যক না হলেও এটি যথেষ্ট পরিমাণে "
-#~ "সিস্টেমের কার্যদক্ষতা বৃদ্ধি করে।"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "অন্তত একটি swap ডিভাইসের ক্ষেত্রে UUID উপস্থিত  নয়। mkswap-র পুরোনো সংস্করণ "
-#~ "সহযোগে নির্মিত swap স্থানের ক্ষেত্রে এটি একটি সাধারণ সমস্যা। /etc/fstab-র মধ্যে "
-#~ "ডিভাইসের পাথ সহযোগে এই ডিভাইসগুলি চিহ্নিত করা হবে। বিভিন্ন পরিস্থিতিতে "
-#~ "ডিভাইসের পাথ পরিবর্তন হতে পারে এবং এই কারণে এই পদ্ধতির ব্যবহার সরর্বোত্তম নয়।"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "এই মাউন্ট-পয়েন্ট বৈধ নয়।  %s ডিরেক্টরিটি / ফাইল-সিস্টেমের মধ্যে স্থাপিত হওয়া "
-#~ "আবশ্যক।"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s মাউন্ট-পয়েন্ট linux ফাইল-সিস্টেমের উপর স্থাপিত হওয়া আবশ্যক।"
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
-#~ msgstr[1] "DASD ডিভাইস ফরম্যাট করা হচ্ছে"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux-র সাথে ব্যবহারের উদ্দেশ্যে %d DASD ডিভাইস প্রস্তুত করা হচ্ছে..."
diff --git a/anaconda/po/bs.po b/anaconda/po/bs.po
index 33f88f9..3dbd2f7 100644
--- a/anaconda/po/bs.po
+++ b/anaconda/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/fedora/language/"
@@ -23,208 +23,441 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Pokreni VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Upotrijebi tekstualan način"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "U redu"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -233,85 +466,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -320,7 +845,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -334,8 +864,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Spašavanje"
 
@@ -373,28 +903,22 @@ msgstr "Sustav za spašavanje"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "U redu"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Izlaz"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -407,7 +931,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -416,28 +940,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Spašavanje"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Vašem se sistemu pristupa iz mape %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Particija 'root' manja je od 250 MB, što je najčešće premalo za instalaciju "
+"%s-a."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Niste odredili korijensku particiju 'root ' (/), potrebnu za nastavak "
+"instalacije %s-a."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Particija 'root' manja je od 250 MB, što je najčešće premalo za instalaciju "
+"%s-a."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Niste odredili razmjensku particiju. Iako nije strogo zahtijevana u svim "
+"slučajevima, može značajno unaprijediti izvršavanje većine instaliranih "
+"sistema."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -529,84 +1233,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Na sljedećim datotečnim sistemima potreban je dodatan prostor:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "stariji paketi"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Napredovanje instalacije"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Napredovanje instalacije"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "U naredbenom retku ne može biti pitanje!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Greška"
 
@@ -630,31 +1481,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -669,447 +1522,520 @@ msgstr ""
 "ovaj računar povezali s drugog računara i izveli instalaciju pomoću "
 "grafičkog sučelja ili želite nastaviti u tekstualnom načinu?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Lozinka mora sadržavati najmanje 6 znakova."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Lozinka mora sadržavati najmanje 6 znakova."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Napredovanje instalacije"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Pokreni VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Napredovanje instalacije"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Razvoj softvera"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Upozorenje"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1125,581 +2051,408 @@ msgstr "U toku"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Razvoj softvera"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1726,277 +2479,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Razvoj softvera"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2004,14 +2781,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2020,33 +2797,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2054,95 +2837,109 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "U redu"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2154,68 +2951,163 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2224,945 +3116,1349 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Nastavi"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "U redu"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Upotrijebi tekstualan način"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Povezano!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Izlaz iz instalacije"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Upozorenje"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3170,643 +4466,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Koji jezik želite upotrebljavati tijekom instalacijskog postupka?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Slobodno"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID uređaj"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Dodaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Slobodno"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Napredovanje instalacije"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "_Ponovo pokreni"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3820,16 +5479,16 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3838,25 +5497,26 @@ msgstr ""
 "%s zahtjeva %s MB memorije za instalaciju dok Vi imate samo %s MB na ovom "
 "računaru.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s grafički instalator zahtjeva %s MB memorije dok Vi imate samo %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nema dovoljno RAM memorije"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3870,69 +5530,76 @@ msgstr ""
 "\n"
 " sa root terminala."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Pokrećem tekstualni način."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Greška"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY varijabla nije postavljena. Pokrećem tekstualni način."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafička instalacija nije dostupna. Pokrećem tekstualni način."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Na sljedećim datotečnim sistemima potreban je dodatan prostor:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "U naredbenom retku ne može biti pitanje!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID uređaj"
+
 #~ msgid "Completed"
 #~ msgstr "Dovršeno"
 
 #~ msgid "Install on System"
 #~ msgstr "Instaliraj na sistem"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Izlaz iz instalacije"
-
 #~ msgid "'%s' is not a valid IPv6 address."
 #~ msgstr "'%s' nije ispravna IPv6 adresa."
 
@@ -3951,9 +5618,6 @@ msgstr ""
 #~ msgstr[1] "%s bajt"
 #~ msgstr[2] "%s bajt"
 
-#~ msgid "Re_boot"
-#~ msgstr "_Ponovo pokreni"
-
 #~ msgid "_Retry"
 #~ msgstr "_Ponovi"
 
@@ -3963,9 +5627,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "konflikt datoteka"
 
-#~ msgid "older package(s)"
-#~ msgstr "stariji paketi"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "nedovoljan prostor na disku"
 
@@ -4003,20 +5664,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Particiju LDL oblikovanog DADS-a nije moguće izbrisati."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Niste odredili korijensku particiju 'root ' (/), potrebnu za nastavak "
-#~ "instalacije %s-a."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Particija 'root' manja je od 250 MB, što je najčešće premalo za "
-#~ "instalaciju %s-a."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4030,15 +5677,6 @@ msgstr ""
 #~ "Instaliranje na FireWire uređaj.  Ovaj postupak ne mora proizvesti "
 #~ "funkcionalan sistem."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Niste odredili razmjensku particiju. Iako nije strogo zahtijevana u svim "
-#~ "slučajevima, može značajno unaprijediti izvršavanje većine instaliranih "
-#~ "sistema."
-
 #~ msgid "Back"
 #~ msgstr "Povratak"
 
diff --git a/anaconda/po/ca.po b/anaconda/po/ca.po
index d0203eb..51149f7 100644
--- a/anaconda/po/ca.po
+++ b/anaconda/po/ca.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot sistema de fitxers"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -37,7 +37,7 @@ msgstr ""
 "Els conjunts RAID que contenen «%s» han de tenir un dels nivells següents "
 "raid: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -46,7 +46,7 @@ msgstr ""
 "Els conjunts RAID que contenen «%s» han de tenir una de les versions "
 "següents de les metadades: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -55,186 +55,450 @@ msgstr ""
 "Els conjunts RAID que contenen «%s» han de tenir un dels tipus següents de "
 "dispositius: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s ha de tenir un de les tipus següents  de etiquetes de disc: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s no pot ser del tipus %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s ha d'estar entre %d i %d MB de mida"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s no pot ser més petit que %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s no pot ser més gran que %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s ha d'estar dins dels primers %dMB del disc."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s no pot estar en un dispositiu de bloc encriptat."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s no pot ser del tipus %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Inicia VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Fes servir mode text"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "D'acord"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"S'ha produït el següent error en configurar el repositori d'instal·lació:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"La instal·lació no pot continuar."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"S'ha produït el següent error en configurar el repositori d'instal·lació:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"La instal·lació no pot continuar."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"La instal·lació s'ha aturat pel que sembla un problema de maquinari. El "
+"missatge d'error exacte és:\n"
+"\n"
+"%s.\n"
+"\n"
+"La instal·lació finalitzarà ara."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"La instal·lació s'ha aturat pel que sembla un problema de maquinari. El "
+"missatge d'error exacte és:\n"
+"\n"
+"%s.\n"
+"\n"
+"La instal·lació finalitzarà ara."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "S'ha trobat un error de maquinari"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"La instal·lació s'ha aturat pel que sembla un problema de maquinari. El "
+"missatge d'error exacte és:\n"
+"\n"
+"%s.\n"
+"\n"
+"La instal·lació finalitzarà ara."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "S'estan executant les seqüències prèvies a la instal·lació"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "S'està iniciant el procés d'instal·lació"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "S'està realitzant la configuració posterior a la instal·lació"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -243,87 +507,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "S'estan executant les seqüències prèvies a la instal·lació"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "El nom de l'ordinador no pot tenir més de 255 caràcters."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"El nom de l'ordinador ha de començar amb un caràcter vàlid dins el rang 'a-"
-"z', 'A-Z' o 0-9"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -332,7 +886,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -346,8 +905,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "No s'ha pogut executar /bin/sh. No s'iniciarà la línia d'ordres"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescat"
 
@@ -385,29 +944,23 @@ msgstr "Sistema per rescatar"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Quin dispositiu conté la partició arrel de la instal·lació?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "D'acord"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Surt"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "El sistema es reiniciarà automàticament quan sortiu de l'intèrpret d'ordres."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -420,7 +973,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -429,29 +982,211 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "No teniu cap partició Linux. Es reiniciarà.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " El sistema es reiniciarà automàticament quan sortiu de l'intèrpret d'ordres."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mode de rescat"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "S'ha muntat el sistema sota el directori %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"La partició arrel té menys de 250 MB, normalment massa petita per instal·lar-"
+"hi %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"No s'ha definit cap partició arrel (/), necessària per poder continuar la "
+"instal·lació de %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"La partició arrel té menys de 250 MB, normalment massa petita per instal·lar-"
+"hi %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "No heu creat una partició d'arrencada."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"No s'ha especificat cap partició d'intercanvi. Tot i que no és estrictament "
+"necessària en tots els casos, milloraria significativament el rendiment en "
+"la majoria d'instal·lacions."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Aquest punt de muntatge és invàlid. El directori %s ha d'estar en el sistema "
+"de fitxers /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "El punt de muntatge %s ha d'estar a un sistema de fitxers de linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -562,84 +1297,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "S'està preparant la transacció de la font de la instal·lació"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "S'ha produït un error en instal·lar el paquet"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Necessiteu més espai en els següents sistemes de fitxer:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "S'està preparant la transacció de la font de la instal·lació"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "S'ha produït un error en instal·lar el paquet"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instal·lació posterior"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "S'està preparant la instal·lació"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Instal·lació posterior"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "No es poden fer preguntes en mode de línia d'ordres"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Error"
 
@@ -663,31 +1546,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -702,452 +1587,523 @@ msgstr ""
 "vos a aquest ordinador a través d'una altre màquina, i fer una instal·lació "
 "gràfica, o voleu continuar la instal·lació en mode text?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "La contrasenya ha de tenir almenys sis caràcters."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "La contrasenya ha de tenir almenys sis caràcters."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "manca un tipus a la configuració del sistema de fitxers"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "S'està iniciant la instal·lació"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "S'està realitzant la configuració posterior a l'actualització"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Inicia VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progrés de la instal·lació"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "S'està preparant la transacció de la font de la instal·lació"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "S'ha produït un error en instal·lar el paquet"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "el dispositiu que conté /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Desenvolupament de programari"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Avís"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1163,580 +2119,405 @@ msgstr "En progrés"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Desenvolupament de programari"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1763,279 +2544,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Cancel·la"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Desenvolupament de programari"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "S'ha produït un error en establir el repositori"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "S'ha produït un error en establir el repositori"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2043,14 +2848,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2059,128 +2864,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "D'acord"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2191,68 +3016,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "El punt de muntatge %s ha d'estar a un sistema de fitxers de linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "S'està creant %(type)s a %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2260,951 +3182,1372 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continua"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "D'acord"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Servidor web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Confirmeu"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Xarxa no disponible"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Fes servir mode text"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacitat"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispositiu RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Afegeix"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Confirmeu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Xarxa no disponible"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Confirmeu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Confirmeu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Confirmeu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nom d'usuari"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Connectat"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Partició del sistema EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Surt de l'instal·lador"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Partició del sistema EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Encriptat"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Partició del sistema EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Afegeix"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "D'acord"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirmeu"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Afegeix"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "D'acord"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispositiu RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Afegeix"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "S'ha produït un error en l'operació."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "S'ha produït un error en l'operació."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3212,648 +4555,1038 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Quin idioma voleu fer servir durant el procés d'instal·lació?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continua"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Confirmeu"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Lliure"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dispositiu RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Afegeix"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Encriptat"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Capacitat"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Dispositiu RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Dispositiu RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Encriptat"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Dispositiu RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Confirmeu"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "D'acord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Heu de proporcionar un nom d'iniciador iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nom d'usuari"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "D'acord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispositiu RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Lliure"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Capacitat"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nom d'usuari"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispositiu RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Encriptat"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "D'acord"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirmeu"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "D'acord"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Partició del sistema EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Instal·lació posterior"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "S'està preparant la instal·lació"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "S'està realitzant la configuració posterior a l'actualització"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Arrenca de _nou"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3867,16 +5600,16 @@ msgstr "_Instal·la"
 msgid "Install the live CD to your hard disk"
 msgstr "Instal·la el CD en el vostre disc dur"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3885,25 +5618,26 @@ msgstr ""
 "%s requereix %s MB de memòria per instal·lar-se, però només disposeu de %s "
 "MB en aquesta màquina.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "L'instal·lador gràfic %s requereix %s MB de memòria, però només teniu %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "No hi ha prou memòria RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3917,25 +5651,25 @@ msgstr ""
 "\n"
 "des d'una terminal com a usuari primari."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "S'està iniciant en mode text."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Error"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "No s'ha establert la variable DISPLAY. S'iniciarà el mode text."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 "La instal·lació gràfica no està disponible. S'està iniciant el mode text."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3946,36 +5680,57 @@ msgstr ""
 "permet especificar una disposició pròpia de les particions o seleccionar "
 "paquets. Voleu utilitzar el mode VNC en comptes del mode de text?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "El nom de l'ordinador ha de començar amb un caràcter vàlid dins el rang "
+#~ "'a-z', 'A-Z' o 0-9"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Necessiteu més espai en els següents sistemes de fitxer:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "No es poden fer preguntes en mode de línia d'ordres"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Nom d'usuari"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispositiu RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Completat"
 
@@ -4007,45 +5762,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "Instal·la al sistema"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "S'ha produït el següent error en configurar el repositori "
-#~ "d'instal·lació:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "La instal·lació no pot continuar."
-
 #~ msgid "Exit installer"
 #~ msgstr "Surt de l'instal·lador"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "La instal·lació s'ha aturat pel que sembla un problema de maquinari. El "
-#~ "missatge d'error exacte és:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "La instal·lació finalitzarà ara."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "S'ha trobat un error de maquinari"
-
-#~ msgid "_Exit installer"
-#~ msgstr "_Surt de l'instal·lador"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Falta l'adreça IP."
 
@@ -4102,9 +5821,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Al repositori %r li manca el nom en la configuració, es farà servir l'id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Xarxa no disponible"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4112,9 +5828,6 @@ msgstr ""
 #~ "Alguns dels vostres repositoris necessiten accés per xarxa, però s'ha "
 #~ "produït un error en habilitar la xarxa en el sistema."
 
-#~ msgid "Re_boot"
-#~ msgstr "Arrenca de _nou"
-
 #~ msgid "_Eject"
 #~ msgstr "_Expulsa"
 
@@ -4258,9 +5971,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Escriptori gràfic"
 
-#~ msgid "Web Server"
-#~ msgstr "Servidor web"
-
 #~ msgid "Minimal"
 #~ msgstr "Mínim"
 
@@ -4298,20 +6008,6 @@ msgstr ""
 #~ "que no es poden suprimir:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "No s'ha definit cap partició arrel (/), necessària per poder continuar la "
-#~ "instal·lació de %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "La partició arrel té menys de 250 MB, normalment massa petita per "
-#~ "instal·lar-hi %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4325,28 +6021,6 @@ msgstr ""
 #~ "S'està instal·lant en un dispositiu FireWire. El sistema resultant potser "
 #~ "no funcionarà."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "No heu creat una partició d'arrencada."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "No s'ha especificat cap partició d'intercanvi. Tot i que no és "
-#~ "estrictament necessària en tots els casos, milloraria significativament "
-#~ "el rendiment en la majoria d'instal·lacions."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Aquest punt de muntatge és invàlid. El directori %s ha d'estar en el "
-#~ "sistema de fitxers /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "El punt de muntatge %s ha d'estar a un sistema de fitxers de linux."
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo ha fallat per a %s"
 
diff --git a/anaconda/po/cs.po b/anaconda/po/cs.po
index 066c637..6c2c424 100644
--- a/anaconda/po/cs.po
+++ b/anaconda/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/fedora/language/"
@@ -26,11 +26,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "Souborový systém pro /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -39,7 +39,7 @@ msgstr ""
 "Pole RAID, které obsahuje '%s', musí být jednoho z následujících RAID typů: "
 "%s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -48,7 +48,7 @@ msgstr ""
 "Pole RAID, které obsahuje '%s', musí mít jednu z následujících verzí "
 "metadat: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -57,108 +57,129 @@ msgstr ""
 "Pole RAID, které obsahuje '%s', musí být jednoho z následujících typů "
 "zařízení: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s musí mít jednu z těchto typů jmenovek: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s nemůže být typu %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s musí být připojen do jednoho z %s"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s musí mít velikost mezi %d a %d MB."
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s musí být menší než %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s nesmí být větší než %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s musí být uvnitř prvních %dMB disku."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s musí být primární oddíl"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s nemůže být na šifrovaném zařízení."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s nemůže být typu %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s nemusí mít dostatek prostoru pro grub2 na uložení core.img pokud bude "
 "použit souborový systém %s na %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Spustit VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Použít textový režim"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Heslo je nastaveno."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Hesla se neshodují!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Vložili jste slabé heslo: %s.  Stiskněte prosím Hotovo, pokud ho přesto "
 "chcete použít."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -166,87 +187,338 @@ msgstr ""
 "chcete použít."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Slabé"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Ucházející"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Dobré"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Silné"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Ano"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Ne"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Při aktivaci instalačního repozitáře došlo k této chybě:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Instalace nemůže pokračovat."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Při aktivaci instalačního repozitáře došlo k této chybě:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Instalace nemůže pokračovat."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Následující programy označené k instalaci mají problémy.  To bývá způsobeno "
+"chybou\n"
+"vybraného zdroje instalace.  Můžete zkusit odstranit dotčené balíčky z vaší "
+"instalace,\n"
+"změnit zdroj instalace, nebo ukončit instalátor."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Instalace byla zastavena, protože hardware může vykazovat chyby. Chybové "
+"hlášení bylo:\n"
+"\n"
+"%s.\n"
+"\n"
+"Instalátor bude nyní ukončen."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Instalace byla zastavena, protože hardware může vykazovat chyby. Chybové "
+"hlášení bylo:\n"
+"\n"
+"%s.\n"
+"\n"
+"Instalátor bude nyní ukončen."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Došlo k chybě hardware"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Instalace byla zastavena, protože hardware může vykazovat chyby. Chybové "
+"hlášení bylo:\n"
+"\n"
+"%s.\n"
+"\n"
+"Instalátor bude nyní ukončen."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Konfigurace nainstalovaného systému"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Zapisuji konfigurace sítě"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Vytváření uživatelů"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Konfigurace nainstalovaného systému"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Spouštění předinstalačních skriptů"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Nastavování zdroje instalace..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Instalace bootloaderu"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Provádění poinstalačního nastavení."
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Instalace bootloaderu"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Certifikát escrow %s vyžaduje připojení k síti."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -258,32 +530,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s chybí. Nelze nastavit firewall."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s chybí. Nelze nastavit firewall."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Tento souborový systém nepodporuje popisky."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Vybraný název %s je již používán."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Název skupiny oddílů %s je již používán. Změny nebudou uloženy."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Spouštění předinstalačních skriptů"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Jméno počítače nesmí být prázdné ani odsahovat hodnotu \"None\"."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Jméno počítače musí být dlouhé nejvýše 255 znaků."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Jméno počítače musí začínat platným znakem z rozsahu 'a-z', 'A-Z' nebo "
-"'0-9' (bez háčků a čárek)"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -293,55 +855,55 @@ msgstr ""
 "'.', části mezi tečkami nesmí být prázdné a nesmí začínat ani končit znakem "
 "'-'."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Připojování..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Odpojování..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Drátové (%s) připojeno"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Bezdrátově připojeno k %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Nepřipojeno"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Nejsou dostupná žádná síťová zařízení"
 
@@ -350,7 +912,12 @@ msgstr "Nejsou dostupná žádná síťová zařízení"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "INSTALACE %(productName)s %(productVersion)s"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nová instalace %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Spusťte %s pro odpojení filesystemu, pokud jste hotovi."
@@ -363,8 +930,8 @@ msgstr "Po dokončení práce ukončete shell a váš systém bude restartován.
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Nemohu najít a spustit /bin/sh! Nespouštím shell"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Záchranné prostředí"
 
@@ -411,21 +978,15 @@ msgstr "Opravit systém"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Které zařízení obsahuje kořenový oddíl nainstalovaného systému?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Ukončit"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Pokud ukončíte shell, systém se automaticky restartuje."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -435,7 +996,7 @@ msgstr ""
 "nebyly vybrány pro připojení. Stiskněte <Enter> pro vstup do příkazového "
 "řádku, kde můžete použít příkaz fsck a připojit oddíly. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -456,7 +1017,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -469,29 +1030,242 @@ msgstr ""
 "\n"
 "Stisknete <Enter> pro vstup do příkazového řádku."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nenalezeny žádné Linuxové oddíly. Počítač bude restartován.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Pokud ukončíte shell, systém se automaticky restartuje."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Záchranný režim"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Nenalezeny žádné Linuxové oddíly. Stiskněte Enter pro vstup do shell.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Systém je připojen v adresáři %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standardní oddíl"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disk"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Oddíl 'swap' je na počítači použit v okamžiku, kdy operační\n"
+"systém narazí na nedostatek paměti."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Adresář 'boot' je část disku vašeho počítače, kde jsou uloženy soubory\n"
+"potřebné ke startu operačního systému."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"Adresář 'root' je část disku vašeho počítače, kde jsou uloženy soubory\n"
+"jádra a všech aplikací."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"Adresář 'home' je část disku vašeho počítače, kde jsou uložena všechna\n"
+"vaše data."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Oddíl typu \"BIOS boot\" je potřeba pro start\n"
+"z GPT diskových oddílů na BIOS hardwaru."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"Oddíl typu \"PReP boot\" je potřeba jako část\n"
+"konfigurace bootloaderu na některých PPC platformách."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Kořenový oddíl je menší než 250 MB, což je obvykle příliš málo pro instalaci "
+"systému %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Není definován kořenový oddíl (/), který je nutný pro pokračování instalace "
+"systému %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Platforma vyžaduje, aby adresář /boot byl na dedikovaném oddílu nebo svazku. "
+"Pokud nechcete separátní /boot, musíte kořen svazku (tj. adresář /) umístit "
+"na oddíl, který není typu LVM."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Připojovaný oddíl %(mount)s je menší než %(size)s MB, což je méně, než je "
+"doporučená velikost pro obvyklou instalaci systému %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Oddíl %(mount)s je příliš malý pro naformátování na %(format)s (přípustná "
+"velikost je od %(minSize)d MB do %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Oddíl %(mount)s je příliš velký pro naformátování na %(format)s (přípustná "
+"velikost je od %(minSize)d MB do %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Přidání nového zařízení se nezdařilo. Klikněte pro detaily."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Není vytvořen zaváděcí oddíl."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Váš systém založený na BIOSu vyžaduje zvláštní zaváděcí oddíl pro zavedení "
+"%s, který používá novější tabulku rozdělení (GPT). Pro možnost pokračování "
+"vytvořte prosím 'BIOS Boot' oddíl o velikosti 1MB."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Odkládací oddíl (swap) nebyl určen. Aby mohla instalace pokračovat bez něj, "
+"je potřeba alespoň %(requiredMem)s MB paměti. K dispozici je však pouze "
+"%(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Neurčili jste odkládací oddíl (swap). Přestože není nezbytně nutný, jeho "
+"použití vede ve většině případů k výrazně vyšší výkonnosti systému."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Alespoň jeden odkládací oddíl (swap) byl vytvořen starší verzí nástroje "
+"mkswap. Tento oddíl bude proto v souboru /etc/fstab odkazován názvem "
+"zařízení, což není ideální, protože názvy zařízení se mohou změnit, pokud "
+"jsou zařízení jinak zapojena."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Přípojný bod není platný. Adresář %s musí být v kořenovém (/) souborovém "
+"systému."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Přípojný bod musí %s musí být na linuxovém systému souborů."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Heslo:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -603,53 +1377,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Zvolené heslo pro VNC je kratší než 6 znaků.\n"
 "Zadejte prosím nové.  Zanechte prázdné pro spuštění bez hesla."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Nezdařilo se nastavit instalační zdroj"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Chybapři stahování metadat balíku..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Žádný instalační zdroj není dostupný"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Instalace software."
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Spouštění procesu instalace balíků."
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Na následujících systémech souborů je potřeba více místa:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Připravuje se transakce ze zdroje instalace."
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Instalace"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Stahování metadat balíčků..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instalace"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Příprava na instalaci"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Kontrola konfigurace úložného prostoru..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "HLAVNÍ NÁZEV"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALIZACE"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALIZACE"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "NASTAVENÍ UŽIVATELŮ"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -658,34 +1517,103 @@ msgstr ""
 "Nedostatek prostoru v souborových systémech na současný výběr programů. Je "
 "potřeba ještě %s."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Instalační Hub"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Začíná automatická instalace"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "V režimu příkazového řádku není možné používat otázky! "
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Prosím vyberte z následujícího ['k' pro konec | 'p' pro pokračování]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Prosím vyplňte všechny dialogy než budete pokračovat"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "p"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Přednastavený název HUBu"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "p"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Prosím vyplňte všechny dialogy než budete pokračovat"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Chyba"
 
@@ -709,25 +1637,28 @@ msgstr "ano"
 msgid "no"
 msgstr "ne"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Opravdu chcete skončit?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "k"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -735,7 +1666,7 @@ msgid ""
 msgstr ""
 "  Prosím vyberte z následujícího ['k' pro konec | 'p' pro pokračování]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -751,220 +1682,259 @@ msgstr ""
 "VNC. Pomocí VNC je možné se k počítači připojit z jiného počítače a využít "
 "instalaci v grafickém režimu."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "k"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Heslo pro VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Prosím zadejte heslo pro VNC. Bude nutné jej zadat dvakrát. \n"
 "Zanechte prázdné pro pokračování bez hesla"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Heslo: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Heslo (znovu): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Hesla se neshodují!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Heslo musí mít délku alespoň 6 znaků."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Heslo musí mít délku alespoň 6 znaků."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Nastavení časového pásma"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Není nastaveno časové pásmo."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Dostupné regiony"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Dostupné regiony"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Zapisuji konfigurace sítě"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Drátové (%s) připojeno"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Drátové (%s) připojeno"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Jméno počítače:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Jméno počítače"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Jméno počítače"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Jméno počítače není platné: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Do_končit konfiguraci"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Brána"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "u konfigurace souborového systému chybí typ"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Konfigurace nainstalovaného systému"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Heslo správce:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Heslo je nastaveno."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Účet uživatele root je vypnutý."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Nebylo zadáno heslo."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Zvolte prosím nové heslo pro uživatele root. Bude nutné jej zadat dvakrát."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Heslo: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Využít všechen prostor"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Nahradit existující Linuxové systémy"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Využít volný prostor"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Cíl instalace"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nebyly vybrány žádné disky"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Chyba při kontrole úložných systémů"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Chyba při kontrole úložných systémů"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Vybráno automatické rozdělení"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Vybráno vlastní rozdělení"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -972,38 +1942,60 @@ msgstr ""
 "Nedetekovány žádné disky.  Restartujte prosím počítač, připojte alespoň "
 "jeden disk, a znovu odstartujte instalaci."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Nebyl vybrán žádný disk. Pro instalaci zvolte alespoň jeden."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Zkoumání úložného prostoru..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Vybrat"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Vytváření aktualizované konfigurace úložného prostoru"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "selhala konfigurace úložiště: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Kontrola konfigurace úložného prostoru..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Volby automatického rozdělení"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1012,41 +2004,41 @@ msgstr ""
 "Pro instalaci je nutné rozdělit vás pevný disk na oddíly. Vyberte místo, "
 "které bude použito pro instalaci systému."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Nastavení typu oddílů"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Nastavení typu oddílů"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Nastavení časového pásma"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Časové pásmo %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Není nastaveno časové pásmo."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Dostupná časová pásma v regionu %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Dostupné regiony"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1055,178 +2047,196 @@ msgstr ""
 "Použijte čísla nebo vložte přímo jména [\"b\" pro seznam regionů, \"q\" pro "
 "konec]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Spustit VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Postup instalace"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Nejbližší zrcadlo"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Chyba při nastavování zdroje software"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Nic neoznačeno"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Připojování..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Jednotka CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO obraz:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Čas ze sítě"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Žádný instalační zdroj není dostupný"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Nezdařilo se nastavit instalační zdroj"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Chybapři stahování metadat balíku..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Žádný instalační zdroj není dostupný"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Volby připojení NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Nezdařilo se nastavit instalační zdroj, zkontrolujte URL repozitáře"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "zařízení obsahující /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Nezdařilo se nastavit instalační zdroj"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Upravit výběr programů"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Chyba při kontrole výběru programů"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Instalační zdroj není nastaven"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Zdroj byl změněn - prosím o kontrolu"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Ručně označené programy"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Instalační zdroj není nastaven"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Výběr vašeho prostředí"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Použít autentizaci"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Je  nutné vložit a potvrdit heslo."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Varování"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1242,36 +2252,36 @@ msgstr "Probíhá"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstalace dokončena.  Stiskem Enter ukončit"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Základní název dialogu"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "testovací status..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Nové zařízení"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Heslo (znovu): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1280,7 +2290,7 @@ msgstr ""
 "Vložili jste slabé heslo: %s.  Stiskněte prosím Hotovo, pokud ho přesto "
 "chcete použít."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1289,63 +2299,47 @@ msgstr ""
 "Vložili jste slabé heslo: %s.  Stiskněte prosím Hotovo, pokud ho přesto "
 "chcete použít."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Heslo je nastaveno."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Ukončit instalaci"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Nápověda"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Konec"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Ne"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Ano"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "HLAVNÍ NÁZEV"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALIZACE"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALIZACE"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "NASTAVENÍ UŽIVATELŮ"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1353,7 +2347,11 @@ msgstr ""
 "Prosím dokončete všechny položky označené touto ikonou před pokračováním na "
 "další krok."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Dokončeno!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1362,168 +2360,68 @@ msgstr ""
 "%s je úspěšně nainstalována na vašem systému a připravena\n"
 "k používání!  Po restartu ji můžete začít používat!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Dokončeno!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Konec"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nová instalace %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s je úspěšně nainstalována na vašem systému, přesto je potřeba provést "
+"ještě některá nastavení. \n"
+"Proveďte je prosím a pak stiskněte tlačítko Dokončit konfiguraci."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s je úspěšně nainstalována na vašem systému a připravena\n"
+"k používání!  Po restartu ji můžete začít používat!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Vytváření nové skupiny oddílů (VG)..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Rekonfigurace zařízení byla neúspěšná. Klikněte pro více informací."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Prosím vytvořte název skupiny oddílů a označte alespoň jeden disk níže."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Skupina oddílů:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "sloupec"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Konfigurace úložných zařízení skončilo kvůli neopravitelné chybě. Klikněte "
 "pro více informace."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Rekonfigurace zařízení byla neúspěšná. Klikněte pro více informací."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Prosím vložte platný přípojný bod."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Tento přípojný bod je neplatný. Zkusit nějaký jiný?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Tento přípojný bod se již používá. Zkusit nějaký jiný?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "Vybraný typ RAID vyžaduje více disků, než máte označeno."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Prosím vložte platný přípojný bod."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Tento přípojný bod je neplatný. Zkusit nějaký jiný?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standardní oddíl"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disk"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Žádný"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Smazat také všechny ostatní souborové systémy na %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Jste si jistí, že chcete smazat všechna data na %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Jste si jistí, že chcete smazat všechna data na %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "RUČNÍ ROZDĚLENÍ DISKŮ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "Vybráno %d úložné zařízení"
 msgstr[1] "Vybrána %d úložná zařízení"
 msgstr[2] "Vybráno %d úložných zařízení"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1532,129 +2430,111 @@ msgstr ""
 "Pokud vytvoříte přípojné body pro instalaci %s %s,\n"
 "zde budete mít možnost prohlédnout detaily."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Oddíl 'swap' je na počítači použit v okamžiku, kdy operační\n"
-"systém narazí na nedostatek paměti."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Adresář 'boot' je část disku vašeho počítače, kde jsou uloženy soubory\n"
-"potřebné ke startu operačního systému."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"Adresář 'root' je část disku vašeho počítače, kde jsou uloženy soubory\n"
-"jádra a všech aplikací."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"Adresář 'home' je část disku vašeho počítače, kde jsou uložena všechna\n"
-"vaše data."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Oddíl typu \"BIOS boot\" je potřeba pro start\n"
-"z GPT diskových oddílů na BIOS hardwaru."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"Oddíl typu \"PReP boot\" je potřeba jako část\n"
-"konfigurace bootloaderu na některých PPC platformách."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi musí být na zařízení typu %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s musí být na zařízení typu %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s nelze šifrovat"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Na kořenovém svazku je nutné vytvořit nový souborový systém."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Zařízení typu %s vyžaduje výběr správného typu  RAID."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "Změna velikosti zařízení se nezdařila. Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "Přeformátování zařízení se nezdařilo. Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Vybraný název %s je již používán."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Tento souborový systém nepodporuje popisky."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nebyly vybrány žádné disky"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Tento souborový systém nepodporuje změnu velikosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Chyba při kontrole nastavení úložiště.  Klikněte pro detaily."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Chyba při kontrole nastavení úložiště.  Klikněte pro detaily."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Přidán nový %s do existujícího kontejneru %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Přidání nového zařízení se nezdařilo. Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Nastavena nesprávná velikost oddílu. Použijte správnou hodnotu."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Odebrání zařízení se nezdařilo. Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Název skupiny oddílů %s je již používán. Změny nebudou uloženy."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "souborový systém volný"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1663,7 +2543,7 @@ msgstr ""
 "Toto zařízení nemůže být přímo editováno. Můžete jen odebrat nebo označit "
 "jiné zařízení."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1672,194 +2552,144 @@ msgstr ""
 "Toto zařízení nemůže být přímo editováno. Můžete jen odebrat nebo označit "
 "jiné zařízení."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nebyl vybrán žádný disk."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Na vybraných discích není dostatek volného místa."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automatické rozdělení skončilo chybou. Klikněte pro více informací."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Upravit výběr programů"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "Odemčení šifrovaného blokového zařízení selhalo. Klikněte pro detaily"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATUM & ČAS"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Neplatné časové pásmo"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "odp."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Chcete-li použít NTP, je neprve potřeba nastavit síť."
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Nemáte nakonfigurován funkční NTP server"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "CÍL INSTALACE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "Vybráno %d úložné zařízení"
+msgstr[1] "Vybrána %d úložná zařízení"
+msgstr[2] "Vybráno %d úložných zařízení"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s přepíná rozložení."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KLÁVESNICE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Testovací konfigurace rozložení není dostupná."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "testovací status..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Přepínání rozložení není nastaveno."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "JAZYK"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Neznámý stav (chybějící)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Neznámů stav"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Nespravováno"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Nedostupné"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Chybějící firmware"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kabel odpojen"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Nedostupné"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Odpojeno"
@@ -1884,153 +2714,169 @@ msgstr "Odpojování"
 msgid "Connection failed"
 msgstr "Připojení se nepovedlo"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "odpojeno"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Bezdrátový"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "odpojeno"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 adresa"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 adresa"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Žádný"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Vyžadována autentizace"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Heslo: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NASTAVENÍ SÍTĚ"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "HESLO SPRÁVCE"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Heslo je nastaveno."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Heslo správce je nastaveno"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Účet správce je zablokován"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Administrátorské heslo není nastaveno"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "VÝBĚR PROGRAMŮ"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Kontrola závislostí..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Chyba při kontrole závislostí"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Stahování metadat balíčků..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Stahování metadat skupin..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Kontrola závislostí..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Chyba při kontrole závislostí"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Chyba při kontrole závislostí.  Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Následující programy označené k instalaci mají problémy.  To bývá způsobeno "
 "chybou\n"
@@ -2038,46 +2884,77 @@ msgstr ""
 "instalace,\n"
 "změnit zdroj instalace, nebo ukončit instalátor."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Zrušit"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Konec"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Upravit zdroje softwaru"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Upravit výběr programů"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Nastavování zdroje instalace..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Chybapři stahování metadat balíku..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Vyžadována autentizace"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Toto je médium je vhodné pro instalaci."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Toto médium není vhodné pro instalaci."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ZDROJE INSTALACE"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Nezdařilo se nastavit instalační zdroj, zkontrolujte URL repozitáře"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Chyba při přípravě repozitáře"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Chyba při nastavování zdroje software"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2085,98 +2962,80 @@ msgstr ""
 "Nezdařilo se nastavit instalační zdroj, zkontrolujte URL repozitáře a "
 "nastavení proxy"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Chyba při přípravě repozitáře"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Chyba při nastavování zdroje software"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Zařízení:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS server %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Neplatné časové pásmo"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Neplatné časové pásmo"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Neplatné časové pásmo"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Moment prosím... programová metadata se nahrávají."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Disky, které jste vybrali obsahují následující množství volného místa:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Moment prosím... programová metadata se nahrávají."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2186,7 +3045,7 @@ msgstr ""
 "<b>Nemáte dostatek místa na instalaci %s</b>, můžeme ale získat prostor\n"
 "zmenšením nebo odstraněním stávajících diskových oddílů."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2197,7 +3056,7 @@ msgstr ""
 "veškeré volné místo\n"
 "na vybraných discích."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2211,35 +3070,42 @@ msgstr ""
 "upravit výběr programů pro instalaci menší verze <b>%s</b>, nebo ukončit "
 "instalátor."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "CÍL INSTALACE"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Ukládání konfigurace úložišť..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Ukládání konfigurace úložiště se nezdařilo..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formátování DASD zařízení"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "Chyba při kontrole nastavení úložiště.  Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Chyba při kontrole nastavení úložiště.  Klikněte pro detaily."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "souborový systém volný"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2247,7 +3113,7 @@ msgstr[0] "%d disk označen; kapacita %s; %s volno"
 msgstr[1] "%d disky označeny; kapacita %s; %s volno"
 msgstr[2] "%d disků označeno; kapacita %s; %s volno"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2255,7 +3121,11 @@ msgstr ""
 "Vybrali jste vynechání instalace bootloaderu.  Váš systém nemusí být schopen "
 "nastartovat."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2265,11 +3135,19 @@ msgstr ""
 "upravit nastavení vašeho úložiště\n"
 "nebo ukončit instalátor."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Konec"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Upravit nastavení úložiště"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2280,76 +3158,80 @@ msgstr ""
 "upravit nastavení vašeho úložiště\n"
 "nebo ukončit instalátor."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "NASTAVENÍ UŽIVATELŮ"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Neplatné časové pásmo"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "VÍTEJTE V %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Zatím jste nevytvořili žádné přípojné body pro vaší instalaci %s %s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Klikněte sem pro automatické vytvoření."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Nebo vytvořte nový přípojný bod níže ikonou '+'."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2367,55 +3249,160 @@ msgstr[2] ""
 "<b>%d disků; kapacita %s; %s volného prostoru</b> (nepřiděleného a v "
 "souborových systémech)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Neinstalovat bootloader"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Nastavit jako bootovatelné zařízení"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "Vybraný typ RAID vyžaduje více disků, než máte označeno."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Prosím vytvořte název skupiny oddílů a označte alespoň jeden disk níže."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Skupina oddílů:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "sloupec"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Přípojný bod musí %s musí být na linuxovém systému souborů."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Tento přípojný bod se již používá. Zkusit nějaký jiný?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Prosím vložte platný přípojný bod."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Tento přípojný bod je neplatný. Zkusit nějaký jiný?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Smazat také všechny ostatní souborové systémy na %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Jste si jistí, že chcete smazat všechna data na %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Jste si jistí, že chcete smazat všechna data na %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Neplatné časové pásmo"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Konec"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Vložili jste slabé heslo: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Hesla si neodpovídají."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Zachovat"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Zmenšit"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Smazat"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Toto zařízení obsahuje instalační zdroj."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Vytváření %(type)s na %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Není připraveno"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Využít volný prostor"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2428,14 +3415,14 @@ msgstr ""
 "tak místo potřebné pro instalaci.  Odstranění oddílu nenávratně zničí "
 "veškerá data, která jsou na něm uložena."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2446,353 +3433,761 @@ msgstr[1] ""
 msgstr[2] ""
 "<b>%s disků; %s uvolnitelného prostoru</b> (v souborových systémech)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Celkem označeno k uvolnění: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Smazat"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Zachovat"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALACE DISTRIBUCE"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "NÁZEV DIALOGU"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PŘEDPRODUKČNÍ / TESTOVACÍ"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Nové zařízení"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Nový výběr"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Pokračovat"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Aplikovat změny"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NASTAVENÍ SÍTĚ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Jméno skupiny"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATUM & ČAS"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "odp."
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Přidat a označit NTP servery pro použití"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "WWW server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Pracuje"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Použít"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfigurace..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATUM & ČAS"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Město:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Město:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Síťové jméno"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Jméno sítě"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "dop./odp."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "dop./odp."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-hod"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "dop./odp."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "CÍL INSTALACE"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapacita"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Nepřipojeno"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Vybraná zařízení"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Nic neoznačeno"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Označení:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Chybějící firmware"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Ne"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Typ VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Vybraná zařízení"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "souhrn"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID zařízení"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Přidat"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Brána"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Maska sítě"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Rychlost"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardwarová adresa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfigurace..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Bezpečnost"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Síťové jméno"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Jméno sítě"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Bebpečnostní klíč"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Použít jako Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Zastavit Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfigurace..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Poskytovatel"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfigurace..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Typ VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Brána"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Jméno skupiny"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Heslo skupiny"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Jméno uživatele"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfigurace..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metoda"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Nastavení URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Zapisuji konfigurace sítě"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Odemknout"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Mód _letadlo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Zapisuji konfigurace sítě"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Jméno počítače:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NASTAVENÍ SÍTĚ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2802,206 +4197,61 @@ msgstr ""
 "zpřístupnění\n"
 "programových aktualizací."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Brána"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Maska sítě"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Rychlost"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardwarová adresa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfigurace..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Bezpečnost"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Síťové jméno"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Jméno sítě"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Bebpečnostní klíč"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Použít jako Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Zastavit Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfigurace..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Poskytovatel"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Typ VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Brána"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Jméno skupiny"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Heslo skupiny"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Jméno uživatele"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metoda"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Nastavení URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Odemknout"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Mód _letadlo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Jméno počítače:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Použít autentizaci"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Vyžadována autentizace"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Připojeno"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "VÝBĚR PROGRAMŮ"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Výběr vašeho prostředí"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "sloupec"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Zrušit a _přidat více disků"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "VOLBY INSTALACE"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Typ rozdělení:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Zašifrovat prosím. Heslo vložím později."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Vybráno vlastní rozdělení"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Uvolnit prostor"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "VOLBY INSTALACE"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3009,77 +4259,144 @@ msgstr ""
 "Zde je sečteno, kolik volného místa je potřeba pro momentálně zvolené "
 "programy."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disk volný"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Volný prostor dostupný k použití."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "souborový systém volný"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "Volné místo nedostupné, ale uvolnitelné z existujících oddílů."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Zde najdete popis vašich voleb."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Využít volný prostor"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Konec instalace"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Popis zařízení"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Lokální standardní disky"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Dokončit rozdělení"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Ši_frovat"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Vybráno automatické rozdělení"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Dokončit rozdělení"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "Ši_frovat"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Zašifrovat prosím. Heslo vložím později."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Volby automatického rozdělení"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "souhrn"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Souhrn disků a volby..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "PŘIDAT ROZLOŽENÍ KLÁVES"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Můžete přidat rozložení kláves výběrem níže:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Jméno"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "ROZLOŽENÍ KLÁVESNICE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3087,122 +4404,204 @@ msgstr ""
 "Která rozložení klávesnice chcete používat na tomto systému?  Můžete "
 "kterékoli rozložení přesunou v seznamu nahoru a označit ho tak jako hlavní."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "jméno"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Přidat rozložení"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Odebrat rozložení"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Posunout označené rozložení výš"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Přidat rozložení"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Odebrat rozložení"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Posunout označené rozložení výš"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Posunout označené rozložení níž"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Ukázka rozložení"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Testovací konfigurace rozložení není dostupná."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift přepíná rozložení."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Volby"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Přidat"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "PŘIDAT ROZLOŽENÍ KLÁVES"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Můžete přidat rozložení kláves výběrem níže:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Jméno"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Dostupné regiony"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Přidat rozložení"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "MOŽNOSTI PŘEPÍNÁNÍ ROZLOŽENÍ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "Jakou kombinaci chcete používat pro přepínání rozložení klávesnice?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "použít"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "popis"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Volby připojení NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "JAZYK"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "originálníJméno"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "anglickéJméno"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Nic neoznačeno"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "HESLO SPRÁVCE"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Heslo správce:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Ještě jednou:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Heslo pro VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Zadejte heslo pro uživatele root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3210,237 +4609,285 @@ msgstr ""
 "Účet root je využíván pro administraci systému.  Vložte prosím heslo "
 "uživatele root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Hotovo"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "KONTROLA MÉDIA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Médium se prověřuje, prosím počkejte..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Přidat"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Povolit HTTP Proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Příklad:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Použít autentizaci"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Uživatelské jméno</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Jméno uživatele"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Heslo</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Heslo: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ZDROJE INSTALACE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Který zdroj instalace chcete používat?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Atoudetekované instalační médium:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Zařízení:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Označení:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Kontrola"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO obraz:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Zařízení:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Vyberte ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "V _síti:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Nastavení _Proxy..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Toto URL odkazuje na seznam _zrcadel."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Volby připojení NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Toto pole je nepovinné."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Repozitáře uživatelů Fedory"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Přidat nový přípojný bod."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Přidat"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Odebrat označený přípojný bod."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Odebrat"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Funkční chyba."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Zadejte heslo pro uživatele root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Toto URL odkazuje na seznam _zrcadel."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Jméno:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Jméno uživatele"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Heslo: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Tento přípojný bod je neplatný. Zkusit nějaký jiný?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Rychle odsud pryč!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Přijímám svůj osud."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Toto je nestabilní, předprodukční program."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3452,203 +4899,264 @@ msgstr ""
 "Tento OS budoucnosti není tak stabilní, jako OS na který jste zvyklí.  Je "
 "určen pouze pro testovací účely."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "VÍTEJTE V %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Který jazyk chcete používat během instalace?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Konec"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Pokračovat"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Jméno uživatele"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Jméno skupiny"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Heslo: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Heslo pro VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Přidat přípojný bod"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Požadovaná kapacita:</b>"
+msgid "Add a new mount point."
+msgstr "Přidat nový přípojný bod."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Přípojný Bod:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Přidat"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "PŘIDAT NOVÝ PŘÍPOJNÝ BOD"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Další uživatelské volby budou dostupné\n"
-"po vytvoření přípojného bodu níže."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Tento přípojný bod je již používán.\n"
-"Zkusit jiný?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "např.: \"20 GB\", \"500mb\" (bez uvozovek)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Smazat"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Uložit"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "KONFIGURACE PŘÍPOJNÉHO BODU"
+msgid "Remove the selected mount point(s)."
+msgstr "Odebrat označený přípojný bod."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Prosím vytvořte název skupiny oddílů a označte alespoň jeden disk níže."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "_Odebrat"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Volno"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID zařízení"
+msgid "Reload storage configuration from disk."
+msgstr "selhala konfigurace úložiště: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Ši_frovat"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Vybraná zařízení"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Popis zařízení"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Přípojný Bod:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Požadovaná kapacita:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Označení:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Typ zařízení:</b>"
+msgid "Device(s):"
+msgstr "Zařízení:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Systém souborů:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "Ši_frovat"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Přeformátování"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Skupina oddílů:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Upravuje se..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Jméno:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Typ zařízení:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Ši_frovat"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Souborový systém"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Přeformátování"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Skupina oddílů:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Upravuje se..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID zařízení"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3656,17 +5164,19 @@ msgstr ""
 "Toto zařízení je šifrované a bez vložení platného hesla z něj nelze číst. "
 "Můžete jej odemknout níže,"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Heslo:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Odemknout"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3674,295 +5184,571 @@ msgstr ""
 "Toto zařízení nemůže být přímo editováno. Můžete jen odebrat nebo označit "
 "jiné zařízení."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Přidat nový přípojný bod."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Odebrat označený přípojný bod."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Nastavení označeného přípojného bodu."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurace..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "selhala konfigurace úložiště: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Klikněte pro nápovědu"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Nápověda"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">DOSTUPNÉ MÍSTO</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">CELKOVÉ MÍSTO</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Vybrat"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "KONFIGURACE PŘÍPOJNÉHO BODU"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Označit jeden nebo více disků, které mohou být na tomto zařízení."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP adresa"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Jméno iSCSI iniciátoru musí být zadáno"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Použít autentizaci"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Příklad:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Jméno uživatele"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Heslo pro VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Jméno uživatele"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Heslo pro VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Jméno uživatele"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Heslo pro VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Jméno sítě"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Použít autentizaci"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Jméno uživatele"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Heslo pro VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Jméno uživatele"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Heslo pro VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Jméno uživatele"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Heslo pro VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Připojení se nepovedlo"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Zařízení:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "VYBRANÉ DISKY"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Boot"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Popis"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Volno"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Odebrat"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Souhrn disků bude zde"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Smazat"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Vybrat"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "KONFIGURACE PŘÍPOJNÉHO BODU"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Označit jeden nebo více disků, které mohou být na tomto zařízení."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Přidat přípojný bod"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Požadovaná kapacita:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Přípojný Bod:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "PŘIDAT NOVÝ PŘÍPOJNÝ BOD"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Další uživatelské volby budou dostupné\n"
+"po vytvoření přípojného bodu níže."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Tento přípojný bod je již používán.\n"
+"Zkusit jiný?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "např.: \"20 GB\", \"500mb\" (bez uvozovek)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Uložit"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "KONFIGURACE PŘÍPOJNÉHO BODU"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Prosím vytvořte název skupiny oddílů a označte alespoň jeden disk níže."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Jméno:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID zařízení"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Ši_frovat"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Prosím vložte platný přípojný bod."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formátování DASD zařízení"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Během instalace došlo k neznámé chybě.  Detaily jsou níže."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "HESLO PRO ŠIFROVÁNÍ DISKU"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Uložit heslo"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "HESLO PRO ŠIFROVÁNÍ DISKU"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3971,7 +5757,19 @@ msgstr ""
 "Označili jste některá vaše data jako šifrovaná. Bude potřeba vytvořit heslo, "
 "které budete vkládat při startu počítače, aby bylo možné k nim přistupovat."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Heslo:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Ještě jednou:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3981,167 +5779,221 @@ msgstr ""
 "rozložení klávesnice, nemusíte být schopní po instalaci dešifrovat vaše "
 "disky."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "UVOLNĚNÍ DISKOVÉHO PROSTORU"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Uvolnit prostor"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "UVOLNĚNÍ DISKOVÉHO PROSTORU"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Popis přijde sem."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Uvolnitelný prostor"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Provést"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Zachovat"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Smazat"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Zmenšit"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Vybráno vlastní rozdělení"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Aplikovat změny"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Zařízení:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Přidat přípojný bod"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Ukončit instalaci"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Ne"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Ano"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr "Jste si jisti, že chcete ukončit proces instalace?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Konec"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "PŘEHLED INSTALACE"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Konec"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Začít instalaci"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURACE"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Příprava na instalaci"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s je úspěšně nainstalována na vašem systému, přesto je potřeba provést "
-"ještě některá nastavení. \n"
-"Proveďte je prosím a pak stiskněte tlačítko Dokončit konfiguraci."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "Do_končit konfiguraci"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s je úspěšně nainstalována na vašem systému a připravena\n"
-"k používání!  Po restartu ji můžete začít používat!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Restart"
 
@@ -4157,16 +6009,16 @@ msgstr "Instalace"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalovat Live CD na pevný disk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Začíná instalace na pevný disk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Vítejte ve Fedoře"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4175,26 +6027,27 @@ msgstr ""
 "%s vyžaduje pro instalaci %s MB paměti, v tomto počítači je však k dispozici "
 "pouze %s MB.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Grafický instalátor %s vyžaduje alespoň %s MB paměti, avšak v tomto počítači "
 "je dispozici pouze %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nedostatek paměti RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4208,24 +6061,24 @@ msgstr ""
 "\n"
 " z terminálu roota."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Spouštění textového režimu."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Chyba"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Proměnná prostředí DISPLAY není nastavena. Spouští se textový režim."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafická instalace není k dispozici. Spouští se textový režim."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4236,20 +6089,20 @@ msgstr ""
 "Nedovoluje vytvářet nebo volit oddíly ani vybírat balíčky k instalaci. "
 "Chcete raději použít VNC režim?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "ssh install@%s odstartuje instalaci."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "ssh install@<host> pro pokračování instalace."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Zkuste Fedoru"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4259,7 +6112,7 @@ msgstr ""
 "Můžete instalovat Fedoru hned, nebo vybrat \"Instalace na hard disk\" v "
 "Přehledu Aktivit kdykoli později."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4267,10 +6120,94 @@ msgstr ""
 "Můžete vybrat \"Instalace na hard disk\"\n"
 "v Přehledu Aktivit kdykoli později."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Zavřít"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Jméno počítače musí začínat platným znakem z rozsahu 'a-z', 'A-Z' nebo "
+#~ "'0-9' (bez háčků a čárek)"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Na následujících systémech souborů je potřeba více místa:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "V režimu příkazového řádku není možné používat otázky! "
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Tento přípojný bod je neplatný. Zkusit nějaký jiný?"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "NASTAVENÍ SÍTĚ"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Chybapři stahování metadat balíku..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Nic neoznačeno"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Chybějící firmware"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Vyžadována autentizace"
+
+#~ msgid "column"
+#~ msgstr "sloupec"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Typ rozdělení:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Uživatelské jméno</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Heslo</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Tento přípojný bod je neplatný. Zkusit nějaký jiný?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Označení:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Systém souborů:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID zařízení"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Nastavení označeného přípojného bodu."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Klikněte pro nápovědu"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">DOSTUPNÉ MÍSTO</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">CELKOVÉ MÍSTO</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Dokončeno"
 
@@ -4322,41 +6259,9 @@ msgstr "Zavřít"
 #~ msgid "Install on System"
 #~ msgstr "Instalovat na systém"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Při aktivaci instalačního repozitáře došlo k této chybě:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Instalace nemůže pokračovat."
-
 #~ msgid "Exit installer"
 #~ msgstr "Ukončit instalátor"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Instalace byla zastavena, protože hardware může vykazovat chyby. Chybové "
-#~ "hlášení bylo:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "Instalátor bude nyní ukončen."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Došlo k chybě hardware"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Ukončit instalátor"
 
@@ -4650,9 +6555,6 @@ msgstr "Zavřít"
 #~ msgid "Software Development"
 #~ msgstr "Vývoj software"
 
-#~ msgid "Web Server"
-#~ msgstr "WWW server"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimální"
 
@@ -4696,50 +6598,6 @@ msgstr "Zavřít"
 #~ "být smazány:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Není definován kořenový oddíl (/), který je nutný pro pokračování "
-#~ "instalace systému %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Kořenový oddíl je menší než 250 MB, což je obvykle příliš málo pro "
-#~ "instalaci systému %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Platforma vyžaduje, aby adresář /boot byl na dedikovaném oddílu nebo "
-#~ "svazku. Pokud nechcete separátní /boot, musíte kořen svazku (tj. "
-#~ "adresář /) umístit na oddíl, který není typu LVM."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Připojovaný oddíl %(mount)s je menší než %(size)s MB, což je méně, než je "
-#~ "doporučená velikost pro obvyklou instalaci systému %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Oddíl %(mount)s je příliš malý pro naformátování na %(format)s (přípustná "
-#~ "velikost je od %(minSize)d MB do %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Oddíl %(mount)s je příliš velký pro naformátování na %(format)s "
-#~ "(přípustná velikost je od %(minSize)d MB do %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4756,56 +6614,6 @@ msgstr "Zavřít"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "Nebylo vytvořeno cílové zařízení pro stage1 zavaděče."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Není vytvořen zaváděcí oddíl."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Váš systém založený na BIOSu vyžaduje zvláštní zaváděcí oddíl pro "
-#~ "zavedení %s, který používá novější tabulku rozdělení (GPT). Pro možnost "
-#~ "pokračování vytvořte prosím 'BIOS Boot' oddíl o velikosti 1MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Odkládací oddíl (swap) nebyl určen. Aby mohla instalace pokračovat bez "
-#~ "něj, je potřeba alespoň %(requiredMem)s MB paměti. K dispozici je však "
-#~ "pouze %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Neurčili jste odkládací oddíl (swap). Přestože není nezbytně nutný, jeho "
-#~ "použití vede ve většině případů k výrazně vyšší výkonnosti systému."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Alespoň jeden odkládací oddíl (swap) byl vytvořen starší verzí nástroje "
-#~ "mkswap. Tento oddíl bude proto v souboru /etc/fstab odkazován názvem "
-#~ "zařízení, což není ideální, protože názvy zařízení se mohou změnit, pokud "
-#~ "jsou zařízení jinak zapojena."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Přípojný bod není platný. Adresář %s musí být v kořenovém (/) souborovém "
-#~ "systému."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Přípojný bod musí %s musí být na linuxovém systému souborů."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux na %s"
 
@@ -4815,12 +6623,6 @@ msgstr "Zavřít"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s architektury %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formátování DASD zařízení"
-#~ msgstr[1] "Formátování DASD zařízení"
-#~ msgstr[2] "Formátování DASD zařízení"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Příprava %d DASD zařízení pro Linux..."
@@ -5058,9 +6860,6 @@ msgstr "Zavřít"
 #~ msgid "Error setting root password"
 #~ msgstr "Chyba při nastavení hesla správce"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Je  nutné vložit a potvrdit heslo."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Odstranit balíky"
 
@@ -5092,24 +6891,12 @@ msgstr "Zavřít"
 #~ msgid "%s of %s"
 #~ msgstr "%s z %s"
 
-#~ msgid "Region:"
-#~ msgstr "Region:"
-
-#~ msgid "City:"
-#~ msgstr "Město:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-hod"
-
-#~ msgid "AM/PM"
-#~ msgstr "dop./odp."
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Výběr vašeho rozšíření"
 
@@ -5189,9 +6976,6 @@ msgstr "Zavřít"
 #~ msgid "configureButton"
 #~ msgstr "Tlačítko Nastavení"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Dokončit rozdělení"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "NASTAVENÍ SKUPINY ODDÍLŮ"
 
diff --git a/anaconda/po/cy.po b/anaconda/po/cy.po
index 7722bb8..f2f1a46 100644
--- a/anaconda/po/cy.po
+++ b/anaconda/po/cy.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,208 +21,441 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
 "11) ? 2 : 3;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Yn Dechrau VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Defnyddio modd testun"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Iawn"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -231,85 +464,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -318,7 +843,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -332,8 +862,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Achub"
 
@@ -371,28 +901,22 @@ msgstr "System i'w Hachub"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Iawn"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Gadael"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -405,7 +929,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -414,28 +938,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Modd Achub"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Mae'ch system wedi'i osod o dan y cyfeiriadur %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Mae'r rhaniad gwraidd yn llai na 250 megabeit sydd fel arfer yn rhy fach i "
+"arsefydlu %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Ni ddiffinioch raniad gwraidd (root) (/), sydd yn anghenraid er mwyn i "
+"arsefydliad %s barhau."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Mae'r rhaniad gwraidd yn llai na 250 megabeit sydd fel arfer yn rhy fach i "
+"arsefydlu %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Ni phenodoch raniad cyfnewid.  Er nad yw'n gwbl angenrheidiol mewn pob "
+"sefyllfa, fe fydd yn gwella perfformiad yn sylweddol ar gyfer y rhan fwyaf o "
+"arsefydliadau."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -528,84 +1232,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Mae angen mwy o le arnoch ar y systemau ffeil canlynol:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "pecyn(nau) hŷn"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Cynnydd yr Arsefydlu"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Cynnydd yr Arsefydlu"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Nid oes modd cael cwestiwn ym modd llinell orchymyn!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Gwall"
 
@@ -629,31 +1481,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -668,447 +1522,520 @@ msgstr ""
 "cysylltu â'r cyfrifiadur hwn o'r cyfrifiadur arall i wneud gosod graffigol "
 "neu barhau gyda gosod modd testun?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Rhaid i'r cyfrinair fod o leiaf chwe nod o hyd."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Rhaid i'r cyfrinair fod o leiaf chwe nod o hyd."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Cynnydd yr Arsefydlu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Yn Dechrau VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Cynnydd yr Arsefydlu"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Datblygu Meddalwedd"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Rhybudd"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1123,262 +2050,149 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
@@ -1386,319 +2200,261 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Datblygu Meddalwedd"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1725,277 +2481,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Datblygu Meddalwedd"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2003,14 +2783,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2019,33 +2799,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2054,95 +2840,109 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Iawn"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2155,68 +2955,163 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2226,945 +3121,1348 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Parhau"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Iawn"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Defnyddio modd testun"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dyfais RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Ychwanegu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Parhau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Parhau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Parhau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Wedi Cysylltu!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Rhybudd"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Ychwanegu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Iawn"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Ychwanegu"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Iawn"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dyfais RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Ychwanegu"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3172,643 +4470,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Pa iaith hoffech ei defnyddio yn ystod y broses arsefydlu?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Parhau"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Rhydd"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dyfais RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Ychwanegu"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Dyfais RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Dyfais RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Dyfais RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Iawn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Iawn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dyfais RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Rhydd"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dyfais RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Iawn"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Iawn"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Cynnydd yr Arsefydlu"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Ail_gychwyn"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3822,40 +5483,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3864,60 +5526,70 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Gwall"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Mae angen mwy o le arnoch ar y systemau ffeil canlynol:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Nid oes modd cael cwestiwn ym modd llinell orchymyn!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dyfais RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Cyflawnwyd"
 
@@ -3943,9 +5615,6 @@ msgstr ""
 #~ msgstr[2] "%s Beit"
 #~ msgstr[3] "%s Beit"
 
-#~ msgid "Re_boot"
-#~ msgstr "Ail_gychwyn"
-
 #~ msgid "_Retry"
 #~ msgstr "_Ail-geisio"
 
@@ -3955,9 +5624,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "gwrthdaro ffeiliau"
 
-#~ msgid "older package(s)"
-#~ msgstr "pecyn(nau) hŷn"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "prinder gofod ar y ddisg"
 
@@ -3994,20 +5660,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Ni allwch ddileu rhaniad DASD wedi'i fformadu'n LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Ni ddiffinioch raniad gwraidd (root) (/), sydd yn anghenraid er mwyn i "
-#~ "arsefydliad %s barhau."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Mae'r rhaniad gwraidd yn llai na 250 megabeit sydd fel arfer yn rhy fach "
-#~ "i arsefydlu %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4021,15 +5673,6 @@ msgstr ""
 #~ "Wrthi'n arsefydlu ar ddyfais FireWire.  Mae'n bosib na fydd hyn yn creu "
 #~ "system sy'n gweithredu'n gywir."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Ni phenodoch raniad cyfnewid.  Er nad yw'n gwbl angenrheidiol mewn pob "
-#~ "sefyllfa, fe fydd yn gwella perfformiad yn sylweddol ar gyfer y rhan "
-#~ "fwyaf o arsefydliadau."
-
 #~ msgid "Back"
 #~ msgstr "Yn Ôl"
 
diff --git a/anaconda/po/da.po b/anaconda/po/da.po
index 04efde4..05de7ed 100644
--- a/anaconda/po/da.po
+++ b/anaconda/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot-filsystem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "RAID-sæt som indeholder \"%s\" skal have en af følgende raid-niveauer: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -45,7 +45,7 @@ msgstr ""
 "RAID-sæt som indeholder \"%s\" skal have en af følgende metadata-versioner: "
 "%s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -53,108 +53,129 @@ msgid ""
 msgstr ""
 "RAID-sæt som indeholder \"%s\" skal have en af følgende enhedstyper: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s skal have en af følgende disketiket-typer: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s kan ikke være af typen %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s skal monteres på én af %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s skal være mellem %d og %d MB i størrelse"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s må ikke være mindre end %d MB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s må ikke være større end %d MB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s skal være indenfor de første %d MB på disken."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s skal være på en primær-partition."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s kan ikke være på en krypteret blokenhed."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s kan ikke være af typen %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s har muligvis ikke nok plads for grub2 til at indlejre core.img når %s "
 "filsystemet bruges på %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Start VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Brug teksttilstand"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Adgangskode er angivet."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Adgangskoder er ikke ens!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Du har angivet en svag adgangskode: %s.  Tryk Færdig igen for at bruge den "
 "alligevel."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -162,87 +183,338 @@ msgstr ""
 "alligevel."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Svag"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Nogenlunde"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "God"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Stærk"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "O.k."
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Ja"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nej"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Følgende fejl opstod under opsætning af installationsarkivet:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installationen kan ikke fortsætte."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Følgende fejl opstod under opsætning af installationsarkivet:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installationen kan ikke fortsætte."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Følgende software, som er markeret til installerering, har fejl.  Dette er "
+"sansynligvis på grund af en\n"
+"fejl med din installationskilde.  Du kan forsøge at fjerne disse pakker fra "
+"din installation,\n"
+"ændre din installationskilde eller afslutte installationsprogrammet."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Installationen blev stoppet, fordi der umiddelbart er et problem med dit "
+"hardware. Den præcise fejlbesked er:\n"
+"\n"
+"%s.\n"
+"\n"
+" Installationsprogrammet vil nu afslutte."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Installationen blev stoppet, fordi der umiddelbart er et problem med dit "
+"hardware. Den præcise fejlbesked er:\n"
+"\n"
+"%s.\n"
+"\n"
+" Installationsprogrammet vil nu afslutte."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Hardwarefejl opstået"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Installationen blev stoppet, fordi der umiddelbart er et problem med dit "
+"hardware. Den præcise fejlbesked er:\n"
+"\n"
+"%s.\n"
+"\n"
+" Installationsprogrammet vil nu afslutte."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "_Konfigurations-URL"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Kører før-installationsskripter"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Opsætter installationskilde..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Udfører opsætningsopgaver for efterinstallation"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow-certifikat %s kræver netværket."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -254,87 +526,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s mangler. Kan ikke opsætte firewall."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s mangler. Kan ikke opsætte firewall."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Dette filsystem understøtter ikke etiketter."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Kører før-installationsskripter"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Værtsnavnet må være højst 255 tegn langt."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Værtsnavnet skal starte med et gyldigt tegn i området \"a-z\", \"A-Z\" eller "
-"\"0-9\""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Forbinder..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Frakobler..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Trådet (%s) forbundet"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Trådløst forbundet til %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Ikke forbundet"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Ingen netværksenheder tilgængelige"
 
@@ -343,7 +905,12 @@ msgstr "Ingen netværksenheder tilgængelige"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Ny %s %s-installation"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Kør %s for at afmontere systemet når du er færdig."
@@ -356,8 +923,8 @@ msgstr "Når du er færdig, afslut da skallen og dit system vil genstarte."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Kunne ikke finde /bin/sh til at køre!  Starter ikke skal"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Red"
 
@@ -405,21 +972,15 @@ msgstr "System, som skal reddes"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Hvilken enhed indeholder din installations rod-partition?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "O.k."
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Afslut"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Systemet vil genstarte automatisk når du afslutter skallen."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -429,7 +990,7 @@ msgstr ""
 "<Enter> for at gå til en skal, hvorfra du kan fsck og montere dine "
 "partitioner. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -450,7 +1011,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -463,29 +1024,242 @@ msgstr ""
 "\n"
 "Tryk <Enter> for at gå til en skal."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Du har ikke nogen Linux-partitioner.  Genstarter.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Systemet vil genstarte automatisk når du afslutter skallen."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Redningstilstand"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Du har ikke nogen Linux-partitioner. Tryk Enter for at gå til en skal.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Dit system er monteret i mappen %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standard partition"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disk"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"\"swap\"-området på din computer er brugt af operativsystemet\n"
+"når den kører tør for hukommelse."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"\"boot\"-området på din computer er der hvor filer brugt\n"
+"under opstart af operativsystemet er opbevaret."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"\"root\"-området på din computer er der hvor grundsystem-filer\n"
+"og programmer er opbevaret."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"\"home\"-området på din computer er der hvor alle dine personlige\n"
+"data er opbevaret."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Opstartspartitionen for BIOS er krævet for at aktivere opstart\n"
+"fra GPT-partitionerede diske på BIOS-hardware."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PReP-opstartspartitionen er krævet som en del af opstartsindlæser-"
+"konfigurationen på visse PPC-platforme."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Din rod-partition er mindre end 250 megabyte og dette er normalt for lidt "
+"til at installere %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Du har ikke defineret en rod-partition (/). Dette skal gøres før "
+"installationen af %s kan fortsætte."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Denne platform kræver /boot på en dedikeret partition eller logisk "
+"diskenhed. Hvis du ikke ønsker en /boot-diskenhed skal du placere / på en "
+"dedikeret ikke-LVM-partition."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Din %(mount)s-partition er mindre end %(size)s megabyte og dette er mindre "
+"end anbefalet for en normal installation af %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Din %(mount)s-partition er for lille til %(format)s-formatering (tilladt "
+"størrelse er mellem %(minSize)d MB og %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Din %(mount)s-partition er for stor til %(format)s-formatering (tilladt "
+"størrelse er mellem %(minSize)d MB og %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Kunne ikke tilføje ny enhed. Tryk for detaljer."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Du har ikke oprettet en opstartsbar partition."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Dit BIOS-baserede system skal bruge en speciel partition til opstart med "
+"%s's nye disk-etiketformat (GPT). For at fortsætte, skal du oprette en 1 MB "
+"“BIOS Boot”-type partition."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Du har ikke angivet en swap-partition.  %(requiredMem)s MB hukommelse er "
+"krævet for at fortsætte installationen uden en swap-partition, men du har "
+"kun %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Du har ikke angivet en swap-partition. Selv om det ikke er strengt "
+"nødvendigt i alle tilfælle, så vil det øge ydelsen for de fleste "
+"installationer."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Mindst en af dine swap-enheder har ikke et UUID, som er normalt i swap-"
+"områder oprettet med ældre versioner af mkswap. Disse enheder vil blive "
+"refereret til med enhedsstien i /etc/fstab, hvilket ikke er ideelt eftersom "
+"enhedsstier kan ændre sig under forskellige situationer. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Dette monteringspunkt er ugyldigt.  Mappen %s skal være på /-filsystemet."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Monteringspunktet %s skal være på et linux-filsystem."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Adgangssætning:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -596,87 +1370,241 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "VNC-adgangskode angivet var ikke mindst 6 tegn langt.\n"
 "Indtast venligst en ny.  Efterlad blank, hvis adgangskode ikke ønskes."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Kunne ikke indstille installationskilde"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Fejl under nedhentning af pakke-metadata..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Ingen installationskilde tilgængelig"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Installerer software"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Starter pakke-installationsproces"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Du har brug for mere plads på følgende filsystem:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Forbereder overførsel fra installationskilde"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Installerer"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Henter pakke-metadata..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installerer"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Forbereder til installation"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Kontrollerer opbevaringskonfiguration..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "STANDARD TITEL"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALISERING"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALISERING"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Installationshub"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Starter automatiseret installation"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Kan ikke have et spørgsmål i kommandolinjestilstand!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Foretag et valg mellem ovenstående ['a' for at afslutte | 'f' for at "
+"fortsætte]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Færdiggør venligst alle eger før du fortsætter"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "f"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Standard HUB-titel"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "f"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Færdiggør venligst alle eger før du fortsætter"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fejl"
 
@@ -700,25 +1628,28 @@ msgstr "ja"
 msgid "no"
 msgstr "nej"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Ønsker du virkelig at afslutte?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "a"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -727,7 +1658,7 @@ msgstr ""
 "  Foretag et valg mellem ovenstående ['a' for at afslutte | 'f' for at "
 "fortsætte]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -742,219 +1673,258 @@ msgstr ""
 "denne maskine fra en anden maskine og udføre en grafisk installation eller "
 "fortsætte med en tekstbaseret installation?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "a"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC-adgangskode"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Angiv venligst en VNC-adgangskode. Du skal indtaste den to gange.\n"
 "Efterlad blank, hvis adgangskode ikke ønskes."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Adgangskode: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Adgangskode (bekræft): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Adgangskoder er ikke ens!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Adgangskoden skal være på mindst seks tegn."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Adgangskoden skal være på mindst seks tegn."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Tidszone-indstillinger"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Tidszone er ikke angivet."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Tilgængelige regioner"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Tilgængelige regioner"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Kontrollerer opbevaringskonfiguration..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Trådet (%s) forbundet"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Trådet (%s) forbundet"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Værtsnavn"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Værtsnavn"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Værtsnavn"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Gennemfør konfiguration"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "filsystemskonfiguration mangler en type"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root-adgangskode:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Adgangskode er angivet."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root-konto er deaktiveret."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Adgangskode er ikke angivet."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Vælg venligst en ny root-adgangskode. Du skal indtaste den to gange."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Adgangskode: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Brug al mellemrum"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Erstat eksisterende Linux-system(er)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Brug ledig plads"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Installationsdestination"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Ingen diske valgt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Fejl under kontrol af opbevaringskonfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Fejl under kontrol af opbevaringskonfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automatisk partitionering valgt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Tilpasset partitionering valgt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -962,38 +1932,59 @@ msgstr ""
 "Ingen diske fundet.  Sluk venligst computeren, forbind mindst én disk og "
 "genstart for at gennemføre installationen."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Ingen diske valgt; vælg mindst én disk til at installere på."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Afprøver opbevaring..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Genererer opdateret opbevaringskonfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "opbevaringskonfiguration mislykkedes: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Kontrollerer opbevaringskonfiguration..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Indstillinger for autopartitionering"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1002,41 +1993,41 @@ msgstr ""
 "Installationen kræver partitionering af din harddisk.  Vælg hvilken plads du "
 "vil bruge som installationsmålet."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Konfiguration for partitionsskema"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Konfiguration for partitionsskema"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Tidszone-indstillinger"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s-tidszone"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Tidszone er ikke angivet."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Tilgængelige tidszoner i regionen %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Tilgængelige regioner"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1045,178 +2036,196 @@ msgstr ""
 "Brug numre eller indtast navne direkte [b for region-liste, q for at "
 "afslutte]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Start VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installationsfremskridt"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Nærmeste filspejl"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Fejl under indstilling af softwarekilde"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Intet valgt"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Forbinder..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Cd-/dvd-drev"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-fil:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Netværkstid"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Ingen installationskilde tilgængelig"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Kunne ikke indstille installationskilde"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Fejl under nedhentning af pakke-metadata..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Ingen installationskilde tilgængelig"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Indstillinger for NFS-montering:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Kunne ikke indstille installationskilde, kontrollér pakkearkiv-URL'en"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "enheden som indeholder /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Kunne ikke indstille installationskilde"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Redigér softwarevalg"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Fejl under kontrol af softwarevalg"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Installationskilde er ikke indstillet"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Tilpasset software valgt"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Installationskilde er ikke indstillet"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Vælg dit miljø"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Brug godkendelse"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Du skal angive og bekræfte en adgangskode."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Advarsel"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1232,36 +2241,36 @@ msgstr "Under udførelse"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstallations færdig.  Tryk enter for at afslutte"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Standard eger-titel"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "tester status..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Ny enhed"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Adgangskode (bekræft): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1270,7 +2279,7 @@ msgstr ""
 "Du har angivet en svag adgangskode: %s.  Tryk Færdig igen for at bruge den "
 "alligevel."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1279,63 +2288,46 @@ msgstr ""
 "Du har angivet en svag adgangskode: %s.  Tryk Færdig igen for at bruge den "
 "alligevel."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Adgangskode er angivet."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Afslut installationsprogram"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nej"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Ja"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "STANDARD TITEL"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALISERING"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALISERING"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1343,7 +2335,11 @@ msgstr ""
 "Færdiggør venligst elementer markeret med dette ikon før du fortsætter med "
 "det næste trin."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Færdig!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1352,165 +2348,67 @@ msgstr ""
 "%s er nu installeret på dit system med succes og klar til\n"
 "til at bruge!  Genstart for at komme igang med at bruge det!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Færdig!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Afslut"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Ny %s %s-installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s er nu installeret med succes på dit system, men der mangler stadig en "
+"smule konfiguration.\n"
+"Færdiggør det, og tryk på knappen Gennemfør konfiguration."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s er nu installeret på dit system med succes og klar til\n"
+"til at bruge!  Genstart for at komme igang med at bruge det!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Genkonfigurering af enhed mislykkedes. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "kolonne"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Opbevaringskonfiguration nulstillet på grund af en  uoprettelig fejl. Tryk "
 "for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Genkonfigurering af enhed mislykkedes. Tryk for detaljer."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Indtast venligst et gyldigt monteringspunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Det monteringspunkt er ugyldigt. Prøv et andet?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Det monteringspunkt er allerede i brug. Prøv et andet?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Indtast venligst et gyldigt monteringspunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Det monteringspunkt er ugyldigt. Prøv et andet?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standard partition"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disk"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Ingen"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Slet også alle andre filsystemet i roden af %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Er du sikker på at du vil slette al data på %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Er du sikker på at du vil slette al data på %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "MANUEL PARTITIONERING"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d opbevaringsenhed valgt"
 msgstr[1] "%d opbevaringsenheder valgt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1519,131 +2417,112 @@ msgstr ""
 "Når du opretter monteringspunkter for din %s %s-installation\n"
 "vil du være i stand til at se deres detaljer her."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"\"swap\"-området på din computer er brugt af operativsystemet\n"
-"når den kører tør for hukommelse."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"\"boot\"-området på din computer er der hvor filer brugt\n"
-"under opstart af operativsystemet er opbevaret."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"\"root\"-området på din computer er der hvor grundsystem-filer\n"
-"og programmer er opbevaret."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"\"home\"-området på din computer er der hvor alle dine personlige\n"
-"data er opbevaret."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Opstartspartitionen for BIOS er krævet for at aktivere opstart\n"
-"fra GPT-partitionerede diske på BIOS-hardware."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PReP-opstartspartitionen er krævet som en del af opstartsindlæser-"
-"konfigurationen på visse PPC-platforme."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi skal være på en enhed af typen %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s skal være på en enhed af typen %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s kan ikke krypteres"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Du skal oprette et nyt filsystem på rod-enheden."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Forespørgsel om størrelsesændring af enhed mislykkedes. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Forespørgsel om genformatering af enhed mislykkedes. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Dette filsystem understøtter ikke etiketter."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Ingen diske valgt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Dette filsystem kan ikke få ændret størrelsen."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Fejl under kontrol af opbevaringskonfiguration.  Klik for detaljer."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Fejl under kontrol af opbevaringskonfiguration.  Klik for detaljer."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Kunne ikke tilføje ny enhed. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Forespørgsel om fjernelse af enhed mislykkedes. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs ledig"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1652,7 +2531,7 @@ msgstr ""
 "Denne enhed kan ikke redigeres direkte. Du kan fjerne den eller vælge en "
 "anden enhed."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1661,194 +2540,143 @@ msgstr ""
 "Denne enhed kan ikke redigeres direkte. Du kan fjerne den eller vælge en "
 "anden enhed."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Ingen diske valgt."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Ikke nok ledig plads på de valgte diske."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automatisk partitionering mislykkedes. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Redigér softwarevalg"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "Kunne ikke låse krypteret blokenhed op. Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATO & TID"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Ugyldig tidszone"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Du skal indstille netværket først, hvis du ønsker at bruge NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Du har ikke nogen NTP-server konfigureret"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "INSTALLATIONS-DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d opbevaringsenhed valgt"
+msgstr[1] "%d opbevaringsenheder valgt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s for at skifte layouts."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TASTATUR"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Test-layoutkonfiguration er ikke tilgængelig."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "tester status..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Layout-skiftning er ikke konfigureret."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "SPROG"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Status ukendt (mangler)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Status ukendt"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Ikke håndteret"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Utilgængelig"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware mangler"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kabel ikke sat i"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Utilgængelig"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Ikke forbundet"
@@ -1873,153 +2701,169 @@ msgstr "Kobler af"
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "ikke sat i"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Trådløs"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "ikke sat i"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4-adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Ingen"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Godkendelse påkrævet"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Adgangskode: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NETVÆRKSKONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT-ADGANGSKODE"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Adgangskode er angivet."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root-adgangskode er angivet"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root-konto er deaktiveret"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root-adgangskode er ikke angivet"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "VALG AF SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Kontrollerer software-afhængigheder..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Fejl under kontrol af softwareafhængigheder"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Henter pakke-metadata..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Henter gruppe-metadata..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Kontrollerer software-afhængigheder..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Fejl under kontrol af softwareafhængigheder"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Fejl under kontrol af softwareafhængigheder.  Tryk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Følgende software, som er markeret til installerering, har fejl.  Dette er "
 "sansynligvis på grund af en\n"
@@ -2027,46 +2871,77 @@ msgstr ""
 "din installation,\n"
 "ændre din installationskilde eller afslutte installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Annullér"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Afslut"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Redigér softwarekilde"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Redigér softwarevalg"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Opsætter installationskilde..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Fejl under nedhentning af pakke-metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Godkendelse påkrævet"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Dette medie er godt at installere fra."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Dette medie er ikke godt at installere fra."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALLATIONS-KILDE"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Kunne ikke indstille installationskilde, kontrollér pakkearkiv-URL'en"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Kunne ikke indstille pakkearkiv"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Fejl under indstilling af softwarekilde"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2074,98 +2949,80 @@ msgstr ""
 "Kunne ikke indstille installationskilde, kontrollér pakkearkiv-URL'en og "
 "proxy-indstillingerne"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Kunne ikke indstille pakkearkiv"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Fejl under indstilling af softwarekilde"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Enhed:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-server %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Ugyldig tidszone"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Ugyldig tidszone"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Ugyldig tidszone"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Vent venligst... software-metadata indlæser stadig."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "De diske du har valgt har følgende mængder af ledig plads:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Vent venligst... software-metadata indlæser stadig."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2176,7 +3033,7 @@ msgstr ""
 "hjælpe dig\n"
 "med at skaffe plads ved at skrumpe eller fjerne eksisterende partitioner."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2187,7 +3044,7 @@ msgstr ""
 "brugte al ledig plads\n"
 "tilgængelig på de valgte diske."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2202,48 +3059,59 @@ msgstr ""
 "redigere dit softwarevalg for at installere en mindre version af <b>%s</b> "
 "eller afslutte installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "INSTALLATIONS-DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Gemmer opbevaringskonfiguration..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Kunne ikke gemme opbevaringskonfiguration..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formaterer DASD-enhed"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "Fejl under kontrol af opbevaringskonfiguration.  Klik for detaljer."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Fejl under kontrol af opbevaringskonfiguration.  Klik for detaljer."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs ledig"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d disk valgt; %s kapacitet; %s ledig"
 msgstr[1] "%d diske valgt; %s kapacitet; %s ledig"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2253,11 +3121,19 @@ msgstr ""
 "Du kan ændre dit opbevarings-layout\n"
 "eller afslutte installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Redigér opbevaringslayout"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2268,52 +3144,53 @@ msgstr ""
 "Du kan ændre dit opbevarings-layout\n"
 "eller afslutte installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "O.k."
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "NETVÆRKSKONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ugyldig tidszone"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "VELKOMMEN TIL %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2322,23 +3199,27 @@ msgstr ""
 "Du har ikke oprettet nogen monteringspunkter for din %s %s-installation "
 "endnu:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Tryk her for at oprette dem automatisk."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Eller, opret nye monteringspunkter nedenfor med \"+\"-ikonet."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2353,55 +3234,157 @@ msgstr[1] ""
 "<b>%d diske; %s kapacitet; %s ledig plads</b> (ikke partitioneret og i "
 "filsystemer)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Sæt som opstartsenhed"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "kolonne"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Monteringspunktet %s skal være på et linux-filsystem."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Det monteringspunkt er allerede i brug. Prøv et andet?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Indtast venligst et gyldigt monteringspunkt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Det monteringspunkt er ugyldigt. Prøv et andet?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Slet også alle andre filsystemet i roden af %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Er du sikker på at du vil slette al data på %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Er du sikker på at du vil slette al data på %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Ugyldig tidszone"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Du har angivet en svag adgangssætning: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Adgangssætninger er ikke ens."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Bevar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Skrump"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Slet"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Opretter %(type)s på %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Ikke klar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Brug ledig plads"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2414,14 +3397,14 @@ msgstr ""
 "for at frigøre plads til denne installation.  At fjerne et filsystem vil "
 "slette al data, det indeholder, permanant"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2429,353 +3412,762 @@ msgid_plural ""
 msgstr[0] "<b>%s disk; %s genvindbar plads</b> (i filsystemer)"
 msgstr[1] "<b>%s diske; %s genvindbar plads</b> (i filsystemer)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Valgt plads at genvinde i alt: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Slet"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Bevar"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "DISTRIBUTIONSINSTALLATION"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "EGER-NAVN"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "FØR-UDGIVELSE / TESTING"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Ny enhed"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Ny vælger"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Færdig"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Fortsæt"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Anvend ændringer"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NETVÆRKSKONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Gruppenavn"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Annullér"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "O.k."
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATO & TID"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Tilføj og markér for brug af NTP-servere"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Webserver"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Virker"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Brug"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfigurér..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATO & TID"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "By:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "By:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Netværksnavn"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Netværksnavn"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-timers"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "INSTALLATIONS-DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapacitet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Ikke forbundet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Valgte enhed"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Intet valgt"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etiket:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware mangler"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nej"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN-type"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Valgte enhed"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "resumé"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-enhed"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Tilføj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Standard rute"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Subnet-maske"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Hastighed"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardware-adresse"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfigurér..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Sikkerhed"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Netværksnavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Netværksnavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Sikkerhedsnøgle"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Brug som hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Stop hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfigurér..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Udbyder"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfigurér..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN-type"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Gruppenavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Gruppe-adgangskode"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Brugernavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfigurér..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metode"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Konfigurations-URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks-vært"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Kontrollerer opbevaringskonfiguration..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Aflås"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "F_lytilstand"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Kontrollerer opbevaringskonfiguration..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Værtsnavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NETVÆRKSKONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2785,206 +4177,61 @@ msgstr ""
 "og for at gøre\n"
 "software-opdateringer tilgængelige for dig."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Standard rute"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Subnet-maske"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Hastighed"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardware-adresse"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfigurér..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Sikkerhed"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Netværksnavn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Netværksnavn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Sikkerhedsnøgle"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Brug som hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Stop hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfigurér..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Udbyder"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN-type"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Gruppenavn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Gruppe-adgangskode"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Brugernavn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metode"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Konfigurations-URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks-vært"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Aflås"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "F_lytilstand"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Værtsnavn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Brug godkendelse"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Godkendelse påkrævet"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Forbundet"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "VALG AF SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Vælg dit miljø"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "kolonne"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Annullér & _tilføj flere diske"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "INDSTILLINGER FOR INSTALLATION"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Partitionstype:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Kryptér mine data. Jeg angiver en adgangssætning senere."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Tilpasset partitionering valgt"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Genvind plads"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "INDSTILLINGER FOR INSTALLATION"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -2992,78 +4239,145 @@ msgstr ""
 "Her vil vi beskrive hvor meget plads der er brug for til det nuværende "
 "softwarevalg."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disk ledig"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Ledig plads tilgængelig til brug."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs ledig"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Ledig plads utilgængelig, men kan skaffes fra eksisterende partitioner."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Her vil vi beskrive hvad dine muligheder er."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Brug ledig plads"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Afslut installationsprogram"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Enhedsbeskrivelse"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Lokale standarddiske"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Gennemfør partitionering"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Kryptér"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automatisk partitionering valgt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Gennemfør partitionering"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Kryptér"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Kryptér mine data. Jeg angiver en adgangssætning senere."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Indstillinger for autopartitionering"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "resumé"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Fuldt diskresumé og -indstillinger..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "TILFØJ ET TASTATUR-LAYOUT"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Du kan tilføje et tastatur-layout ved at vælge det nedenfor:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Navn"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "TASTATURLAYOUT"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3071,124 +4385,206 @@ msgstr ""
 "Hvilket tastatur-layout vil du bruge på dette system?  Du kan flytte hvilket "
 "som helst layout til toppen af listen for at vælge det som standard."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "navn"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Tilføj layout"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "FJern layout"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Flyt valgte layout op"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Tilføj layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "FJern layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Flyt valgte layout op"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Flyt valgte layout ned"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Forhåndsvis layout"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Test-layoutkonfiguration er ikke tilgængelig."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Skift for at skifte layouts."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Indstillinger"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Tilføj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "TILFØJ ET TASTATUR-LAYOUT"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Du kan tilføje et tastatur-layout ved at vælge det nedenfor:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Tilgængelige regioner"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Tilføj layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "O.k."
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "INDSTILLINGER FOR LAYOUT-SKIFTNING"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Hvilke(n) kombination(er) vil du foretrække til skiftning mellem "
 "tastaturlayouts?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "brug"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "beskrivelse"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Indstillinger for NFS-montering:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "SPROG"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativNavn"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "engelskNavn"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Intet valgt"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT-ADGANGSKODE"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root-adgangskode:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Bekræft:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC-adgangskode"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Angiv root-adgangskode"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3196,236 +4592,283 @@ msgstr ""
 "Root-kontoen bruges til at administrere systemet.  Indtast en adgangskode "
 "for root-brugeren."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Færdig"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MEDIE-VERIFICERING"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Verificerer medie, vent venligst..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Tilføj"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "O.k."
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Aktivér HTTP-proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy-URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Eksempel:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Brug godkendelse"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Brugernavn</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Brugernavn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Adgangskode</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Adgangskode: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALLATIONS-KILDE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Hvilken installationskilde ønsker du at bruge?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Auto-opdaget installationsmedie:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Enhed:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etiket:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verificér"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-fil:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Enhed:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Vælg en ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "På _netværket:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxy-opsætning..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Indstillinger for NFS-montering:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Dette felt er valgfrit."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People-pakkearkiver"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Tilføj et nyt monteringspunkt."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Tilføj"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Fjerne de valgte monteringspunkter."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "FJern layout"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operationel fejl."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Angiv root-adgangskode"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Navn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy-URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Brugernavn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Adgangskode: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Det monteringspunkt er ugyldigt. Prøv et andet?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Få mig væk herfra!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Jeg accepterer min skæbne."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Dette er ustabilt, før-udgivelsessoftware."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3437,199 +4880,262 @@ msgstr ""
 "med. Dette fremtidens OS er ikke et stabilt OS, som du kan stole på.  Det er "
 "kun til test-formål."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "VELKOMMEN TIL %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Hvilket sprog vil du at benytte under installationsprocessen?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Fortsæt"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Brugernavn"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Gruppenavn"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Adgangskode: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC-adgangskode"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Tilføj monteringspunkt"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Ønsket kapacitet:</b>"
+msgid "Add a new mount point."
+msgstr "Tilføj et nyt monteringspunkt."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Monteringspunkt:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Tilføj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "TILFØJ ET NYT MONTERINGSPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Flere tilpasnings-indstillinger er tilgængelige\n"
-"efter oprettelse af monteringspunktet nedenfor."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Det monteringspunkt bliver allerede\n"
-"brugt.  Prøv noget andet?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "f.eks: \"20 GB\", \"500 MB\" (uden citations-tegnene)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Slet det"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "KONFIGURÈR MONTERINGSPUNKT"
+msgid "Remove the selected mount point(s)."
+msgstr "Fjerne de valgte monteringspunkter."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Fri"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-enhed"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "FJern layout"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "Encrypt"
-msgstr "_Kryptér"
+msgid "Reload storage configuration from disk."
+msgstr "opbevaringskonfiguration mislykkedes: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Valgte enhed"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Enhedsbeskrivelse"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Monteringspunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Ønsket kapacitet:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etiket:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Enhedstype:</b>"
+msgid "Device(s):"
+msgstr "Enhed:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Filsystem:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Kryptér"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Genformatér"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Enhedstype:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Kryptér"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Filsystem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Genformatér"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "kolonne"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID-enhed"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3637,17 +5143,19 @@ msgstr ""
 "Denne enhed er krypteret og kan ikke læses uden gyldig adgangssætning. Du "
 "kan låse den op nedenfor."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Adgangssætning:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Lås op"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3655,294 +5163,568 @@ msgstr ""
 "Denne enhed kan ikke redigeres direkte. Du kan fjerne den eller vælge en "
 "anden enhed."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Tilføj et nyt monteringspunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Fjerne de valgte monteringspunkter."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Konfigurér det valgte monteringspunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurér..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "opbevaringskonfiguration mislykkedes: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TILGÆNGELIG PLADS</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">PLADS IALT</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Annullér"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "KONFIGURÈR MONTERINGSPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Vælg en eller flere diske, som denne enhed kan være på."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "O.k."
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-adresse"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Du skal angive et iSCSI-initiatornavn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Brug godkendelse"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Eksempel:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Brugernavn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC-adgangskode"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Brugernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-adgangskode"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Brugernavn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC-adgangskode"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Netværksnavn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Brug godkendelse"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Brugernavn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-adgangskode"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Brugernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-adgangskode"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Brugernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC-adgangskode"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Forbindelse mislykkedes"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "O.k."
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Enhed:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "VALGTE DISKE"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Luk"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Opstart"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Fri"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "FJern layout"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Disk-resumé kommer her"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Slet det"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Intet valgt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "KONFIGURÈR MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Vælg en eller flere diske, som denne enhed kan være på."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Tilføj monteringspunkt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Ønsket kapacitet:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Monteringspunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "TILFØJ ET NYT MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Flere tilpasnings-indstillinger er tilgængelige\n"
+"efter oprettelse af monteringspunktet nedenfor."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Det monteringspunkt bliver allerede\n"
+"brugt.  Prøv noget andet?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "f.eks: \"20 GB\", \"500 MB\" (uden citations-tegnene)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "KONFIGURÈR MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-enhed"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Kryptér"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Indtast venligst et gyldigt monteringspunkt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "O.k."
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formaterer DASD-enhed"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "En ukendt fejl opstod under installation.  Detaljerne er nedenfor."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ADGANGSSÆTNING TIL DISK-KRYPTERING"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Gem adgangssætning"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ADGANGSSÆTNING TIL DISK-KRYPTERING"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3952,7 +5734,19 @@ msgstr ""
 "oprette en adgangssætning, som du bruger til at få adgang til dine data når "
 "du starter din computer."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Adgangssætning:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Bekræft:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3962,117 +5756,172 @@ msgstr ""
 "tastaturlayout vil du muligvis ikke være i stand til at afkryptere dine "
 "diske efter installationen."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "GENVIND DISKPLADS"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "O.k."
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Annullér"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Genvind plads"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "GENVIND DISKPLADS"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Beskrivelse kommer her."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Genvindbar plads"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Handling"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Bevar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Slet"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Skrump"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Tilpasset partitionering valgt"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Anvend ændringer"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Enhed:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Tilføj monteringspunkt"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Afslut installationsprogram"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nej"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Ja"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4080,51 +5929,50 @@ msgstr ""
 "Er du sikker på at du vil afslutte\n"
 "installationsprocessen?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Afslut"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "INSTALLATIONSRESUMÈ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Begynd installation"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURATION"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Forbereder til installation"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s er nu installeret med succes på dit system, men der mangler stadig en "
-"smule konfiguration.\n"
-"Færdiggør det, og tryk på knappen Gennemfør konfiguration."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Gennemfør konfiguration"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s er nu installeret på dit system med succes og klar til\n"
-"til at bruge!  Genstart for at komme igang med at bruge det!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Genstart"
 
@@ -4140,16 +5988,16 @@ msgstr "Installér"
 msgid "Install the live CD to your hard disk"
 msgstr "Installér live-cd til din harddisk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Starter installation til harddisk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Velkommen til Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4158,26 +6006,27 @@ msgstr ""
 "%s kræver %s MB hukommelse for at kunne installeres, men du har kun %s MB i "
 "denne maskine.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Det grafiske installationsprogram for %s kræver %s MB hukommelse, men du har "
 "kun %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Ikke nok RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4191,24 +6040,24 @@ msgstr ""
 "\n"
 " i en root-terminal."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Starter teksttilstand."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fejl"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY-variabel er ikke sat. Starter i teksttilstand."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafisk installation er ikke tilgængelig. Starter i teksttilstand."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4219,20 +6068,20 @@ msgstr ""
 "dig ikke mulighed for at angive dit eget partitioneringslayout eller "
 "pakkevalg. Vil du bruge VNC-tilstanden istedet?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Skriv venligst ssh install@%s for at begynde installationen."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Skriv venligst ssh install@<vært> for at fortsætte installationen."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Prøv Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4242,7 +6091,7 @@ msgstr ""
 "Du kan installere Fedora nu, eller vælge “Installér til harddisk” i "
 "Aktivitets-overblikket på et senere tidspunkt."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4250,10 +6099,86 @@ msgstr ""
 "Du kan vælge “Installér til harddisk”\n"
 "i Aktivitets-overblikket på et senere tidspunkt."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Luk"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Værtsnavnet skal starte med et gyldigt tegn i området \"a-z\", \"A-Z\" "
+#~ "eller \"0-9\""
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Du har brug for mere plads på følgende filsystem:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Kan ikke have et spørgsmål i kommandolinjestilstand!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Det monteringspunkt er ugyldigt. Prøv et andet?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Fejl under nedhentning af pakke-metadata..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Intet valgt"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware mangler"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Godkendelse påkrævet"
+
+#~ msgid "column"
+#~ msgstr "kolonne"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Partitionstype:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy-URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Brugernavn</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Adgangskode</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Det monteringspunkt er ugyldigt. Prøv et andet?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etiket:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Filsystem:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-enhed"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Konfigurér det valgte monteringspunkt."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">TILGÆNGELIG PLADS</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">PLADS IALT</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Færdig"
 
@@ -4304,41 +6229,9 @@ msgstr "Luk"
 #~ msgid "Install on System"
 #~ msgstr "Installér på system"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Følgende fejl opstod under opsætning af installationsarkivet:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installationen kan ikke fortsætte."
-
 #~ msgid "Exit installer"
 #~ msgstr "Afslut installationsprogram"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Installationen blev stoppet, fordi der umiddelbart er et problem med dit "
-#~ "hardware. Den præcise fejlbesked er:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Installationsprogrammet vil nu afslutte."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Hardwarefejl opstået"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Afslut installationsprogram"
 
@@ -4640,9 +6533,6 @@ msgstr "Luk"
 #~ msgid "Software Development"
 #~ msgstr "Softwareudvikling"
 
-#~ msgid "Web Server"
-#~ msgstr "Webserver"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4686,50 +6576,6 @@ msgstr "Luk"
 #~ "der ikke kan slettes:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Du har ikke defineret en rod-partition (/). Dette skal gøres før "
-#~ "installationen af %s kan fortsætte."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Din rod-partition er mindre end 250 megabyte og dette er normalt for lidt "
-#~ "til at installere %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Denne platform kræver /boot på en dedikeret partition eller logisk "
-#~ "diskenhed. Hvis du ikke ønsker en /boot-diskenhed skal du placere / på en "
-#~ "dedikeret ikke-LVM-partition."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Din %(mount)s-partition er mindre end %(size)s megabyte og dette er "
-#~ "mindre end anbefalet for en normal installation af %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Din %(mount)s-partition er for lille til %(format)s-formatering (tilladt "
-#~ "størrelse er mellem %(minSize)d MB og %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Din %(mount)s-partition er for stor til %(format)s-formatering (tilladt "
-#~ "størrelse er mellem %(minSize)d MB og %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4746,56 +6592,6 @@ msgstr "Luk"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "du har ikke oprettet en opstartsindlæser-stage1-målenhed"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Du har ikke oprettet en opstartsbar partition."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Dit BIOS-baserede system skal bruge en speciel partition til opstart med "
-#~ "%s's nye disk-etiketformat (GPT). For at fortsætte, skal du oprette en 1 "
-#~ "MB “BIOS Boot”-type partition."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Du har ikke angivet en swap-partition.  %(requiredMem)s MB hukommelse er "
-#~ "krævet for at fortsætte installationen uden en swap-partition, men du har "
-#~ "kun %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Du har ikke angivet en swap-partition. Selv om det ikke er strengt "
-#~ "nødvendigt i alle tilfælle, så vil det øge ydelsen for de fleste "
-#~ "installationer."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Mindst en af dine swap-enheder har ikke et UUID, som er normalt i swap-"
-#~ "områder oprettet med ældre versioner af mkswap. Disse enheder vil blive "
-#~ "refereret til med enhedsstien i /etc/fstab, hvilket ikke er ideelt "
-#~ "eftersom enhedsstier kan ændre sig under forskellige situationer. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Dette monteringspunkt er ugyldigt.  Mappen %s skal være på /-filsystemet."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Monteringspunktet %s skal være på et linux-filsystem."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux på %s"
 
@@ -4805,11 +6601,6 @@ msgstr "Luk"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s for %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formaterer DASD-enhed"
-#~ msgstr[1] "Formaterer DASD-enheder"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Forbereder %d DASD-enhed til brug med Linux..."
@@ -5012,9 +6803,6 @@ msgstr "Luk"
 #~ msgid "Error setting root password"
 #~ msgstr "Fejl under indstilling af root-adgangskode"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Du skal angive og bekræfte en adgangskode."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Fjern pakker"
 
@@ -5033,24 +6821,12 @@ msgstr "Luk"
 #~ msgid "%s of %s"
 #~ msgstr "%s af %s"
 
-#~ msgid "Region:"
-#~ msgstr "Region:"
-
-#~ msgid "City:"
-#~ msgstr "By:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-timers"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Vælg dine tilføjelser"
 
@@ -5126,9 +6902,6 @@ msgstr "Luk"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Gennemfør partitionering"
-
 #~ msgid "Id"
 #~ msgstr "Id"
 
diff --git a/anaconda/po/de.po b/anaconda/po/de.po
index 9e89109..d4890b9 100644
--- a/anaconda/po/de.po
+++ b/anaconda/po/de.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
@@ -39,11 +39,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot-Dateisystem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -52,7 +52,7 @@ msgstr ""
 "RAID-Verbünde, die »%s« enthalten, müssen eine der folgenden RAID-Stufen "
 "haben: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -61,7 +61,7 @@ msgstr ""
 "RAID-Verbünde, die »%s« enthalten, müssen eine der folgenden Metadaten-"
 "Versionen haben: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -70,109 +70,130 @@ msgstr ""
 "RAID-Verbünde, die »%s« enthalten, müssen einen der folgenden Gerätetypen "
 "haben: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s muss einen der folgenden Dateisystemtypen haben: %s. "
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s kann nicht vom Typ %s sein."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s muss eingehängt sein auf %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s muss zwischen %d und %d MB liegen"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s darf nicht kleiner als %dMB sein."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s darf nicht größer als %dMB sein."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s muss innerhalb der ersten %dMB des Datenträgers liegen."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s muss sich auf einer primären Partition befinden."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 "%s kann nicht auf einem verschlüsselten blockorientierten Gerät liegen."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s kann nicht vom Typ %s sein"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s besitzt möglicherweise für Grub2 nicht genügend Speicherplatz, um core."
 "img einzubinden, wenn das %s-Dateisystem auf %s benutzt wird"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC starten"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Textmodus verwenden"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Das Passwort ist gesetzt."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Passwörter stimmen nicht überein!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Sie haben ein schwaches Passwort eingegeben: %s.  Um es trotzdem zu "
 "verwenden, fahren Sie weiter."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -180,87 +201,340 @@ msgstr ""
 "verwenden, fahren Sie weiter."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Schwach"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Ausreichend"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Gut"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Stark"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Ja"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nein"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Der folgende Fehler trat bei der Einrichtung der Installations-Paketquelle "
+"auf:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Die Installation kann nicht fortgesetzt werden."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Der folgende Fehler trat bei der Einrichtung der Installations-Paketquelle "
+"auf:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Die Installation kann nicht fortgesetzt werden."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Die für die Installation gekennzeichnete Software weist Fehler auf.  Dies "
+"ist vermutlich auf einen Fehler mit\n"
+"Ihrer Installationsquelle zurückzuführen.   Sie können versuchen, diese "
+"Pakete von Ihrer Installation auszuschließen, Ihre Installationsquelle zu "
+"ändern oder das Installationsprogramm zu beenden."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Die Installation wurde aufgrund von Problemen mit der Hardware angehalten. "
+"Die genaue Fehlermeldung war:\n"
+"\n"
+"%s.\n"
+"\n"
+" Die Installation wird nun abgebrochen."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Die Installation wurde aufgrund von Problemen mit der Hardware angehalten. "
+"Die genaue Fehlermeldung war:\n"
+"\n"
+"%s.\n"
+"\n"
+" Die Installation wird nun abgebrochen."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Hardware-Fehler ist aufgetreten"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Die Installation wurde aufgrund von Problemen mit der Hardware angehalten. "
+"Die genaue Fehlermeldung war:\n"
+"\n"
+"%s.\n"
+"\n"
+" Die Installation wird nun abgebrochen."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Installiertes System konfigurieren"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Netzwerk-Konfiguration schreiben"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Benutzer erstellen"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Installiertes System konfigurieren"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Prä-Installationsskripte werden ausgeführt"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Installationsquelle einrichten..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Bootloader installieren"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Nach-Installationsaufgaben werden ausgeführt"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Bootloader installieren"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow-Zertifikat %s benötigt eine Netzwerkverbindung."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -273,32 +547,324 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s ist nicht vorhanden. Firewall kann nicht eingerichtet werden."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s ist nicht vorhanden. Firewall kann nicht eingerichtet werden."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Das Dateisystem unterstützt keine Labels."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Der gewählte Name %s wird bereits benutzt."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+"Medien-Gruppenname %s wird bereits benutzt. Änderungen werden nicht "
+"gespeichert."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Prä-Installationsskripte werden ausgeführt"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Hostname kann nicht leer sein"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Der Rechnername darf aus maximal 255 Zeichen bestehen."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Der Rechnername muss mit einem Zeichen im Bereich »a-z«, »A-Z« oder »0-9« "
-"beginnen"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -308,55 +874,55 @@ msgstr ""
 "bestehen. Teile zwischen Kommas müssen mindestens ein anderes Zeichen "
 "enthalten und dürfen nicht mit einem Bindestrich beginnen oder enden."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Trennen..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Kabelverbindung (%s) aktiv"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Kabellos verbunden mit %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Keine Netzwerkgeräte verfügbar"
 
@@ -365,7 +931,12 @@ msgstr "Keine Netzwerkgeräte verfügbar"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s INSTALLATION"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Neue %s %s Installation"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Führen Sie %s aus, um das System auszuhängen, wenn Sie fertig sind."
@@ -381,8 +952,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "/bin/sh kann nicht gefunden und ausgeführt werden! Shell wird nicht gestartet"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Wiederherstellung"
 
@@ -431,21 +1002,15 @@ msgstr "Wiederherzustellendes System"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Auf welchem Gerät befindet sich die Root-Partition der Installation?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Beenden"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Das System wird automatisch neu gestartet, wenn Sie die Shell beenden."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -456,7 +1021,7 @@ msgstr ""
 "Shell zu erhalten, aus der Sie die fsck (die Dateisystemüberprüfung) "
 "ausführen und Ihre Partitionen einhängen können. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -477,7 +1042,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -490,31 +1055,246 @@ msgstr ""
 "\n"
 "Bitte drücken Sie die <Eingabetaste>,  um in eine Shell zu gelangen."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Sie haben keine Linux-Partitionen. Es wird neu gestartet.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " Das System wird automatisch neu gestartet, wenn Sie die Shell verlassen."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Wiederherstellungsmodus"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Sie haben keine Linux-Partitionen. Drücken Sie die Eingabetaste, um eine "
 "Shell zu erhalten.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Ihr System wurde unter dem Verzeichnis %s eingehängt."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standard-Partition"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Festplatte"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Der »SWAP«-Bereich Ihres Computers wird vom Betriebssystem\n"
+"benötigt, wenn Ihr System wenig Arbeitsspeicher zur Verfügung hat."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Im »Boot«-Bereich Ihres Computers sind die zum Start\n"
+"Ihres Betriebssystems benötigten Dateien abgelegt."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"Im »Root«-Bereich Ihres Computers werden die Kern-\n"
+"Systemdateien und Anwendungen abgelegt."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"Im »Home«-Bereich Ihres Computers werden Ihre persönlichen\n"
+"Daten abgespeichert."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Die BIOS-Bootpartition wird benötigt, um das Starten von GPT-partitionierten "
+"Speichermedien auf BIOS-Hardware zu aktivieren."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"Auf einigen PPC-Plattformen wird die PReP-Bootpartition \n"
+"als Teil der Bootloader-Konfiguration benötigt."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Ihre Root-Partition ist kleiner als 250 Megabyte, was für die Installation "
+"von %s gewöhnlich zu wenig ist."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Sie haben keine Root-Partition definiert (/), die notwendig ist, um mit der "
+"Installation von %s fortzufahren."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Diese Plattform benötigt /boot auf einer dedizierten Partition oder auf "
+"einem logischen Datenträger. Falls Sie keinen /boot-Datenträger haben "
+"möchten, müssen Sie / auf einer dedizierten Nicht-LVM-Partition einrichten."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Ihre %(mount)s-Partition ist kleiner als %(size)s MB, was für die "
+"Installation von %(productName)s gewöhnlich zu wenig ist. "
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Ihre %(mount)s-Partition ist zu klein für eine %(format)s-Formatierung "
+"(mögliche Größe ist von %(minSize)d MB bis %(maxSize)d MB)."
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Ihre %(mount)s-Partition ist zu groß für eine %(format)s-Formatierung "
+"(mögliche Größe ist von %(minSize)d MB bis %(maxSize)d MB)."
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Neues Gerät konnte nicht hinzugefügt werden. Klick für Einzelheiten."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Sie haben keine bootbare Partition erstellt."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Ihr BIOS-basiertes System benötigt eine spezielle Partition, um mit %ss "
+"neuem Disk-Label-Format (GPT) starten zu können. Um fortzufahren, erstellen "
+"Sie bitte eine 1MB große »BIOS Boot«-Typ-Partition."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Sie haben keine Auslagerungspartition eingerichtet. %(requiredMem)s MB sind "
+"nötig, um die Installation ohne Auslagerungspartition fortzusetzen, aber Sie "
+"verfügen nur über %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Sie haben keine Auslagerungspartition (Swap) angegeben. Obwohl diese nicht "
+"in jedem Fall unbedingt erforderlich ist, verbessert dies doch die Leistung "
+"bei den meisten Installationen."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Mindestens eines Ihrer Auslagerungsgeräte hat keine UUID, was für solche "
+"Geräte üblich ist, die mit älteren Versionen von mkswap angelegt wurden. "
+"Diese Geräte werden werden über den Pfad in /etc/fstab identifiziert. Dies "
+"ist nicht ideal, da sich Gerätepfade unter verschiedenen Umständen ändern "
+"können."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Dieser Einhängepunkt ist ungültig. Der Ordner %s muss sich im /-Dateisystem "
+"befinden."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Der Einhängepunkt %s muss sich auf einem Linux-Dateisystem befinden."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Passphrase:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -626,54 +1406,139 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Das eingegebene VNC-Passwort umfasst nicht mindestens 6 Zeichen. Bitte geben "
 "Sie ein neues Passwort ein. Falls Sie kein Passwort setzen möchten, lassen "
 "Sie das Feld leer."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Einrichten des Installationsquelle fehlgeschlagen"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Fehler beim Herunterladen der Paket-Metadaten..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Keine Installationsquelle verfügbar"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Software wird installiert"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Paket-Installationsvorgang starten"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Sie benötigen mehr Platz auf folgenden Dateisystemen:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Transaktion von der Installationsquelle wird vorbereitet"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Installation wird ausgeführt"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Paket-Metadaten herunterladen..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installation wird ausgeführt"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Installation wird vorbereitet"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Überprüfe Speichermedien-Konfiguration..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "STANDARD-ÜBERSCHRIFT"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALISIERUNG"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALISIERUNG"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "BENUTZEREINSTELLUNGEN"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -682,34 +1547,103 @@ msgstr ""
 "Nicht genügend Speicherplatz für die aktuelle Software-Auswahl. Zusätzlich "
 "werden %s benötigt."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Installations-Nabe"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Automatische Installation wird gestartet"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Keine Frage im Befehlszeilenmodus möglich!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Bitte treffen Sie oben Ihre Wahl [»q«, um zu beenden | »c«, um "
+"fortzufahren]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Bitte vervollständigen Sie alle Speichen, bevor Sie weiterfahren."
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Standard-Naben-Überschrift"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Bitte vervollständigen Sie alle Speichen, bevor Sie weiterfahren."
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fehler"
 
@@ -733,25 +1667,28 @@ msgstr "Ja"
 msgid "no"
 msgstr "Nein"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Möchten Sie wirklich beenden?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -760,7 +1697,7 @@ msgstr ""
 "  Bitte treffen Sie oben Ihre Wahl [»q«, um zu beenden | »c«, um "
 "fortzufahren]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -776,220 +1713,259 @@ msgstr ""
 "grafische Installation durchführen oder mit einer Installation im Textmodus "
 "fortfahren?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC-Passwort"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Bitte geben Sie ein VNC-Passwort an. Sie müssen es bestätigen.\n"
 "Wenn kein Passwort gesetzt werden soll, lassen Sie das Feld leer."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Passwort:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Passwort (Bestätigung):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Passwörter stimmen nicht überein!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Das Passwort muss aus mindestens sechs Zeichen bestehen."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Das Passwort muss aus mindestens sechs Zeichen bestehen."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Zeitzonen-Einstellungen"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Zeitzone ist nicht gesetzt."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Verfügbare Regionen"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Verfügbare Regionen"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Netzwerk-Konfiguration schreiben"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Kabelverbindung (%s) aktiv"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Kabelverbindung (%s) aktiv"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Rechnername:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Hostname"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Hostname"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Rechnername ist ungültig: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Konfiguration fertigstellen"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "In der Dateisystem-Konfiguration fehlt ein Typ"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Installiertes System konfigurieren"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root-Passwort:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Das Passwort ist gesetzt."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root-Konto ist deaktiviert."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Passwort ist nicht gesetzt."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Bitte geben Sie ein neues Root-Passwort ein. Sie müssen es zwei Mal eingeben."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Passwort:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Gesamten Speicherplatz benutzen"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Ersetze bestehende(s) Linux-System(e)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Freien Speicherplatz benutzen"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Installationsziel"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Keine Medien ausgewählt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Fehler beim Überprüfen der Speichermedien-Konfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Fehler beim Überprüfen der Speichermedien-Konfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automatische Partitionierung ausgewählt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Benutzerdefinierte Partitionierung ausgewählt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -998,40 +1974,62 @@ msgstr ""
 "schließen Sie mindestens ein Speichermedium an und starten Sie den Rechner "
 "neu, um die Installation abzuschließen."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Keine Speichermedien ausgewählt; bitte wählen Sie mindestens ein "
 "Installationsmedium."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Überprüfen des Speichermediums..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Auswählen"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Erstelle aktualisierte Speicher-Konfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "Speichermedien-Konfiguration fehlgeschlagen: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Überprüfe Speichermedien-Konfiguration..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Optionen zur selbständigen Partitionierung"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1040,41 +2038,41 @@ msgstr ""
 "Für die Installation muss Ihre Festplatte partitioniert werden.  Wählen Sie "
 "den Speicherplatz, der für die Installation genutzt werden soll."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Konfiguration des Partitionsschemas"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Konfiguration des Partitionsschemas"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Zeitzonen-Einstellungen"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s Zeitzone"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Zeitzone ist nicht gesetzt."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Verfügbare Zeitzonen für die Region %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Verfügbare Regionen"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1083,180 +2081,198 @@ msgstr ""
 "Benutzen Sie dazu Zahlen oder geben Sie die Namen direkt ein [b für die "
 "Liste der Regionen, q um zu beenden]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC starten"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installationsfortschritt"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Spiegel-Server in der Nähe"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-Server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Fehler beim Einrichten der Softwarequelle"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Nichts ausgewählt"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Verbinden..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD-/ DVD-Laufwerk"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-Datei:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Netzwerk-Zeit"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Keine Installationsquelle verfügbar"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Einrichten des Installationsquelle fehlgeschlagen"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Fehler beim Herunterladen der Paket-Metadaten..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Keine Installationsquelle verfügbar"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-Server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS-Einhänge-Optionen:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Einrichten des Installationsquelle fehlgeschlagen, überprüfen Sie die URL "
 "der Paketquelle"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "Das Gerät, welches /boot enthält"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Einrichten des Installationsquelle fehlgeschlagen"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Software _anpassen"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Fehler beim Überprüfen der Software-Auswahl"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Installationsmedium nicht eingerichtet"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Quelle geändert - bitte überprüfen"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Benutzerdefinierte Software ausgewählt"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Installationsmedium nicht eingerichtet"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Wählen Sie Ihre Umgebung"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Authentifizierung verwenden"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Sie müssen ein Passwort angeben und bestätigen."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Warnung"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1273,36 +2289,36 @@ msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 "\tInstallation abgeschlossen.  Drücken Sie die Eingabetaste, um zu beenden"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Standard-Speichen-Überschrift"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "Status wird überprüft..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Neues Gerät"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Passwort (Bestätigung):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1311,7 +2327,7 @@ msgstr ""
 "Sie haben ein schwaches Passwort eingegeben: %s.  Um es trotzdem zu "
 "verwenden, fahren Sie weiter."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1320,63 +2336,47 @@ msgstr ""
 "Sie haben ein schwaches Passwort eingegeben: %s.  Um es trotzdem zu "
 "verwenden, fahren Sie weiter."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Das Passwort ist gesetzt."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Installer _beenden"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Hilfe"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nein"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Ja"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "STANDARD-ÜBERSCHRIFT"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALISIERUNG"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALISIERUNG"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "BENUTZEREINSTELLUNGEN"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1384,7 +2384,11 @@ msgstr ""
 "Bitte vervollständigen Sie die Schritte, die mit diesem Symbol markiert "
 "sind, bevor Sie mit dem nächsten Schritt weiterfahren."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Vollständig!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1393,171 +2397,68 @@ msgstr ""
 "%s ist jetzt erfolgreich auf Ihrem System installiert und steht\n"
 "für Sie bereit! Nach einem Neustart können Sie beginnen!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Vollständig!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Beenden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Neue %s %s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s wurde erfolgreich auf Ihrem System installiert, allerdings müssen noch "
+"einige Konfigurationen vorgenommen werden. \n"
+"Vervollständigen Sie dies und klicken Sie anschließend auf die Schaltfläche "
+"»Konfiguration fertigstellen«."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s ist jetzt erfolgreich auf Ihrem System installiert und steht\n"
+"für Sie bereit! Nach einem Neustart können Sie beginnen!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Neue Medien-Gruppe erstellen ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Erneute Geräte-Konfiguration fehlgeschlagen. Klick für Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Bitte setzen Sie einen Namen für Ihre Mediengruppe und wählen Sie "
-"nachfolgend mindestens ein Speichermedium aus."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Mediengruppe:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "Spalte"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Aufgrund eines nicht behebbaren Fehlers wurde die Konfiguration der "
 "Speichermedien zurückgesetzt. Klick für Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Erneute Geräte-Konfiguration fehlgeschlagen. Klick für Einzelheiten."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Bitte geben Sie einen gültigen Einhängepunkt an."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Dieser Einhängepunkt ist ungültig. Etwas anderes probieren?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-"Dieser Einhängepunkt ist bereits in Benutzung. Etwas anderes probieren?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Das von Ihnen gewählte RAID-Level erfordert mehr Festplatten, als Sie "
-"derzeit ausgewählt haben."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Bitte geben Sie einen gültigen Einhängepunkt an."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Dieser Einhängepunkt ist ungültig. Etwas anderes probieren?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standard-Partition"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Festplatte"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Kein"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Ebenfalls alle weiteren Dateisysteme im %s-Root löschen."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Sind Sie sicher, dass Sie alle Daten auf %s löschen möchten?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Sind Sie sicher, dass Sie alle Daten auf %s löschen möchten?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "MANUELLE PARTITIONIERUNG"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d Speichermedium ausgewählt"
 msgstr[1] "%d Speichermedien ausgewählt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1566,137 +2467,122 @@ msgstr ""
 "Falls Sie Einhängepunkte für Ihre %s %s Installation erstellen,\n"
 "sehen Sie die hier die Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Der »SWAP«-Bereich Ihres Computers wird vom Betriebssystem\n"
-"benötigt, wenn Ihr System wenig Arbeitsspeicher zur Verfügung hat."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Im »Boot«-Bereich Ihres Computers sind die zum Start\n"
-"Ihres Betriebssystems benötigten Dateien abgelegt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"Im »Root«-Bereich Ihres Computers werden die Kern-\n"
-"Systemdateien und Anwendungen abgelegt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"Im »Home«-Bereich Ihres Computers werden Ihre persönlichen\n"
-"Daten abgespeichert."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Die BIOS-Bootpartition wird benötigt, um das Starten von GPT-partitionierten "
-"Speichermedien auf BIOS-Hardware zu aktivieren."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"Auf einigen PPC-Plattformen wird die PReP-Bootpartition \n"
-"als Teil der Bootloader-Konfiguration benötigt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi muss sich auf einem Medium des Typs %s befinden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s muss sich auf einem Medium des Typs %s befinden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s kann nicht verschlüsselt werden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Sie müssen ein neues Dateisystem auf dem Root-Gerät anlegen."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Geräte vom Typ %s erfordern die Auswahl eines gültigen RAID-Levels."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Anfrage auf Größenanpassung des Gerätes fehlgeschlagen. Klick für "
 "Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Anforderung auf erneute Geräte-Formatierung fehlgeschlagen . Klick für "
 "Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Der gewählte Name %s wird bereits benutzt."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Das Dateisystem unterstützt keine Labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Keine Medien ausgewählt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Das Dateisystem kann in seiner Größe nicht angepasst werden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Fehler beim Überprüfen Ihrer Speicher-Konfiguration. Klick für mehr "
+"Einzelheiten."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Fehler beim Überprüfen Ihrer Speicher-Konfiguration. Klick für mehr "
+"Einzelheiten."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "%s neu zu bestehendem Container %s hinzugefügt."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Neues Gerät konnte nicht hinzugefügt werden. Klick für Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "Ungültige Partitionsgröße gesetzt. Benutzen Sie einen gültigen Integer-Wert."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "Anforderung zum Entfernen des Gerätes fehlgeschlagen. Klick für Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 "Medien-Gruppenname %s wird bereits benutzt. Änderungen werden nicht "
 "gespeichert."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs frei"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1705,7 +2591,7 @@ msgstr ""
 "%d von %d Mitgliedspartitionen sind bei diesem Software-RAID nicht "
 "vorhanden. Sie können sie löschen oder ein anderes Gerät wählen."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1714,200 +2600,149 @@ msgstr ""
 "Dieser Gruppe von LVM-Speichermedien fehlen %d von %d physischen "
 "Speichermedien. Sie können sie entfernen oder ein anderes Gerät wählen."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Keine Speichermedien ausgewählt."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Nicht genügend Speicherplatz auf den gewählten Speichermedien."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automatische Partitionierung fehlgeschlagen. Klick für Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Software _anpassen"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Entsperren des verschlüsselten Block-Gerätes fehlgeschlagen. Klick für "
 "Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATUM & UHRZEIT"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Ungültige Zeitzone"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 "Sie müssen zuerst die Netzwerkverbindung einrichten, wenn Sie NTP nutzen "
 "möchten"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Sie haben keinen funktionierenden NTP-Server konfiguriert"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "INSTALLATIONSZIEL"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d Speichermedium ausgewählt"
+msgstr[1] "%d Speichermedien ausgewählt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s um zwischen Belegungen zu wechseln."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TASTATUR"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Das Testen der Layout-Konfigurationen ist nicht verfügbar."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "Status wird überprüft..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 "Die Funktion zum raschen Wechseln der Tastaturbelegungen ist nicht "
 "konfiguriert."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "SPRACHE"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Status unbekannt (nicht vorhanden)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Status unbekannt"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Nicht verwaltet"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware nicht vorhanden"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kein Kabel angeschlossen"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Getrennt"
@@ -1932,154 +2767,170 @@ msgstr "Verbindungsabbau"
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlaggen"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "ausgesteckt"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Drahtlos"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "ausgesteckt"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4-Adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6-Adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Kein"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Authentifizierung benötigt"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Passwort:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NETZWERK-KONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "Root-Passwort"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Das Passwort ist gesetzt."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root-Passwort wurde gesetzt"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root-Konto ist deaktiviert"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root-Passwort ist nicht gesetzt"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SOFTWARE-AUSWAHL"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Überprüfe Software-Abhängigkeiten..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Fehler beim Überprüfen der Software-Abhängigkeiten"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Paket-Metadaten herunterladen..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Gruppen-Metadaten herunterladen..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Überprüfe Software-Abhängigkeiten..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Fehler beim Überprüfen der Software-Abhängigkeiten"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Fehler beim Überprüfen der Software-Abhängigkeiten.  Klick für Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Die für die Installation gekennzeichnete Software weist Fehler auf.  Dies "
 "ist vermutlich auf einen Fehler mit\n"
@@ -2087,48 +2938,79 @@ msgstr ""
 "Pakete von Ihrer Installation auszuschließen, Ihre Installationsquelle zu "
 "ändern oder das Installationsprogramm zu beenden."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Abbrechen"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Beenden"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Software-Quelle ändern"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Software _anpassen"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Installationsquelle einrichten..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Fehler beim Herunterladen der Paket-Metadaten..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Authentifizierung benötigt"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Von diesem Medium kann installiert werden."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Von diesem Medium kann nicht installiert werden."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALLATIONSMEDIUM"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Einrichten des Installationsquelle fehlgeschlagen, überprüfen Sie die URL "
 "der Paketquelle"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Fehler beim Einrichten der Paketquelle"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Fehler beim Einrichten der Softwarequelle"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2136,86 +3018,73 @@ msgstr ""
 "Einrichten des Installationsquelle fehlgeschlagen, überprüfen Sie die URL "
 "der Paketquelle und die Proxy-Einstellungen"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Fehler beim Einrichten der Paketquelle"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Fehler beim Einrichten der Softwarequelle"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Gerät:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-Server %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Ungültige Zeitzone"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Ungültige Zeitzone"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Ungültige Zeitzone"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Bitte warten... Software-Metadaten werden noch geladen."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
@@ -2223,12 +3092,7 @@ msgstr ""
 "Dies ausgewählten Speichermedien haben den folgenden verfügbaren "
 "Speicherplatz:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Bitte warten... Software-Metadaten werden noch geladen."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2240,7 +3104,7 @@ msgstr ""
 "Speicherplatz frei zu machen, indem die bestehenden Partitionen verkleinert "
 "oder verschoben werden."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2251,7 +3115,7 @@ msgstr ""
 "wenn der gesamte freie Speicherplatz \n"
 "der gewählten Speichermedien verwendet würde."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2265,46 +3129,53 @@ msgstr ""
 "Speichermedien hinzufügen, Ihre Software-Auswahl ändern, um eine kleinere "
 "Version von <b>%s</b> zu installieren oder das Installationsprogramm beenden."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "INSTALLATIONSZIEL"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Speicherkonfiguration sichern..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Das Sichern der Speicher-Konfiguration ist fehlgeschlagen..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD-Gerät formatieren"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Fehler beim Überprüfen Ihrer Speicher-Konfiguration. Klick für mehr "
 "Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Fehler beim Überprüfen Ihrer Speicher-Konfiguration. Klick für mehr "
 "Einzelheiten."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs frei"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d Speichermedium ausgewählt; %s Kapazität; %s verfügbar"
 msgstr[1] "%d Speichermedien ausgewählt; %s Kapazität; %s verfügbar"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2312,7 +3183,11 @@ msgstr ""
 "Sie haben sich dazu entschieden, die Bootloader-Installation zu "
 "überspringen.  Ihr System kann eventuall nicht gestartet werden."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2322,11 +3197,19 @@ msgstr ""
 "aufgetreten.  Sie können die Speicher-Konfiguration ändern\n"
 "oder das Installationsprogramm beenden."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Speicherplatz-Belegung anpassen"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2337,53 +3220,53 @@ msgstr ""
 "aufgetreten.  Sie können die Speicher-Konfiguration ändern\n"
 "oder das Installationsprogramm beenden."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "BENUTZEREINSTELLUNGEN"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ungültige Zeitzone"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "Willkommen bei %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATEN"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2391,23 +3274,27 @@ msgid ""
 msgstr ""
 "Sie haben noch keine Einhängepunkte für Ihre %s %s Installation erstellt:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Hier klicken, um diese automatisch zu erstellen."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Oder erstellen Sie weitere Einhängepunkte mit dem »+«-Symbol."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2422,55 +3309,164 @@ msgstr[1] ""
 "<b>%d Speichermedien; %s Kapazität; %s verfügbarer Speicherplatz</b> "
 "(Unpartitioniert und auf Dateisystemen)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Bootloader nicht installieren"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "Als _Startmedium festlegen"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Das von Ihnen gewählte RAID-Level erfordert mehr Festplatten, als Sie "
+"derzeit ausgewählt haben."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Bitte setzen Sie einen Namen für Ihre Mediengruppe und wählen Sie "
+"nachfolgend mindestens ein Speichermedium aus."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Mediengruppe:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "Spalte"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Der Einhängepunkt %s muss sich auf einem Linux-Dateisystem befinden."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+"Dieser Einhängepunkt ist bereits in Benutzung. Etwas anderes probieren?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Bitte geben Sie einen gültigen Einhängepunkt an."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Dieser Einhängepunkt ist ungültig. Etwas anderes probieren?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Ebenfalls alle weiteren Dateisysteme im %s-Root löschen."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Sind Sie sicher, dass Sie alle Daten auf %s löschen möchten?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Sind Sie sicher, dass Sie alle Daten auf %s löschen möchten?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Ungültige Zeitzone"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Sie haben eine schwache Passphrase angegeben: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Passphrasen stimmen nicht überein."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Beibehalten"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Verkleinern"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Löschen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Dieses Medium enthält die Installationsquelle."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s auf %(device)s erstellen "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Nicht bereit"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Freien Speicherplatz benutzen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2483,14 +3479,14 @@ msgstr ""
 "welche nicht mehr benötigt werden.  Alle Daten, die sich darauf befinden, "
 "werden dauerhaft gelöscht."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2499,353 +3495,762 @@ msgstr[0] "<b>%s Festplatte; %s nutzbarer Speicherplatz</b> (in Dateisystemen)"
 msgstr[1] ""
 "<b>%s Festplatten; %s nutzbarer Speicherplatz</b> (in Dateisystemen)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Gewählter Speicherplatz, der insgesamt beansprucht wird: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Löschen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Beibehalten"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "DISTRIBUTIONS-INSTALLATION"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "SPEICHEN-NAME"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "VORAB-RELEASE/ TESTVERSION"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Neues Gerät"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Neues Auswahlwerkzeug"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Fertig"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Weiter"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "Änderungen _anwenden"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NETZWERK-KONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Gruppen-Name"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATUM & UHRZEIT"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "NTP-Server hinzufügen und für die Benutzung kennzeichnen"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web-Server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "In Betrieb"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Nutzung"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfigurieren..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATUM & UHRZEIT"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Ort:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Ort:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Netzwerk-Name"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Netzwerk-Name"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 Stunden"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "INSTALLATIONSZIEL"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Nicht verbunden"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Gewähltes Speichermedium"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Nichts ausgewählt"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware nicht vorhanden"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nein"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN-Typ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Gewähltes Speichermedium"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "Zusammenfassung"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-Gerät"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Standard-Route"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Subnetz-Maske"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardware-Adresse"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfigurieren..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Sicherheit"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Netzwerk-Name"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Netzwerk-Name"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Sicherheitsschlüssel"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "Als Hotspot _benutzen..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "Hotspot _anhalten..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfigurieren..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Internetdienstanbieter"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfigurieren..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN-Typ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Gruppen-Name"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Gruppen-Passwort"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Benutzername"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfigurieren..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Methode"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "URL _konfigurieren"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks Host"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Netzwerk-Konfiguration schreiben"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Entsperren"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Flug_zeug-Modus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Netzwerk-Konfiguration schreiben"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Rechnername:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NETZWERK-KONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2855,206 +4260,61 @@ msgstr ""
 "erhalten\n"
 "und Software-Aktualisierungen für Sie verfügbar zu machen."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Standard-Route"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Subnetz-Maske"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Geschwindigkeit"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardware-Adresse"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfigurieren..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Sicherheit"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Netzwerk-Name"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Netzwerk-Name"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Sicherheitsschlüssel"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "Als Hotspot _benutzen..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "Hotspot _anhalten..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfigurieren..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Internetdienstanbieter"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN-Typ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Gruppen-Name"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Gruppen-Passwort"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Benutzername"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Methode"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "URL _konfigurieren"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks Host"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Entsperren"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Flug_zeug-Modus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Rechnername:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Authentifizierung verwenden"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Authentifizierung benötigt"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Verbunden"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SOFTWARE-AUSWAHL"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Wählen Sie Ihre Umgebung"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "Spalte"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "_Speichermedien hinzufügen"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "INSTALLATIONSOPTIONEN"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Partitionstyp:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Meine Daten verschlüsseln. Passphrase später setzen."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Benutzerdefinierte Partitionierung ausgewählt"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Speicherplatz festlegen"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "INSTALLATIONSOPTIONEN"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3062,80 +4322,146 @@ msgstr ""
 "Hier geben wir an, wie viel Speicherplatz für die derzeitige Software-"
 "Auswahl benötigt wird."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "Speichermedium frei"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Freier verfügbarer Speicherplatz, der benutzt werden kann."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs frei"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Kein freier Speicherplatz verfügbar, es kann jedoch Speicherplatz von "
 "existierenden Partitionen freigegeben werden."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Hier beschreiben wir die Optionen, die Ihnen zur Verfügung stehen."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Freien Speicherplatz benutzen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Beenden"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Beschreibung des Mediums"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Lokale Standard-Speichermedien"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "Partitionierung _beenden"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Verschlüsseln"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automatische Partitionierung ausgewählt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "Partitionierung _beenden"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Verschlüsseln"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Meine Daten verschlüsseln. Passphrase später setzen."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Optionen zur selbständigen Partitionierung"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "Zusammenfassung"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Ausführliche Festplatten-Zusammenfassung und Optionen..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "EINE TASTATUR-BELEGUNG HINZUFÜGEN"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-"Um eine Tastatur-Belegung hinzuzufügen, können Sie sie nachfolgend auswählen:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Name"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "TASTATURBELEGUNG"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3143,7 +4469,7 @@ msgstr ""
 "Welche Tastaturbelegungen möchten Sie auf diesem System verwenden?  Die "
 "oberste Tastaturbelegung wird als Standardbelegung festgelegt."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3152,117 +4478,200 @@ msgstr ""
 "Sie das Schreibtischwerkzeug um die Tastatur für den Installationsprozess zu "
 "ändern."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "Name"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Tastaturbelegung hinzufügen"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Tastaturbelegung entfernen"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Ausgewählte Belegung nach oben verschieben"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Tastaturbelegung hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Tastaturbelegung entfernen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Ausgewählte Belegung nach oben verschieben"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Ausgewählte Belegung nach unten verschieben"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Vorschau des Tastaturlayouts"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Das Testen der Layout-Konfigurationen ist nicht verfügbar."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift, um zwischen Belegungen zu wechseln."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Optionen"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "EINE TASTATUR-BELEGUNG HINZUFÜGEN"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+"Um eine Tastatur-Belegung hinzuzufügen, können Sie sie nachfolgend auswählen:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Name"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Verfügbare Regionen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Tastaturbelegung hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "OPTIONEN ZUM WECHSELN DER TASTATURBELEGUNGEN"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Welche Kombination(en) bevorzugen Sie, um zwischen Belegungen zu wechseln?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "Benutzung"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "Beschreibung"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS-Einhänge-Optionen:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "SPRACHE"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativer Name"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englischer Name"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Nichts ausgewählt"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "Root-Passwort"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root-Passwort:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Bestätigen:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC-Passwort"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Root-Passwort eingeben"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3270,237 +4679,285 @@ msgstr ""
 "Der Root-Account wird für die Verwaltung des Systems benötigt.  Geben Sie "
 "für den Root-Benutzer ein Passwort ein."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Fertig"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MEDIEN-ÜBERPRÜFUNG"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Medium wird überprüft, bitte warten..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Hinzufügen"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP-Proxy _aktivieren"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy-URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Beispiel:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Authentifizierung verwenden"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Benutzername</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Benutzername"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Passwort</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Passwort:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALLATIONSMEDIUM"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Welche Installationsquelle möchten Sie benutzen?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Automatisch erkanntes Installationsmedium:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Gerät:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Überprüfen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-Datei:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Gerät:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "Ein ISO _wählen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Im _Netzwerk:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxy-Einstellung..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Diese URL verweist auf einen _Spiegelserver."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS-Einhänge-Optionen:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Dieses Feld ist optional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People Paketquellen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Neuen Einhängepunkt hinzufügen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Hinzufügen"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Ausgewählte(r) Einhängepunkt(e) entfernen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Entfernen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operativer Fehler."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Root-Passwort eingeben"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Diese URL verweist auf einen _Spiegelserver."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Name:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy-URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Benutzername"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Passwort:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Dieser Einhängepunkt ist ungültig. Etwas anderes probieren?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Schnell weg von hier!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Ich akzeptiere mein Schicksal."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Dies ist vor-veröffentlichte Software, die instabil sein kann."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3513,205 +4970,265 @@ msgstr ""
 "Zukunft ist instabil und Sie können sich nicht darauf verlassen. Es ist nur "
 "für Testzwecke gedacht."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "Willkommen bei %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 "Welche Sprache möchten Sie während des Installationsvorgangs verwenden?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Weiter"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Benutzername"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Gruppen-Name"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Passwort:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC-Passwort"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Einhängepunkt hinzufügen"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Gewünschte Kapazität:</b>"
+msgid "Add a new mount point."
+msgstr "Neuen Einhängepunkt hinzufügen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Einhängepunkt:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Hinzufügen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "EINEN NEUEN EINHÄNGEPUNKT HINZUFÜGEN"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Mehr benutzerdefinierbare Optionen sind nach\n"
-"Erstellung des folgenden Einhängepunktes verfügbar."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Dieser Einhängepunkt ist bereits in\n"
-"Benutzung.  Etwas anderes versuchen?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "z.B.: »20 GB«, »500 MB« (ohne Anführungszeichen)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Löschen"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Sichern"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "EINHÄNGEPUNKT KONFIGURIEREN"
+msgid "Remove the selected mount point(s)."
+msgstr "Ausgewählte(r) Einhängepunkt(e) entfernen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Bitte setzen Sie einen Namen für Ihre Mediengruppe und wählen Sie "
-"nachfolgend mindestens ein Speichermedium aus."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "_Entfernen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Frei"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-Gerät"
+msgid "Reload storage configuration from disk."
+msgstr "Speichermedien-Konfiguration fehlgeschlagen: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Verschlüsseln"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Gewähltes Speichermedium"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Beschreibung des Mediums"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Einhängepunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Gewünschte Kapazität:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Medien-Typ:</b>"
+msgid "Device(s):"
+msgstr "Gerät:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Dateisystem:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Verschlüsseln"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Erneut formatieren"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Mediengruppe:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Bearbeiten ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Name:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Medien-Typ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Verschlüsseln"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Dateisystem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Erneut formatieren"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Mediengruppe:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Bearbeiten ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID-Gerät"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3719,17 +5236,19 @@ msgstr ""
 "Dieses Gerät ist verschlüsselt und kann ohne gültige Passphrase nicht "
 "gelesen werden. Sie können es nachfolgend entschlüsseln."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Passphrase:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Entsperren"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3737,299 +5256,576 @@ msgstr ""
 "Dieses Gerät kann nicht direkt bearbeitet werden. Sie können es entfernen "
 "oder ein anderes Gerät wählen."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Neuen Einhängepunkt hinzufügen"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Ausgewählte(r) Einhängepunkt(e) entfernen"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Ausgewählten Einhängepunkt konfigurieren"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurieren..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "Speichermedien-Konfiguration fehlgeschlagen: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Klick für Hilfe"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Hilfe"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">VERFÜGBARER PLATZ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">GESAMTER PLATZ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Auswählen"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "EINHÄNGEPUNKT KONFIGURIEREN"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-"Ein Speichermedium oder mehrere auswählen, auf dem sich dieses Gerät "
-"befinden darf."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-Adresse"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Ein iSCSI-Initiatorname muss angeben werden"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Authentifizierung verwenden"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Beispiel:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Benutzername"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC-Passwort"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Benutzername"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-Passwort"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Benutzername"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC-Passwort"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Netzwerk-Name"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Authentifizierung verwenden"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Benutzername"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-Passwort"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Benutzername"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-Passwort"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Benutzername"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC-Passwort"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Verbindung fehlgeschlaggen"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Gerät:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "AUSGEWÄHLTE MEDIEN"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Schließen"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Starten"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Beschreibung"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Frei"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Medien-Zusammenfassung wird hier eingefügt"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Löschen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Auswählen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "EINHÄNGEPUNKT KONFIGURIEREN"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+"Ein Speichermedium oder mehrere auswählen, auf dem sich dieses Gerät "
+"befinden darf."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Einhängepunkt hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Gewünschte Kapazität:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Einhängepunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "EINEN NEUEN EINHÄNGEPUNKT HINZUFÜGEN"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Mehr benutzerdefinierbare Optionen sind nach\n"
+"Erstellung des folgenden Einhängepunktes verfügbar."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Dieser Einhängepunkt ist bereits in\n"
+"Benutzung.  Etwas anderes versuchen?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "z.B.: »20 GB«, »500 MB« (ohne Anführungszeichen)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Sichern"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "EINHÄNGEPUNKT KONFIGURIEREN"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Bitte setzen Sie einen Namen für Ihre Mediengruppe und wählen Sie "
+"nachfolgend mindestens ein Speichermedium aus."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Name:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-Gerät"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Verschlüsseln"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Bitte geben Sie einen gültigen Einhängepunkt an."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD-Gerät formatieren"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Während der Installation ist ein unbekannter Fehler aufgetreten.  "
 "Einzelheiten nachfolgend."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "PASSPHRASE FÜR SPEICHERMEDIEN-VERSCHLÜSSELUNG"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Passphrase abspeichern"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "PASSPHRASE FÜR SPEICHERMEDIEN-VERSCHLÜSSELUNG"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4039,7 +5835,19 @@ msgstr ""
 "können Sie eine Passphrase definieren, die Sie eingeben müssen, um auf Ihre "
 "Daten zuzugreifen, wenn Sie Ihren Rechner starten."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Passphrase:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Bestätigen:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4049,117 +5857,172 @@ msgstr ""
 "Layout ändern, können Sie möglicherweise Ihre Speichermedien nach der "
 "Installation nicht wieder entsperren."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "SPEICHERPLATZ FESTLEGEN"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Speicherplatz festlegen"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "SPEICHERPLATZ FESTLEGEN"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Beschreibung hier einfügen:"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Beanspruchbarer Speicherplatz"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Aktion"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Beibehalten"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Löschen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Verkleinern"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Benutzerdefinierte Partitionierung ausgewählt"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "Änderungen _anwenden"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Gerät:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Einhängepunkt hinzufügen"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Installer _beenden"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nein"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Ja"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4167,52 +6030,50 @@ msgstr ""
 "Sind Sie sicher, dass Sie den Installationsvorgang\n"
 "beenden möchten?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Beenden"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ZUSAMMENFASSUNG DER INSTALLATION"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Installation starten"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURATION"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Installation wird vorbereitet"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s wurde erfolgreich auf Ihrem System installiert, allerdings müssen noch "
-"einige Konfigurationen vorgenommen werden. \n"
-"Vervollständigen Sie dies und klicken Sie anschließend auf die Schaltfläche "
-"»Konfiguration fertigstellen«."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Konfiguration fertigstellen"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s ist jetzt erfolgreich auf Ihrem System installiert und steht\n"
-"für Sie bereit! Nach einem Neustart können Sie beginnen!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Neustart"
 
@@ -4228,16 +6089,16 @@ msgstr "Installieren"
 msgid "Install the live CD to your hard disk"
 msgstr "Installieren der Live-CD auf die Festplatte"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Installation auf der Festplatte wird gestartet"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Willkommen bei Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4246,26 +6107,27 @@ msgstr ""
 "%s benötigt zur Installation %s MB Speicher, aber Sie haben nur %s MB auf "
 "diesem System.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Das grafische Installationsprogramm %s benötigt %s MB Speicher, es sind aber "
 "nur %s MB vorhanden."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nicht genügend Arbeitsspeicher"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4277,24 +6139,24 @@ msgstr ""
 "auszuführen:\n"
 " »/usr/bin/liveinst -T«"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Text-Modus wird gestartet."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fehler"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Die DISPLAY-Variable ist nicht gesetzt. Textmodus wird gestartet."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafische Installation ist nicht verfügbar. Textmodus wird gestartet."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4305,21 +6167,21 @@ msgstr ""
 "Installationsoptionen. Sie können weder die Partitionierung anpassen noch "
 "die Paketauswahl ändern. Wollen Sie stattdessen den VNC-Modus verwenden?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Bitte geben Sie ssh install@%s ein, um die Installation zu starten."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 "Bitte geben Sie ssh install@<host> ein, um die Installation fortzusetzen."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora ausprobieren"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4329,7 +6191,7 @@ msgstr ""
 "Sie können Fedora jetzt gleich installieren oder in der Aktivitäten-"
 "Übersicht zu einem späteren Zeitpunkt »Auf Festplatte installieren«  wählen."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4337,10 +6199,94 @@ msgstr ""
 "Sie können in der Aktivitäten-Übersicht zu einem beliebigen späteren "
 "Zeitpunkt »Auf Festplatte installieren«  wählen."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Schließen"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Der Rechnername muss mit einem Zeichen im Bereich »a-z«, »A-Z« oder »0-9« "
+#~ "beginnen"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Sie benötigen mehr Platz auf folgenden Dateisystemen:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Keine Frage im Befehlszeilenmodus möglich!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Dieser Einhängepunkt ist ungültig. Etwas anderes probieren?"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "NETZWERK-KONFIGURATION"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Fehler beim Herunterladen der Paket-Metadaten..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Nichts ausgewählt"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware nicht vorhanden"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Authentifizierung benötigt"
+
+#~ msgid "column"
+#~ msgstr "Spalte"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Partitionstyp:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy-URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Benutzername</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Passwort</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Dieser Einhängepunkt ist ungültig. Etwas anderes probieren?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Label:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Dateisystem:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-Gerät"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Ausgewählten Einhängepunkt konfigurieren"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Klick für Hilfe"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">VERFÜGBARER PLATZ</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">GESAMTER PLATZ</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Abgeschlossen"
 
@@ -4394,42 +6340,9 @@ msgstr "Schließen"
 #~ msgid "Install on System"
 #~ msgstr "Auf dem System installieren"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Der folgende Fehler trat bei der Einrichtung der Installations-"
-#~ "Paketquelle auf:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Die Installation kann nicht fortgesetzt werden."
-
 #~ msgid "Exit installer"
 #~ msgstr "Installer beenden"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Die Installation wurde aufgrund von Problemen mit der Hardware "
-#~ "angehalten. Die genaue Fehlermeldung war:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Die Installation wird nun abgebrochen."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Hardware-Fehler ist aufgetreten"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Installation beenden"
 
@@ -4735,9 +6648,6 @@ msgstr "Schließen"
 #~ msgid "Software Development"
 #~ msgstr "Softwareentwicklung"
 
-#~ msgid "Web Server"
-#~ msgstr "Web-Server"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4785,51 +6695,6 @@ msgstr "Schließen"
 #~ "enthält, welche nicht gelöscht werden können:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Sie haben keine Root-Partition definiert (/), die notwendig ist, um mit "
-#~ "der Installation von %s fortzufahren."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Ihre Root-Partition ist kleiner als 250 Megabyte, was für die "
-#~ "Installation von %s gewöhnlich zu wenig ist."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Diese Plattform benötigt /boot auf einer dedizierten Partition oder auf "
-#~ "einem logischen Datenträger. Falls Sie keinen /boot-Datenträger haben "
-#~ "möchten, müssen Sie / auf einer dedizierten Nicht-LVM-Partition "
-#~ "einrichten."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Ihre %(mount)s-Partition ist kleiner als %(size)s MB, was für die "
-#~ "Installation von %(productName)s gewöhnlich zu wenig ist. "
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Ihre %(mount)s-Partition ist zu klein für eine %(format)s-Formatierung "
-#~ "(mögliche Größe ist von %(minSize)d MB bis %(maxSize)d MB)."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Ihre %(mount)s-Partition ist zu groß für eine %(format)s-Formatierung "
-#~ "(mögliche Größe ist von %(minSize)d MB bis %(maxSize)d MB)."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4846,59 +6711,6 @@ msgstr "Schließen"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "Sie haben kein Zielgerät für Bootloader Stage1 eingerichtet"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Sie haben keine bootbare Partition erstellt."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Ihr BIOS-basiertes System benötigt eine spezielle Partition, um mit %ss "
-#~ "neuem Disk-Label-Format (GPT) starten zu können. Um fortzufahren, "
-#~ "erstellen Sie bitte eine 1MB große »BIOS Boot«-Typ-Partition."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Sie haben keine Auslagerungspartition eingerichtet. %(requiredMem)s MB "
-#~ "sind nötig, um die Installation ohne Auslagerungspartition fortzusetzen, "
-#~ "aber Sie verfügen nur über %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Sie haben keine Auslagerungspartition (Swap) angegeben. Obwohl diese "
-#~ "nicht in jedem Fall unbedingt erforderlich ist, verbessert dies doch die "
-#~ "Leistung bei den meisten Installationen."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Mindestens eines Ihrer Auslagerungsgeräte hat keine UUID, was für solche "
-#~ "Geräte üblich ist, die mit älteren Versionen von mkswap angelegt wurden. "
-#~ "Diese Geräte werden werden über den Pfad in /etc/fstab identifiziert. "
-#~ "Dies ist nicht ideal, da sich Gerätepfade unter verschiedenen Umständen "
-#~ "ändern können."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Dieser Einhängepunkt ist ungültig. Der Ordner %s muss sich im /-"
-#~ "Dateisystem befinden."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "Der Einhängepunkt %s muss sich auf einem Linux-Dateisystem befinden."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux auf %s"
 
@@ -4908,11 +6720,6 @@ msgstr "Schließen"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s für %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD-Gerät formatieren"
-#~ msgstr[1] "DASD-Geräte formatieren"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD-Gerät wird für die Verwendung mit Linux vorbereitet …"
@@ -5200,9 +7007,6 @@ msgstr "Schließen"
 #~ msgid "Error setting root password"
 #~ msgstr "Fehler beim Setzen des Root-Passwortes"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Sie müssen ein Passwort angeben und bestätigen."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "Pakete _entfernen"
 
@@ -5236,24 +7040,12 @@ msgstr "Schließen"
 #~ msgid "%s of %s"
 #~ msgstr "%s von %s"
 
-#~ msgid "Region:"
-#~ msgstr "Region:"
-
-#~ msgid "City:"
-#~ msgstr "Ort:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 Stunden"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Wählen Sie Ihre Add-Ons"
 
@@ -5344,9 +7136,6 @@ msgstr "Schließen"
 #~ msgid "configureButton"
 #~ msgstr "SchaltflächeKonfigurieren"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "Partitionierung _beenden"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "MEDIENGRUPPE KONFIGURIEREN"
 
diff --git a/anaconda/po/de_CH.po b/anaconda/po/de_CH.po
index b2d191e..5df33eb 100644
--- a/anaconda/po/de_CH.po
+++ b/anaconda/po/de_CH.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,208 +30,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC starten"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Textmodus verwenden"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -240,87 +473,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Der Rechnername darf aus maximal 255 Zeichen oder weniger bestehen."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Der Rechnername muss mit einem Zeichen im Bereich 'a-z', 'A-Z' oder '0-9' "
-"beginnen"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -329,7 +852,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -344,8 +872,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Kann /bin/sh nicht finden und ausführen! Shell wird nicht gestartet"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rettung"
 
@@ -383,28 +911,22 @@ msgstr "Zu rettendes System"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Auf welchem Gerät befindet sich die Root-Partition der Installation?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Beenden"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -417,7 +939,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -426,28 +948,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Rettungsmodus"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Ihr System wurde unter dem Verzeichnis %s eingehängt."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Ihre Root-Partition ist kleiner als 250 Megabyte, was für die Installation "
+"von %s gewöhnlich zu wenig ist."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Sie haben keine Root-Partition definiert (/), die notwendig ist, um mit der "
+"Installation von %s fortzufahren."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Ihre Root-Partition ist kleiner als 250 Megabyte, was für die Installation "
+"von %s gewöhnlich zu wenig ist."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Sie haben keine Auslagerungspartition (Swap) angegeben. Obwohl diese nicht "
+"in jedem Fall unbedingt erforderlich ist, verbessert dies doch die Leistung "
+"bei den meisten Installationen."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -561,84 +1263,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Sie benötigen mehr Platz auf folgenden Dateisystemen:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "ältere(s) Paket(e)"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installieren"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Installieren"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Keine Frage im Kommandozeilenmodus möglich!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fehler"
 
@@ -662,31 +1510,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -702,448 +1552,521 @@ msgstr ""
 "grafische Installation durchführen oder mit einer Installation im Textmodus "
 "fortfahren?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Das Passwort muss aus mindestens sechs Zeichen bestehen."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Das Passwort muss aus mindestens sechs Zeichen bestehen."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "bei der Dateisystem-Konfiguration fehlt ein Typ"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Installationsfortschritt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC starten"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installationsfortschritt"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Softwareentwicklung"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Warnung"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1158,580 +2081,405 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Softwareentwicklung"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1758,279 +2506,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Softwareentwicklung"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Fehler beim Einrichten des Repositories"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Fehler beim Einrichten des Repositories"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2038,14 +2810,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2054,128 +2826,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2186,68 +2978,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2255,947 +3142,1356 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Weiter"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web-Server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Bestätigen"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Kein Netzwerk verfügbar"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Textmodus verwenden"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-Gerät"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Bestätigen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Kein Netzwerk verfügbar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Bestätigen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Bestätigen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Bestätigen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Verbunden!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI System-Partition"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Installation beenden"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI System-Partition"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI System-Partition"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Bestätigen"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Hinzufügen"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID-Gerät"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Hinzufügen"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3203,646 +4499,1011 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 "Welche Sprache möchten Sie während des Installationsvorgangs verwenden?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Weiter"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Bestätigen"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Frei"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-Gerät"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Hinzufügen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID-Gerät"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID-Gerät"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID-Gerät"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Bestätigen"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Kein Initiator-Name gewählt"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID-Gerät"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Frei"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-Gerät"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Bestätigen"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI System-Partition"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Installieren"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Neu _starten"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3856,40 +5517,41 @@ msgstr "Installieren"
 msgid "Install the live CD to your hard disk"
 msgstr "Installieren der Live-CD auf die Festplatte"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3898,60 +5560,77 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fehler"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Der Rechnername muss mit einem Zeichen im Bereich 'a-z', 'A-Z' oder '0-9' "
+#~ "beginnen"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Sie benötigen mehr Platz auf folgenden Dateisystemen:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Keine Frage im Kommandozeilenmodus möglich!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-Gerät"
+
 #~ msgid "Completed"
 #~ msgstr "Abgeschlossen"
 
@@ -3975,9 +5654,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Installer beenden"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Installation beenden"
-
 #~ msgid "IP address is missing."
 #~ msgstr "IP-Adresse fehlt."
 
@@ -4017,9 +5693,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Im Repository %r fehlt der Name in der Konfiguration, benutze id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Kein Netzwerk verfügbar"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4027,9 +5700,6 @@ msgstr ""
 #~ "Einige Ihrer Software-Repositories erfordern eine Netzwerkverbindung, "
 #~ "jedoch trat ein Fehler beim Aktivieren des Netzwerkes auf."
 
-#~ msgid "Re_boot"
-#~ msgstr "Neu _starten"
-
 #~ msgid "_Eject"
 #~ msgstr "_Auswerfen"
 
@@ -4072,9 +5742,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "Dateikonflikte"
 
-#~ msgid "older package(s)"
-#~ msgstr "ältere(s) Paket(e)"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "zu wenig Festplattenspeicherplatz"
 
@@ -4149,9 +5816,6 @@ msgstr ""
 #~ msgid "Dependency Check"
 #~ msgstr "Abhängigkeitsüberprüfung"
 
-#~ msgid "Web Server"
-#~ msgstr "Web-Server"
-
 #~ msgid "This partition is holding the data for the hard drive install."
 #~ msgstr ""
 #~ "Auf dieser Partition sind die Daten für die Installation von der "
@@ -4183,20 +5847,6 @@ msgstr ""
 #~ "enthält welche nicht gelöscht werden können:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Sie haben keine Root-Partition definiert (/), die notwendig ist, um mit "
-#~ "der Installation von %s fortzufahren."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Ihre Root-Partition ist kleiner als 250 Megabyte, was für die "
-#~ "Installation von %s gewöhnlich zu wenig ist."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4210,15 +5860,6 @@ msgstr ""
 #~ "Installation auf einem FireWire-Gerät. Dies könnte zu einem "
 #~ "funktionierenden System führen oder auch nicht."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Sie haben keine Auslagerungspartition (Swap) angegeben. Obwohl diese "
-#~ "nicht in jedem Fall unbedingt erforderlich ist, verbessert dies doch die "
-#~ "Leistung bei den meisten Installationen."
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo für %s fehlgeschlagen"
 
diff --git a/anaconda/po/el.po b/anaconda/po/el.po
index f8055dc..b5a967f 100644
--- a/anaconda/po/el.po
+++ b/anaconda/po/el.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Greek <trans-el@lists.fedoraproject.org>\n"
@@ -27,211 +27,444 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Γίνεται εκκίνηση VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Χρήση λειτουργίας κειμένου"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Εντάξει"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Εκτέλεση δέσμης ενεργειών πριν την εγκατάσταση "
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Γίνεται εκκίνηση της προόδου εγκατάστασης"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Γίνονται ρυθμίσεις μετά την εγκατάσταση"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -243,87 +476,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Εκτέλεση δέσμης ενεργειών πριν την εγκατάσταση "
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Το όνομα συστήματος πρέπει να έχει μήκος 255 χαρακτήρες ή λιγότερο."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Το όνομα συστήματος θα πρέπει να ξεκινά με έναν έγκυρο χαρακτήρα της μορφής  "
-"'a-z' ή 'A-Z', ή '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -332,7 +855,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Τρέξε το %s για αν αποπροσαρτήσεις το σύστημα όταν τελειώσεις"
@@ -347,8 +875,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "Αδυναμία εύρεσης του αρχείου /bin/sh για εκτέλεση!  Δεν ξεκινάω τον φλοιό"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Λειτουργία Rescue"
 
@@ -386,28 +914,22 @@ msgstr "Σύστημα για rescue"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Ποιο τμήμα δίσκου περιέχει το τμήμα δίσκου root της εγκατάστασης σας;"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Εντάξει"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Το σύστημα θα επανεκκινήσει αυτόματα όταν βγεις απ' το κέλυφος."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -420,7 +942,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -429,28 +951,211 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Δεν έχετε κανένα τμήμα δίσκου Linux. Γίνεται επανεκκίνηση.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Το σύστημα θα επανεκκινήσει αυτόματα όταν βγεις απ' το κέλυφος."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Λειτουργία rescue"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "Δεν έχεις καμία Linux κατάτμηση. Πάτα enter για να βγεις σε shell.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Το σύστημα σας έχει προσαρτηθεί κάτω από τον κατάλογο %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Το τμήμα δίσκου root είναι μικρότερο των 250 megabytes, το οποίο συνήθως "
+"είναι πολύ μικρό για εγκατάσταση του %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Δεν έχετε καθορίσει ένα τμήμα δίσκου root (/), το οποίο απαιτείται για την "
+"συνέχεια της εγκατάστασης του %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Το τμήμα δίσκου root είναι μικρότερο των 250 megabytes, το οποίο συνήθως "
+"είναι πολύ μικρό για εγκατάσταση του %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Πρέπει να δημιουργήσετε ένα τμήμα δίσκου boot."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Δεν έχετε ορίσει ένα τμήμα δίσκου swap. Αν και δεν κρίνεται απαραίτητο σε "
+"όλες τις περιπτώσεις, θα βελτιώσει σημαντικά την απόδοση για την πλειονότητα "
+"των εγκαταστάσεων."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Το σημείο προσάρτησης δεν είναι έγκυρο. Ο κατάλογος %s θα πρέπει να "
+"βρίσκεται στο σύστημα αρχείων /"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+"Το σημείο προσάρτησης %s θα πρέπει να βρίσκεται σε ένα σύστημα αρχείων linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -564,84 +1269,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Προετοιμασία συναλλαγής από την πηγή εγκατάστασης."
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Λάθος στην εγκατάσταση του πακέτου"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Χρειάζεστε περισσότερο χώρο στα ακόλουθα συστήματα αρχείων:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Προετοιμασία συναλλαγής από την πηγή εγκατάστασης."
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Λάθος στην εγκατάσταση του πακέτου"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Μετά την εγκατάσταση"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Γίνεται προετοιμασία εγκατάστασης"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Μετά την εγκατάσταση"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Δε μπορείτε να κάνετε ερώτηση στη λειτουργία γραμμής εντολών!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -665,31 +1518,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -705,453 +1560,525 @@ msgstr ""
 "υπολογιστή και να εκτελέσετε μία γραφική εγκατάσταση ή να συνεχίσετε με μία "
 "εγκατάσταση σε λειτουργία κειμένου;"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr ""
 "Το συνθηματικό πρόσβασης πρέπει να έχει μήκος τουλάχιστον έξι χαρακτήρες."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr ""
+"Το συνθηματικό πρόσβασης πρέπει να έχει μήκος τουλάχιστον έξι χαρακτήρες."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "λείπει ένας τπος ρύθμισης του συστήματος αρχείου"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Γίνεται εκκίνηση της εγκατάστασης"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Γίνονται ρυθμίσεις μετά την εγκατάσταση."
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Γίνεται εκκίνηση VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Πρόοδος εγκατάστασης"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Προετοιμασία συναλλαγής από την πηγή εγκατάστασης."
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Λάθος στην εγκατάσταση του πακέτου"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "Η συσκευή που περιλαμβάνει το /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Ανάπτυξη λογισμικού"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Προειδοποίηση"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1167,580 +2094,405 @@ msgstr "Σε εξέλιξη"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Ανάπτυξη λογισμικού"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1767,279 +2519,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Ανάπτυξη λογισμικού"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Σφάλμα στην προετοιμασία του αποθετηρίου"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Σφάλμα στην προετοιμασία του αποθετηρίου"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2047,14 +2823,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2063,128 +2839,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Εντάξει"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2195,68 +2991,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr ""
+"Το σημείο προσάρτησης %s θα πρέπει να βρίσκεται σε ένα σύστημα αρχείων linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2264,949 +3157,1360 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Εντάξει"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Εξυπηρετητής Web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Επιβεβαίωση"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Αδυναμία εύρεσης δικτύου"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Χρήση λειτουργίας κειμένου"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Χωρητικότητα"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Συσκευή RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Προσθήκη"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Επιβεβαίωση"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Αδυναμία εύρεσης δικτύου"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Επιβεβαίωση"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Επιβεβαίωση"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Επιβεβαίωση"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Username"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Ολοκλήρωση σύνδεσης!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Σύστημα τμημάτων δίσκου EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "Έ_ξοδος από το πρόγραμμα εγκατάστασης"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Σύστημα τμημάτων δίσκου EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Σύστημα τμημάτων δίσκου EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Προσθήκη"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Εντάξει"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Επιβεβαίωση"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Προσθήκη"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Εντάξει"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Συσκευή RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Προσθήκη"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3214,648 +4518,1026 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 "Ποια γλώσσα θα θέλατε να χρησιμοποιηθεί κατά τη διαδικασία εγκατάστασης;"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Συνέχεια"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Επιβεβαίωση"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Ελεύθερο"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Συσκευή RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Προσθήκη"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Χωρητικότητα"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Συσκευή RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Συσκευή RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Συσκευή RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Επιβεβαίωση"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Εντάξει"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Δεν έχει ορισθεί όνομα initiator"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Εντάξει"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Συσκευή RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Ελεύθερο"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Χωρητικότητα"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Συσκευή RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Εντάξει"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Επιβεβαίωση"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Εντάξει"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Σύστημα τμημάτων δίσκου EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Μετά την εγκατάσταση"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Γίνεται προετοιμασία εγκατάστασης"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Γίνονται ρυθμίσεις μετά την εγκατάσταση."
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Επανε_κκίνηση"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3869,16 +5551,16 @@ msgstr "Εγκατάσταση"
 msgid "Install the live CD to your hard disk"
 msgstr "Εγκαταστήστε το live CD στο σκληρό σας δίσκο"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3887,25 +5569,26 @@ msgstr ""
 "%s απαιτεί %s MB μνήμης για εγκτάσταση, αλλά έχετε μόνο %s MB σ' αυτό το "
 "μηχάνημα.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Η εφαρμογή εγκατάστασης %s απαιτεί %s MB μνήμης, αλλά έχετε μόνο %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Δεν υπάρχει αρκετή μνήμη"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3919,62 +5602,83 @@ msgstr ""
 "\n"
 "από ένα τερματικό ως root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Ξεκινάει το περιβάλλον κειμένου."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Σφάλμα"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 "Δεν έχει οριστεί η μεταβλητή DISPLAY. Γίνεται εκκίνηση λειτουργίας κειμένου"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 "Η γραφική εγκατάσταση δεν είναι διαθέσιμη.  Εκκίνηση λειτουργίας κειμένου."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Το όνομα συστήματος θα πρέπει να ξεκινά με έναν έγκυρο χαρακτήρα της "
+#~ "μορφής  'a-z' ή 'A-Z', ή '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Χρειάζεστε περισσότερο χώρο στα ακόλουθα συστήματα αρχείων:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Δε μπορείτε να κάνετε ερώτηση στη λειτουργία γραμμής εντολών!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Συσκευή RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Ολοκληρώθηκε"
 
@@ -4009,9 +5713,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Έξοδος από το πρόγραμμα εγκατάστασης"
 
-#~ msgid "_Exit installer"
-#~ msgstr "Έ_ξοδος από το πρόγραμμα εγκατάστασης"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4061,9 +5762,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Το όνομα του αποθετηρίου %r λείπει στη ρύθμιση, γίνεται χρήση id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Αδυναμία εύρεσης δικτύου"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4071,9 +5769,6 @@ msgstr ""
 #~ "Μερικά από τα αποθετήρια λογισμικού απαιτούν δικτύωση, αλλά υπήρξε ένα "
 #~ "σφάλμα στην ενεργοποίηση της δικτύωσης στο σύστημα σας."
 
-#~ msgid "Re_boot"
-#~ msgstr "Επανε_κκίνηση"
-
 #~ msgid "_Eject"
 #~ msgstr "Ε_ξαγωγή"
 
@@ -4228,9 +5923,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Γραφικό Περιβάλλον"
 
-#~ msgid "Web Server"
-#~ msgstr "Εξυπηρετητής Web"
-
 #~ msgid "Minimal"
 #~ msgstr "Μίνιμαλ"
 
@@ -4272,20 +5964,6 @@ msgstr ""
 #~ "τμήματα που δεν μπορούν να διαγραφούν:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Δεν έχετε καθορίσει ένα τμήμα δίσκου root (/), το οποίο απαιτείται για "
-#~ "την συνέχεια της εγκατάστασης του %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Το τμήμα δίσκου root είναι μικρότερο των 250 megabytes, το οποίο συνήθως "
-#~ "είναι πολύ μικρό για εγκατάσταση του %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4299,30 +5977,6 @@ msgstr ""
 #~ "Εγκατάσταση σε μια συσκευή FireWire. Δεν είναι σίγουρο ότι το σύστημα θα "
 #~ "δουλεύει μετά την εγκατάσταση."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Πρέπει να δημιουργήσετε ένα τμήμα δίσκου boot."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Δεν έχετε ορίσει ένα τμήμα δίσκου swap. Αν και δεν κρίνεται απαραίτητο σε "
-#~ "όλες τις περιπτώσεις, θα βελτιώσει σημαντικά την απόδοση για την "
-#~ "πλειονότητα των εγκαταστάσεων."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Το σημείο προσάρτησης δεν είναι έγκυρο. Ο κατάλογος %s θα πρέπει να "
-#~ "βρίσκεται στο σύστημα αρχείων /"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "Το σημείο προσάρτησης %s θα πρέπει να βρίσκεται σε ένα σύστημα αρχείων "
-#~ "linux."
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "αποτυχία vginfo για %s"
 
diff --git a/anaconda/po/en_GB.po b/anaconda/po/en_GB.po
index 3c1429c..811e09f 100644
--- a/anaconda/po/en_GB.po
+++ b/anaconda/po/en_GB.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -23,11 +23,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot filesystem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "RAID sets that contain '%s' must have one of the following raid levels: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -44,7 +44,7 @@ msgstr ""
 "RAID sets that contain '%s' must have one of the following metadata "
 "versions: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -52,186 +52,452 @@ msgid ""
 msgstr ""
 "RAID sets that contain '%s' must have one of the following device types: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s must have one of the following disklabel types: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s cannot be of type %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s must be between %d and %d MB in size"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s must not be smaller than %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s must not be larger than %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s must be within the first %dMB of the disk."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s cannot be on an encrypted block device."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s cannot be of type %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Start VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Use text mode"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Yes"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_No_"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"The following error occurred while setting up the installation repository:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installation can not continue."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"The following error occurred while setting up the installation repository:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installation can not continue."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Hardware Error Encountered"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Running pre-installation scripts"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Starting installation process"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Performing post-installation configuration"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -244,87 +510,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Running pre-installation scripts"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Hostname must be 255 or fewer characters in length."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -333,7 +889,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s installation"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Run %s to unmount the system when you are finished."
@@ -346,8 +907,8 @@ msgstr "When finished please exit from the shell and your system will reboot."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Unable to find /bin/sh to execute!  Not starting shell"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescue"
 
@@ -385,21 +946,15 @@ msgstr "System to Rescue"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Which device holds the root partition of your installation?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Exit"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "The system will reboot automatically when you exit from the shell."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -408,7 +963,7 @@ msgstr ""
 "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. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -429,7 +984,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -442,28 +997,222 @@ msgstr ""
 "\n"
 "Press <return> to get a shell."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "You don't have any Linux partitions.  Rebooting.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " The system will reboot automatically when you exit from the shell."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Rescue Mode"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "You don't have any Linux partitions. Press return to get a shell.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Your system is mounted under the %s directory."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Your %(mount)s partition is less than %(size)s megabytes which is lower than "
+"recommended for a normal %(productName)s install."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)d MB to %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)d MB to %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "You have not created a bootable partition."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"You have not specified a swap partition.  %(requiredMem)s MB of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "The mount point %s must be on a Linux file system."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -575,84 +1324,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Preparing transaction from installation source"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Error Installing Package"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "You need more space on the following file systems:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Preparing transaction from installation source"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Error Installing Package"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Post Installation"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Preparing to install"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Post Installation"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Error"
 
@@ -676,31 +1573,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -715,452 +1614,523 @@ msgstr ""
 "connect to this computer from another computer and perform a graphical "
 "install or continue with a text mode install?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "The password must be at least six characters long."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "The password must be at least six characters long."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "filesystem configuration missing a type"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Installation Starting"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Performing post-upgrade configuration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Start VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installation Progress"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Preparing transaction from installation source"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Error Installing Package"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "the device containing /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Software Development"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Warning"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1176,580 +2146,406 @@ msgstr "In progress"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Quit"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_No_"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Yes"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Quit"
+
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s installation"
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "You must create a new filesystem on the root device."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "You must create a new filesystem on the root device."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Software Development"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1776,279 +2572,304 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 Address"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 Address"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Quit"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Software Development"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Error Setting Up Repository"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Error Setting Up Repository"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2056,14 +2877,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2072,129 +2893,151 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatting DASD Device"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Quit"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Click here to create them automatically."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2205,68 +3048,166 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "The mount point %s must be on a Linux file system."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "You must create a new filesystem on the root device."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Quit"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Creating %(type)s on %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2274,952 +3215,1373 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continue"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web Server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Confirm"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "No Network Available"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Use text mode"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacity"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_No_"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID Device"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Add"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Confirm"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "No Network Available"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Confirm"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Confirm"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Confirm"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Username"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Connected!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI System Partition"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Quit installer"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI System Partition"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Encrypted"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI System Partition"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Add"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirm"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Add"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID Device"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Add"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operational error."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Operational error."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3227,649 +4589,1045 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "What language would you like to use during the installation process?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Quit"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continue"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Confirm"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Free"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID Device"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Add"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Encrypted"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Capacity"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID Device"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID Device"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Encrypted"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID Device"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Confirm"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 Address"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Must provide an iSCSI initiator name"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Username"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID Device"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Free"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Capacity"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Username"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID Device"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Encrypted"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formatting DASD Device"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirm"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI System Partition"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Exit Installer"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_No_"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Yes"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Quit"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Quit"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Post Installation"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Preparing to install"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Performing post-upgrade configuration"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Re_boot"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3883,16 +5641,16 @@ msgstr "Install"
 msgid "Install the live CD to your hard disk"
 msgstr "Install the live CD to your hard disk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Starting Install to Hard Drive"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3901,25 +5659,26 @@ msgstr ""
 "%s requires %s MB of memory to install, but you only have %s MB on this "
 "machine.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "The %s graphical installer requires %s MB of memory, but you only have %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Not enough RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3933,24 +5692,24 @@ msgstr ""
 "\n"
 " from a root terminal."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Starting text mode."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Error"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY variable not set. Starting text mode."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Graphical installation is not available. Starting text mode."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3961,36 +5720,57 @@ msgstr ""
 "you to specify your own partitioning layout or package selections.  Would "
 "you like to use VNC mode instead?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "You need more space on the following file systems:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Can't have a question in command line mode!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID Device"
+
 #~ msgid "Completed"
 #~ msgstr "Completed"
 
@@ -4021,42 +5801,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "Install on System"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-
 #~ msgid "Exit installer"
 #~ msgstr "Exit installer"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Hardware Error Encountered"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Exit installer"
 
@@ -4132,9 +5879,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Repository %r is missing name in configuration, using id"
 
-#~ msgid "No Network Available"
-#~ msgstr "No Network Available"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4142,9 +5886,6 @@ msgstr ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
 
-#~ msgid "Re_boot"
-#~ msgstr "Re_boot"
-
 #~ msgid "_Eject"
 #~ msgstr "_Eject"
 
@@ -4303,9 +6044,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Graphical Desktop"
 
-#~ msgid "Web Server"
-#~ msgstr "Web Server"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4346,50 +6084,6 @@ msgstr ""
 #~ "that cannot be deleted:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4405,53 +6099,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "you have not created a bootloader stage1 target device"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "You have not created a bootable partition."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "The mount point %s must be on a Linux file system."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatting DASD Device"
-#~ msgstr[1] "Formatting DASD Devices"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Preparing %d DASD device for use with Linux..."
diff --git a/anaconda/po/es.po b/anaconda/po/es.po
index 64e83f2..e69ad71 100644
--- a/anaconda/po/es.po
+++ b/anaconda/po/es.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-06 20:00+0000\n"
 "Last-Translator: Benjamín Valero Espinosa <benjavalero@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -42,11 +42,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "sistema de archivos /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -55,7 +55,7 @@ msgstr ""
 "El conjunto RAID que contiene '%s' debe ser de uno de los siguientes niveles "
 "raid: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -64,7 +64,7 @@ msgstr ""
 "El conjunto RAID que contiene '%s' debe ser de una las de las siguientes "
 "versiones de metadatos: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -73,108 +73,129 @@ msgstr ""
 "El conjunto RAID que contiene '%s' debe ser de uno de los siguientes tipos "
 "de dispositivo: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s debe tener uno de los siguientes tipos de etiqueta de disco: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s no puede ser del tipo %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s debe estar montado en uno de %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s debe estar entre %d y %d MB de tamaño"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s no debe ser mas pequeño que %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s no debe ser mas grande que %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s debe estar en los primeros %dMB del disco"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s debe ser una partición primaria."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s no puede ser un dispositivo de bloques cifrado."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s no puede ser del tipo %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s puede no tener suficiente espacio para que grub2 incruste a core.img "
 "cuando esté usando el sistema de archivo %s en %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Iniciar VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Utilizar modo texto"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Clave ingresada."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "¡Las claves no son iguales!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Dió una contraseña débil: %s.  Presione Hecho de nuevo para usarla "
 "igualmente."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -182,87 +203,339 @@ msgstr ""
 "igualmente."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Débil"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Apenas"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Buena"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Robusta"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Aceptar"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Sí"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_No"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Ocurrió el siguiente error mientras se configuraba el repositorio de "
+"instalación:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"La instalación no puede continuar."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Ocurrió el siguiente error mientras se configuraba el repositorio de "
+"instalación:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"La instalación no puede continuar."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"El siguiente software marcado para instalar tiene errores. \n"
+"Esto puede ser causado por un error en su fuente de instalación. \n"
+"Puede intentar remover este paquete de su instalación, cambiar su fuente de "
+"instalación, o salir del instalador."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"La instalación se ha detenido debido a lo que parecería ser un problema con "
+"su hardware. El mensaje exacto del error es:\n"
+"\n"
+"%s.\n"
+"\n"
+" Ahora el instalador finalizará."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"La instalación se ha detenido debido a lo que parecería ser un problema con "
+"su hardware. El mensaje exacto del error es:\n"
+"\n"
+"%s.\n"
+"\n"
+" Ahora el instalador finalizará."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Se ha encontrado un error de hardware"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"La instalación se ha detenido debido a lo que parecería ser un problema con "
+"su hardware. El mensaje exacto del error es:\n"
+"\n"
+"%s.\n"
+"\n"
+" Ahora el instalador finalizará."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Configurando el sistema instalado"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Escribiendo configuración de red"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Creando usuarios"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Configurando el sistema instalado"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Ejecutando los scripts de preinstalación"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Configuración de la fuente de instalación..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Instalando gestor de arranque"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Realizando las tareas de postinstalación"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Instalando gestor de arranque"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "El certificado del depósito %s requiere la red."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -275,32 +548,323 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "Falta %s. No se puede configurar el cortafuego."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "Falta %s. No se puede configurar el cortafuego."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "El sistema archivo no soporta etiquetas."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Nombre especificado %s ya está en uso"
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+"Grupo de Volumen de nombre %s ya está en uso. No se guardan los cambios."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Ejecutando los scripts de preinstalación"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "El nombre del equipo no puede ser «None» ni una cadena vacía."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "El nombre del equipo no debe contener más de 255 caracteres."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"El nombre del equipo debe comenzar con un carácter válido dentro de los "
-"rangos 'a-z', 'A-Z' o '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -310,55 +874,55 @@ msgstr ""
 "'0-9', '-' y '.', las partes entre puntos deben contener algo y no pueden "
 "iniciar o terminar con '-'."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Desconectando..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Cableado (%s) conectado"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Conectado sin cables a %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "No conectado"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "No hay dispositivos de red disponibles."
 
@@ -367,7 +931,12 @@ msgstr "No hay dispositivos de red disponibles."
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "INSTALACIÓN DE %(productName)s %(productVersion)s"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nueva instalación de %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Ejecute %s para desmontar el sistema cuando haya finalizado."
@@ -381,8 +950,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "¡No se pudo encontrar /bin/sh para ejecutar! No se iniciará la consola"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescate"
 
@@ -429,21 +998,15 @@ msgstr "Sistema a rescatar"
 msgid "Which device holds the root partition of your installation?"
 msgstr "¿Qué dispositivo contiene la partición root de su instalación?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Aceptar"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Salir"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "El sistema se reiniciará automáticamente cuando salga de la consola."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -453,7 +1016,7 @@ msgstr ""
 "montar. Pulse intro para obtener una consola desde donde poder realizar un "
 "fsck y montar sus particiones. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -474,7 +1037,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -487,30 +1050,247 @@ msgstr ""
 "\n"
 "Presione <enter> para obtener un intérprete de comandos."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "No tiene ninguna partición Linux. Reiniciando.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " El sistema se reiniciará automáticamente cuando salga de la consola."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Modo de rescate"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "No tiene ninguna partición Linux. Presione «Intro» para obtener una consola."
 "%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Su sistema está montado bajo el directorio %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Partición estándar"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disco"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"El área de intercambio (swap) de su equipo la usa el sistema\n"
+"operativo cuando se está quedando sin memoria."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"El área de arranque (boot) de su equipo es donde se encuentran\n"
+"los archivos necesarios para iniciar el sistema operativo."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"El área raíz (root) de su equipo es donde se almacenan\n"
+"el sistema de archivos y las aplicaciones principales."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"El área de inicio (home) de su equipo es donde se guarda\n"
+"toda su información personal."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"La partición de arranque de BIOS se requiere para activar arranque desde los "
+"discos GPT particionados en hardware de BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"La partición de arranque PReP se requiere para activar arranque desde los "
+"discos GPT particionados en hardware de BIOS."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Su partición root posee menos de 250 megabytes, tamaño que habitualmente no "
+"basta para instalar %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"No ha definido una partición root (/), necesaria para que la instalación de "
+"%s continúe."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Esta plataforma necesita un /boot en un volumen o partición dedicada. Si no "
+"quiere un volumen /boot, lo debe poner en / en una partición no LVM dedicada."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Su partición %(mount)s es menor de %(size)s megabytes, que es menos de lo "
+"que se recomienda en una instalación %(productName)s normal."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Su partición %(mount)s es demasiado pequeña para el tipo de formato "
+"%(format)s (cuyo tamaño permitido es entre %(minSize)d MB y %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Su partición %(mount)s es demasiado grande para el tipo de formato "
+"%(format)s (cuyo tamaño permitido es entre %(minSize)d MB y %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+"No se pudo añadir un nuevo dispositivo. Haga clic para obtener mayor "
+"información."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "No ha creado una partición de arranque."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Su sistema basado en BIOS necesita una partición de arranque especial con el "
+"nuevo formato de etiqueta de disco %s (GPT). Para continuar, por favor crear "
+"una partición del tipo 'BIOS Boot' de 1 MB."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"No ha definido una partición swap. Se necesitan %(requiredMem)s MB de "
+"memoria para poder continuar con la instalación sin una partición swap, pero "
+"solo dispone de %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"No ha especificado una partición swap. Si bien esto no es indispensable, "
+"mejorará considerablemente el rendimiento en la mayoría de las instalaciones."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Por lo menos uno de sus dispositivos swap no posee un UUID, algo que suele "
+"suceder cuando el espacio swap ha sido generado con versiones antiguas de "
+"mkswap. Estos dispositivos serán referenciados de acuerdo a su ruta en el "
+"archivo /etc/fstab, algo que no es recomendado ya que las rutas a los "
+"dispositivos se modifican de acuerdo a las circunstancias. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Este punto de montaje no es válido. El directorio %s debe estar dentro del "
+"sistema de archivos /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+"El punto de montaje %s debe establecerse dentro de un sistema de archivos "
+"linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Contraseña:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -627,54 +1407,139 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "La contraseña VNC provista no tiene al menos 6 caracteres.\n"
 "Por favor ingrese una nueva contraseña. Deje en blanco si no desea "
 "contraseña."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Linux para Empresas de Red Hat"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Falló al configurar la fuente de instalación"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Error al descargar metadatos de paquetes..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "No hay disponible una fuente de instalación"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Instalando software"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Iniciando el proceso de instalación"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Necesita más espacio en los siguientes sistemas de archivos:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Preparando la transacción desde la fuente de instalación"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Instalando"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Descargando los metadatos del paquete..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instalando"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Preparando la instalación"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Chequeando la configuración de almacenamiento..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "TÍTULO PREDETERMINADO"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "REGIONALIZACIÓN"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "REGIONALIZACIÓN"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "AJUSTES DE USUARIO"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -683,34 +1548,103 @@ msgstr ""
 "No hay espacio suficiente en el sistema de archivos para la selección de "
 "software actual. Se requieren un adicional de %s."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Concentrador de instalación"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Iniciando instalación automatizada"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "¡No puede escribir una pregunta en el modo de línea de comandos!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Por favor, realice su selección arriba  ['s' para salir | 'c' para "
+"continuar]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Por favor, complete todos los ítems antes de continuar"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Título predeterminado del Concentrador"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Por favor, complete todos los ítems antes de continuar"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Error"
 
@@ -734,25 +1668,28 @@ msgstr "si"
 msgid "no"
 msgstr "no"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "¿Realmente desea salir?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "s"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -761,7 +1698,7 @@ msgstr ""
 "  Por favor, realice su selección arriba  ['s' para salir | 'c' para "
 "continuar]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -776,220 +1713,259 @@ msgstr ""
 "a este equipo desde otra máquina y realizar una instalación gráfica, o "
 "continuar con una instalación en modo texto?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "s"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Contraseña VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Por favor provea una contraseña VNC. Deberá ingresarla dos veces.\n"
 "Deje en blanco si no desea contraseña"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Clave:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Clave (de nuevo):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "¡Las claves no son iguales!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "La contraseña debe tener al menos 6 caracteres de largo."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "La contraseña debe tener al menos 6 caracteres de largo."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Configuración del huso horario"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "No se configuró el huso horario"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Regiones disponibles"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Regiones disponibles"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Escribiendo configuración de red"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Cableado (%s) conectado"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Cableado (%s) conectado"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Nombre del equipo:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Nombre del equipo"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Nombre del equipo"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "El nombre del equipo no es válido: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Terminar configuración"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Puerta de enlace"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "falta un tipo en la configuración del sistema de archivos"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Configurando el sistema instalado"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Contraseña de root:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Clave ingresada."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "La cuenta root está deshabilitada."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "La contraseña no está definida"
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Por favor, seleccione una clave de root nueva. La debe ingresar dos veces."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Clave:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Usar Todo el Espacio"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Reemplazar el/los sistema(s) Linux existentes"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Usar el Espacio Libre"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Destino de la Instalación"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "No se seleccionó ningún disco"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Error al chequear la configuración de almacenamiento"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Error al chequear la configuración de almacenamiento"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Se seleccionó particionado automático"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Se seleccionó particionado personalizado"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -997,40 +1973,62 @@ msgstr ""
 "No se detectó ningún disco.  Por favor, apague el equipo, conecte al menos "
 "un disco y reinicie para completar la instalación."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "No se seleccionó un disco; por favor, seleccione al menos uno en dónde "
 "instalar."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Chequeando el almacenamiento..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Seleccionar"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Generando la configuración de almacenamiento actualizado"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "falló la configuración de almacenamiento: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Chequeando la configuración de almacenamiento..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Opciones de autoparticionado"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1039,41 +2037,41 @@ msgstr ""
 "Para la instalación hace falta particionar su disco rígido.  Seleccione qué "
 "espacio usar para el destino de la instalación."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Configuración del esquema de partición"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Configuración del esquema de partición"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Configuración del huso horario"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "huso horario %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "No se configuró el huso horario"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Husos horarios disponibles en la región %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Regiones disponibles"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1082,180 +2080,198 @@ msgstr ""
 " Use los números o ingrese los nombres directamente [b para la lista de "
 "regiones, s para salir]:"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Iniciar VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progreso de la instalación"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Espejo más cercano"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Servidor NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Error al configurar una fuente de software"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "No se seleccionó nada"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Conectando..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Unidad de CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "Archivo _ISO:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Hora de red"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "No hay disponible una fuente de instalación"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Falló al configurar la fuente de instalación"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Error al descargar metadatos de paquetes..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "No hay disponible una fuente de instalación"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Servidor NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Opciones de montaje NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Falló al configurar la fuente de instalación, verifique el url del "
 "repositorio"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "el dispositivo que contiene /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Falló al configurar la fuente de instalación"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Modificar la selección del software"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Error al verificar las dependencias del software"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Origen de instalación no configurado"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Origen cambiado. Verifique."
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Se seleccionó software personalizado"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Origen de instalación no configurado"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Elija su entorno"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Usar autenticación"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Debe proveer y confirmar una contraseña."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Advertencia"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1271,36 +2287,36 @@ msgstr "En curso"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstalación completa.  Presione Intro para salir"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Título predeterminado del ítem"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "probando el estado..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Dispositivo Nuevo"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Clave (de nuevo):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1309,7 +2325,7 @@ msgstr ""
 "Dió una contraseña débil: %s.  Presione Hecho de nuevo para usarla "
 "igualmente."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1318,63 +2334,47 @@ msgstr ""
 "Dió una contraseña débil: %s.  Presione Hecho de nuevo para usarla "
 "igualmente."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Clave ingresada."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Sa_lir del Instalador"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Ayuda"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Salir"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_No"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Sí"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "TÍTULO PREDETERMINADO"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "REGIONALIZACIÓN"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "REGIONALIZACIÓN"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SISTEMA"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "AJUSTES DE USUARIO"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1382,7 +2382,11 @@ msgstr ""
 " Por favor, complete los elementos marcados con este ícono antes de "
 "continuar con el siguiente paso."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "¡Completado!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1391,171 +2395,68 @@ msgstr ""
 "¡%s ya está instalado exitosamente en su sistema y listo\n"
 "para usar! ¡Prosiga y reinicie para comenzar a usarlo!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "¡Completado!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Salir"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nueva instalación de %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s está ahora correctamente instalada en su sistema, pero aún se necesita "
+"otra hacer otra configuración. \n"
+"Termínela y haga clic en el botón de Terminar configuración."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"¡%s ya está instalado exitosamente en su sistema y listo\n"
+"para usar! ¡Prosiga y reinicie para comenzar a usarlo!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Crear un nuevo grupo de volumen ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
 msgstr ""
+"Falló la configuración de dispositivo Haga clic para mayor información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Por favor cree un nombre para su grupo de volumen y seleccione al menos un "
-"disco de los de abajo."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Grupo de volúmenes:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "columna"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Restablecimiento de configuración de almacenaje debido a un error "
 "irrecuperable. Haga clic para mayor información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr ""
-"Falló la configuración de dispositivo Haga clic para mayor información."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Favor ingresar un punto de montaje válido"
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Ese punto de montaje es inválido. ¿Desea intentar algo diferente?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Ese punto de montaje ya está en uso.  ¿Desea intentar algo diferente?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"El nivel RAID que ha seleccionado requiere más discos de los que ha "
-"seleccionado en este momento."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Favor ingresar un punto de montaje válido"
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Ese punto de montaje es inválido. ¿Desea intentar algo diferente?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Partición estándar"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disco"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Ninguno"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Borrar también los demás sistemas de archivo en la raíz %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "¿Está seguro que quiere borrar los datos de %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "¿Está seguro que quiere borrar los datos de %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "PARTICIONADO MANUAL"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "se seleccionó %d dispositivo"
 msgstr[1] "se seleccionaron %d dispositivos"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1564,134 +2465,119 @@ msgstr ""
 "Cuando cree puntos de montaje para su instalación de %s %s,\n"
 "podrá ver los detalles aquí."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"El área de intercambio (swap) de su equipo la usa el sistema\n"
-"operativo cuando se está quedando sin memoria."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"El área de arranque (boot) de su equipo es donde se encuentran\n"
-"los archivos necesarios para iniciar el sistema operativo."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"El área raíz (root) de su equipo es donde se almacenan\n"
-"el sistema de archivos y las aplicaciones principales."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"El área de inicio (home) de su equipo es donde se guarda\n"
-"toda su información personal."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"La partición de arranque de BIOS se requiere para activar arranque desde los "
-"discos GPT particionados en hardware de BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"La partición de arranque PReP se requiere para activar arranque desde los "
-"discos GPT particionados en hardware de BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi debe estar en un dispositivo del tipo %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s debe estar en un dispositivo del tipo %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s no se puede cifrar"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Debe crear un sistema de archivo nuevo en el dispositivo raíz."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 "Los dispositivos del tipo %s requieren una selección de nivel RAID válida."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Solicitud para cambiar de tamaño falló. Haga clic para más información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "Solicitud para reformatear falló. Haga clic para mayor información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Nombre especificado %s ya está en uso"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "El sistema archivo no soporta etiquetas."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "No se seleccionó ningún disco"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "El sistema de archivo no se puede redimensionar."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Error al verificar la configuración de almacenamiento.  Click para ver "
+"detalles."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Error al verificar la configuración de almacenamiento.  Click para ver "
+"detalles."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Añadido nuevo %s al contenedor existente %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 "No se pudo añadir un nuevo dispositivo. Haga clic para obtener mayor "
 "información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Tamaño de Partición inválido. Use un entero válido"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "No se pudo retirar. Haga clic para obtener mayor información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 "Grupo de Volumen de nombre %s ya está en uso. No se guardan los cambios."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "sistema de archivo libre"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1700,7 +2586,7 @@ msgstr ""
 "Al dispositivo %s device le faltan %d de %d %s. Puede quitarlo o seleccionar "
 "un dispositivo diferente."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1709,300 +2595,147 @@ msgstr ""
 "A este grupo de volúmenes LVM le faltan %d de %d volúmenes físicos. Puede "
 "quitarlo o seleccionar un dispositivo diferente."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "No hay discos seleccionados."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "No hay espacio libre suficiente en los discos seleccionados."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 "No se pudo  hacer el particionamiento automático. Haga clic para obtener "
 "mayor información."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Modificar la selección del software"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Falló al desbloquear el dispositivo de bloques cifrado. Haga clic para más "
 "detalles."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Ha elegido configurar manualmente los sistemas de archivos de su nueva "
-"instalación de %(productName)s. Antes de empezar, debería tomar un minuto "
-"para familiarizarse. Han cambiado bastantes cosas.\n"
-"\n"
-"El cambio más importante es que la creación de nuevos sistemas de archivos "
-"se ha modernizado. Ya no tiene que crear complejos dispositivos como "
-"volúmenes lógicos LVM en etapas (volumen físico, luego grupo de volúmenes, "
-"luego volumen lógico), ahora cree simplemente un volumen lógico y nos "
-"encargaremos de preparar los volúmenes físicos y el grupo de volúmenes que "
-"lo contiene. También nos encargaremos de ajustar el grupo de volúmenes al "
-"añadir, quitar o redimensionar volúmenes lógicos para que no se tenga que "
-"preocupar de los tediosos detalles.\n"
-"\n"
-"\n"
-"Disposición de la pantalla\n"
-"\n"
-"El lado izquierdo de la pantalla muestra las instalaciones de los sistemas "
-"operativos que hemos podido encontrar en su equipo. La nueva instalación de "
-"%(productName)s está al principio de la lista. Puede pulsar en los nombres "
-"de las instalaciones para ver qué sistemas de archivos contienen.\n"
-"\n"
-"Debajo de las diversas instalaciones y puntos de montaje de la izquierda hay "
-"botones para añadir un nuevo sistema de archivos, quitar el sistema de "
-"archivos seleccionado o configurar el sistema de archivos seleccionado.\n"
-"\n"
-"En la derecha de la pantalla es donde se puede personalizar el punto de "
-"montaje seleccionado en ese momento.\n"
-"\n"
-"Abajo a la izquierda verá un resumen de los discos que ha elegido para usar "
-"en la instalacion. Puede pulsar en el texto azul para ver información más "
-"detallada sobre los discos seleccionados.\n"
-"\n"
-"\n"
-"Cómo crear un nuevo sistema de archivos en un nuevo dispositivo\n"
-"\n"
-"1. Pulse en el botón «+».\n"
-"2. Introduzca el punto de montaje y el tamaño (consejo: Pose el puntero del "
-"ratón encima de cualquiera de las áreas de introducción de texto para "
-"obtener ayuda).\n"
-"3. Seleccione el nuevo punto de montaje debajo de «Nueva instalación de "
-"%(productName)s» en el lado izquierdo de la pantalla y personalícelo para "
-"acomodarlo a sus necesidades.\n"
-"\n"
-"\n"
-"Cómo reformatear un dispositivo/sistema de archivos que ya existe en el "
-"disco\n"
-"\n"
-"1. Seleccione el sistema de archivos en el lado izquierdo de la pantalla.\n"
-"2. Pulse en «Personalizar» en el área de personalización del punto de "
-"montaje a la derecha de la pantalla.\n"
-"3. Marque la casilla «Reformatear», seleccione un tipo de sistema de "
-"archivos y, si procede, introduzca un punto de montaje en el área de entrada "
-"de texto «Punto de montaje».\n"
-"4. Pulse en «Aplicar cambios».\n"
-"\n"
-"\n"
-"Cómo establecer un punto de montaje para un sistema de archivos que ya "
-"existe en el disco\n"
-"\n"
-"1. Seleccione el sistema de archivos en el lado izquierdo de la pantalla.\n"
-"2. Introduzca un punto de montaje en el área de entrada de texto «Punto de "
-"montaje» en el área de personalización del punto de montaje.\n"
-"3. Pulse en «Aplicar cambios».\n"
-"\n"
-"\n"
-"Cómo quitar un sistema de archivos que ya existe en el disco\n"
-"\n"
-"1. Seleccione el sistema de archivos que desea quitar en el lado izquierdo "
-"de la pantalla.\n"
-"2. Pulse el botón «-».\n"
-"\n"
-"Consejo: Quitar un dispositivo que ya existe en el disco de la «Nueva "
-"instalación de %(productName)s» no lo quita del disco. Tan solo devuelve el "
-"dispositivo a su estado original. Para quitar un dispositivo que ya existe "
-"en el disco, debe seleccionarlo de cualquiera de las otras instalaciones "
-"detectadas (o «Desconocido») y pulsar el botón «-».\n"
-"\n"
-"\n"
-"Trucos y consejos\n"
-"\n"
-"Puede introducir tamaños para nuevos sistemas de archivos que son mayores "
-"que el espacio libre total disponible. El instalador se acercará el máximo "
-"posible el tamaño solicitado.\n"
-"\n"
-"De manera predeterminada, los nuevos dispositivos usan cualquiera/todos los "
-"discos seleccionados.\n"
-"\n"
-"Puede cambiar a qué discos puede asignarse un nuevo dispositivo pulsando el "
-"botón de configuración (el del dibujo de herramientas) mientras el "
-"dispositivo está seleccionado.\n"
-"\n"
-"Al añadir un nuevo punto de montaje al pulsar el botón «+», deje el tamaño "
-"en blanco para hacer que el nuevo dispositivo use todo el espacio libre "
-"disponible.\n"
-"\n"
-"Cuando quite el último dispositivo de un dispositivo contenedor como un "
-"grupo de volúmenes LVM, quitaremos automáticamente el dispositivo contenedor "
-"para hacer sitio a nuevos dispositivos.\n"
-"\n"
-"Cuando se quita la última partición de un disco, este disco puede "
-"reinicializarse con una una nueva tabla de particiones si consideramos que "
-"hay un tipo más apropiado para ese disco.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "FECHA Y HORA"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Zona horaria inválida"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Primero necesita configurar la red, si desea usar NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "No tiene configurado un servidor NTP"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "DESTINO DE LA INSTALACIÓN"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "se seleccionó %d dispositivo"
+msgstr[1] "se seleccionaron %d dispositivos"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s para cambiar diseños."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TECLADO"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Prueba de configuración de disposición no disponible."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "probando el estado..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "El cambio de diseño no está configurado."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "IDIOMA"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Estado desconocido (ausente)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Estado desconocido"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "No administrado"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "No disponible"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Falta el firmware"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Cable desconectado"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "No disponible"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Desconectado"
@@ -2027,203 +2760,250 @@ msgstr "Desconectando"
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "desconectado"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Inalámbrico"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "desconectado"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Dirección IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Dirección IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Empresa"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Ninguno"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Se requiere autenticación"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Clave:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "CONFIGURACIÓN DE REDES"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "CONTRASEÑA ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Clave ingresada."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Contraseña de root establecida"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Cuenta root deshabilitada"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "No se configuró la contraseña de administrador (root)"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SELECCION DE SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Verificando las dependencias del software..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Error al verificar las dependencias del software"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Descargando los metadatos del paquete..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Descargando los metadatos de grupos..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Verificando las dependencias del software..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Error al verificar las dependencias del software"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Error al verificar las dependencias del software  Haga clic para más "
 "detalles."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "El siguiente software marcado para instalar tiene errores. \n"
 "Esto puede ser causado por un error en su fuente de instalación. \n"
 "Puede intentar remover este paquete de su instalación, cambiar su fuente de "
 "instalación, o salir del instalador."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "C_ancelar"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Salir"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Modificar la Fuente del Software"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Modificar la selección del software"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Configuración de la fuente de instalación..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Error al descargar metadatos de paquetes..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Se requiere autenticación"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Este medio es bueno para instalar de ahí."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Este medio no es bueno para usar para instalar."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "FUENTE DE INSTALACIÓN"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Falló al configurar la fuente de instalación, verifique el url del "
 "repositorio"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Error al configurar el repositorio"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Error al configurar una fuente de software"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2231,86 +3011,74 @@ msgstr ""
 "Falló al configurar la fuente de instalación, verifique la url del "
 "repositorio y la configuración del proxy"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Error al configurar el repositorio"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Error al configurar una fuente de software"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Servidor NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Zona horaria inválida"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Zona horaria inválida"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Zona horaria inválida"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+"Por favor, espere... los metadatos del software todavía se están cargando."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
@@ -2318,13 +3086,7 @@ msgstr ""
 "En los discos que ha seleccionado tiene las siguientes cantidades de "
 "espacios libres:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-"Por favor, espere... los metadatos del software todavía se están cargando."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2334,7 +3096,7 @@ msgstr ""
 "<b>No tiene espacio libre suficiente para instalar %s</b>, pero le podemos "
 "ayudar a reclamar espacio achicando o eliminando particiones existentes."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2344,7 +3106,7 @@ msgstr ""
 "No tiene espacio libre suficiente para instalar <b>%s</b>, aunque use todo "
 "el espacio libre disponible en los discos seleccionados."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2357,46 +3119,53 @@ msgstr ""
 "discos para tener más espacio, modificar su seleccion de software para "
 "instalar una versión más pequeña de <b>%s</b>, o salir del instalador."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "DESTINO DE LA INSTALACIÓN"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Guardando la configuración de almacenamiento..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "No se pudo guardar configuración de almacenaje..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formateando dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Error al verificar la configuración de almacenamiento.  Click para ver "
 "detalles."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Error al verificar la configuración de almacenamiento.  Click para ver "
 "detalles."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "sistema de archivo libre"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d disco seleccionado; %s de capacidad; %s libre"
 msgstr[1] "%d discos seleccionados; %s de capacidad; %s libre"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2404,7 +3173,11 @@ msgstr ""
 "Ha elegido omitir la instalación del gestor de carga. Puede que su sistema "
 "no arranque."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2414,11 +3187,19 @@ msgstr ""
 "almacenamiento. \n"
 "Puede modificar su disposición de almacenamiento o salir del instalador."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Salir"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Modificar el diseño del almacenamiento"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2429,53 +3210,53 @@ msgstr ""
 "almacenamiento. \n"
 "Puede modificar su disposición de almacenamiento o salir del instalador."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Aceptar"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "AJUSTES DE USUARIO"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Zona horaria inválida"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "BIENVENIDO A %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATOS"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2483,23 +3264,27 @@ msgid ""
 msgstr ""
 "Todavía no ha creado ningún punto de montaje para la instalación de %s %s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Haga clic aquí para recrearlos automáticamente."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "O cree nuevos puntos de montaje abajo con el ícono '+'."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2514,55 +3299,165 @@ msgstr[1] ""
 "<b>%d discos; %s de capacidad; %s de espacio libre</b> (no particionado y en "
 "sistemas de archivo)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_No instalar el cargador de arranque"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "Configurar como di_spositivo de arranque"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"El nivel RAID que ha seleccionado requiere más discos de los que ha "
+"seleccionado en este momento."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Por favor cree un nombre para su grupo de volumen y seleccione al menos un "
+"disco de los de abajo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Grupo de volúmenes:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "columna"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr ""
+"El punto de montaje %s debe establecerse dentro de un sistema de archivos "
+"linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Ese punto de montaje ya está en uso.  ¿Desea intentar algo diferente?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Favor ingresar un punto de montaje válido"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Ese punto de montaje es inválido. ¿Desea intentar algo diferente?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Borrar también los demás sistemas de archivo en la raíz %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "¿Está seguro que quiere borrar los datos de %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "¿Está seguro que quiere borrar los datos de %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Zona horaria inválida"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Salir"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Ingresó una contraseña débil: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Presevar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Encoger"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Borrar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Este dispositivo contiene una fuente de instalación"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Creando %(type)s en %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "No está listo"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Usar el Espacio Libre"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2575,14 +3470,14 @@ msgstr ""
 "para liberar espacio para esta instalación.  La eliminación de un sistema de "
 "archivo borrará permanentemente los datos que éste contenga."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2592,353 +3487,762 @@ msgstr[0] ""
 msgstr[1] ""
 "<b>%s discos; %s de espacio reclamable</b> (en los sistemas de archivo)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Total del espacio seleccionado a reclamar: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Borrar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Presevar"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALACIÓN DE LA DISTRIBUCIÓN"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "NOMBRE DEL ELEMENTO"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PRE-LANZAMIENTO / DE PRUEBA"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Dispositivo Nuevo"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Selector Nuevo"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Listo"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "C_ontinuar"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Aplicar cambios"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "CONFIGURACIÓN DE REDES"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Nombre del grupo"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "C_ancelar"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Aceptar"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "FECHA Y HORA"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Agregar servidores NTP y marcarlos para su uso."
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Servidor web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "En funcionamiento"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Usar"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Configurar..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "FECHA Y HORA"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Región:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Región:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Ciudad:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Ciudad:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Nombre de la _red"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nombre de la red"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 horas"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "DESTINO DE LA INSTALACIÓN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacidad"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "No conectado"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Dispositivo seleccionado"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "No se seleccionó nada"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etiqueta:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Falta el firmware"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_No"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Tipo de VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Dispositivo seleccionado"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "resumen"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Agregar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Ruta predeterminada"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Máscara de subred"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Velocidad"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Dirección de hardware"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "C_onfigurar..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Seguridad"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Nombre de la _red"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Nombre de la red"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Clave de seguridad"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Usar como punto de acceso..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Detener punto de acceso..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Configurar..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Proveedor"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Configurar..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Tipo de VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Puerta de enlace"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Nombre del grupo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Contraseña del grupo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Configurar..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Método"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "URL de _configuración"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "Proxy _HTTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "Proxy H_TTPS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "Proxy _FTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Equipo de _Socks"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Escribiendo configuración de red"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Desbloquear"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Modo Avión"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Escribiendo configuración de red"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nombre del equipo:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "CONFIGURACIÓN DE REDES"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2948,206 +4252,61 @@ msgstr ""
 "habilitar\n"
 " las actualizaciones de software."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Ruta predeterminada"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Máscara de subred"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Velocidad"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Dirección de hardware"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "C_onfigurar..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Seguridad"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "Nombre de la _red"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Nombre de la red"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Clave de seguridad"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Usar como punto de acceso..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Detener punto de acceso..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Configurar..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Proveedor"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Tipo de VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Puerta de enlace"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Nombre del grupo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Contraseña del grupo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Método"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "URL de _configuración"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "Proxy _HTTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "Proxy H_TTPS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "Proxy _FTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Equipo de _Socks"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Desbloquear"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Modo Avión"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Nombre del equipo:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Usar autenticación"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Se requiere autenticación"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Conectado"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SELECCION DE SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Elija su entorno"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "columna"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Cancelar y _agregar más discos"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "OPCIONES DE INSTALACIÓN"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Tipo de partición:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Cifrar mis datos. Configuraré una contraseña más tarde."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Se seleccionó particionado personalizado"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Reclamar espacio"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "OPCIONES DE INSTALACIÓN"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3155,79 +4314,146 @@ msgstr ""
 "Aquí se le describirá cuánto espacio se necesita para la selección de "
 "software actual."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disco libre"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Espacio libre que se puede usar."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "sistema de archivo libre"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Espacio libre no disponible pero que se puede reclamar de las particiones "
 "existentes."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Aquí se describirá las opciones que tiene."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Usar el Espacio Libre"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Salir del instalador"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Descripción del dispositivo"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Discos estándares locales"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Finalizar el particionado"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "C_ifrar"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Se seleccionó particionado automático"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Finalizar el particionado"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "C_ifrar"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Cifrar mis datos. Configuraré una contraseña más tarde."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Opciones de autoparticionado"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "resumen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Resumen de disco lleno y opciones..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "AGREGAR UN DISEÑO DE TECLADO"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Puede agregar un diseño de teclado eligiéndolo de abajo:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nombre"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "DISEÑO DEL TECLADO"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3236,7 +4462,7 @@ msgstr ""
 "cualquier diseño de teclado al comienzo de la lista para que sea el "
 "predeterminado."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3244,116 +4470,198 @@ msgstr ""
 "Los cambios aquí sólo se aplicarán al sistema instalado. Use la herramienta "
 "del escritorio para configurar el teclado para el proceso de instalación."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nombre"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Agregar un diseño"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Eliminar un diseño"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Mover arriba el diseño seleccionado"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Agregar un diseño"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Eliminar un diseño"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Mover arriba el diseño seleccionado"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Mover abajo el diseño seleccionado"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Vista previa del diseño"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Prueba de configuración de disposición no disponible."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Mayús para cambiar distribuciones."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Opciones"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Agregar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "AGREGAR UN DISEÑO DE TECLADO"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Puede agregar un diseño de teclado eligiéndolo de abajo:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nombre"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Regiones disponibles"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Agregar un diseño"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "OPCIONES DE INTERCAMBIO DE DISEÑO"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "¿Qué combinación(es) preferiría para cambiar entre diseños de teclado?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "usar"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "descripción"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Opciones de montaje NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "IDIOMA"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "No se seleccionó nada"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "CONTRASEÑA ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Contraseña de root:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirmar:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Contraseña VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Poner la clave de root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3361,237 +4669,285 @@ msgstr ""
 "La cuenta root se usa para administrar el sistema. Introduzca una contraseña "
 "para el usuario root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Listo"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "VERIFICACION DEL MEDIO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Verificando el medio, por favor, espere..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Agregar"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "Habilitar _Proxy HTTP"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>URL del Proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Ejemplo:</b> squid.misitio.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Usar autenticación"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Usuario</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Nombre de usuario"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Contraseña</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Clave:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "FUENTE DE INSTALACIÓN"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "¿Qué fuente de instalación desea usar?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "Medio de instalación _autodetectado:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etiqueta:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verificar"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "Archivo _ISO:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Elegir un ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "En la _red:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Configuración del _Proxy..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Esta URL se refiere a una lista de es_pejos."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Opciones de montaje NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Este campo es opcional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Repositorios de Fedora People"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Agregar nuevos puntos de montaje."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Agregar"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Eliminar los puntos de montaje seleccionados."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Quita_r"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Error operacional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Poner la clave de root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Esta URL se refiere a una lista de es_pejos."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nombre:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>URL del Proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nombre de usuario"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Clave:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Ese punto de montaje es inválido. ¿Desea intentar algo diferente?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "¡_Sáqueme de aquí!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Acepto mi destino."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "El software de pre-lanzamiento es inestable."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3603,204 +4959,264 @@ msgstr ""
 "Fallos con los que debe convivir. Este sistema operativo del futuro no es un "
 "sistema operativo estable en el que pueda confiar. Es sólo para pruebas."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "BIENVENIDO A %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "¿Qué idioma le gustaría utilizar durante el proceso de instalación?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Salir"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "C_ontinuar"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nombre de usuario"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Nombre del grupo"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Clave:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Contraseña VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Agregar un punto de montaje"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Capacidad deseada:</b>"
+msgid "Add a new mount point."
+msgstr "Agregar nuevos puntos de montaje."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Punto de montaje:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Agregar"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "AGREGAR UN NUEVO PUNTO DE MONTAJE"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Habrá más opciones de personalización disponibles\n"
-"después de crear el punto de montaje de abajo."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Este punto de montaje ya está en uso.\n"
-"¿Intentar algo distinto?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "ejemplo: \"20 GB\", \"500mb\" (sin las comillas)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Eliminarlo"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Guardar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CONFIGURAR PUNTO DE MONTAJE"
+msgid "Remove the selected mount point(s)."
+msgstr "Eliminar los puntos de montaje seleccionados."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Por favor cree un nombre para su grupo de volumen y seleccione al menos un "
-"disco de los de abajo."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Quita_r"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Libre"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dispositivo RAID"
+msgid "Reload storage configuration from disk."
+msgstr "falló la configuración de almacenamiento: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "C_ifrar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Dispositivo seleccionado"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Descripción del dispositivo"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Punto de montaje:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Capacidad deseada:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etiqueta:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Tipo de dispositivo:</b>"
+msgid "Device(s):"
+msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Sistema de archivos:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "C_ifrar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Reformatear"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Grupo de volúmenes:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Modificar ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nombre:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Tipo de dispositivo:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "C_ifrar"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Sistema de archivo"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Reformatear"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Grupo de volúmenes:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Modificar ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3808,17 +5224,19 @@ msgstr ""
 "Este dispositivo está cifrado y no se puede leer sin una contraseña válida. "
 "Puede desbloquearlo más abajo."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Contraseña:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Desbloquear"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3826,297 +5244,574 @@ msgstr ""
 "Este dispositivo no puede ser modificado directamente. Retírelo o seleccione "
 "un dispositivo  diferente."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Agregar nuevos puntos de montaje."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Eliminar los puntos de montaje seleccionados."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Configurar el punto de montaje seleccionado."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Configurar..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "falló la configuración de almacenamiento: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Pulse para obtener ayuda"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Ayuda"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ESPACIO DISPONIBLE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ESPACIO TOTAL</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Seleccionar"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "C_ancelar"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGURAR PUNTO DE MONTAJE"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Seleccione uno o más discos en los que este dispositivo pueda residir."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Dirección IP"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Debe ofrecer un nombre del inicializador iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Usar autenticación"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Ejemplo:</b> squid.misitio.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nombre de usuario"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Contraseña VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nombre de usuario"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Contraseña VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nombre de usuario"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Contraseña VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Nombre de la red"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Usar autenticación"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nombre de usuario"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Contraseña VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nombre de usuario"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Contraseña VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Nombre de usuario"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Contraseña VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Falló la conexión"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispositivo:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "DISCOS SELECCIONADOS"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Arranque"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Descripción"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Libre"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "Quita_r"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "El resúmen del disco va aquí"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Eliminarlo"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Seleccionar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGURAR PUNTO DE MONTAJE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Seleccione uno o más discos en los que este dispositivo pueda residir."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Agregar un punto de montaje"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Capacidad deseada:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Punto de montaje:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "AGREGAR UN NUEVO PUNTO DE MONTAJE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Habrá más opciones de personalización disponibles\n"
+"después de crear el punto de montaje de abajo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Este punto de montaje ya está en uso.\n"
+"¿Intentar algo distinto?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "ejemplo: \"20 GB\", \"500mb\" (sin las comillas)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Guardar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CONFIGURAR PUNTO DE MONTAJE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Por favor cree un nombre para su grupo de volumen y seleccione al menos un "
+"disco de los de abajo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nombre:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "C_ifrar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Favor ingresar un punto de montaje válido"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formateando dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Ocurrió un error desconocido durante la instalación.  Abajo estan los "
 "detalles."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "CONTRASEÑA DE CIFRADO DE DISCO"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Guardar Contraseña"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "CONTRASEÑA DE CIFRADO DE DISCO"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4125,7 +5820,19 @@ msgstr ""
 "Ha elegido cifrar algunos de sus datos. Necesitará crear una contraseña que "
 "le permitirá acceder a sus datos cuando inicie su equipo."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Contraseña:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirmar:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4134,117 +5841,172 @@ msgstr ""
 "Advertencia: su diseño de teclado actual es <b>%s</b>. Si cambia su diseño "
 "de teclado, puede ser que no pueda cifrar sus discos después de instalar."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "RECLAMAR ESPACIO DE DISCO"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "C_ancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "C_ancelar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Reclamar espacio"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "RECLAMAR ESPACIO DE DISCO"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "La descripción va aquí."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Sistema de archivo"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Espacio reclamable"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Acción"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Presevar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Borrar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Encoger"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Se seleccionó particionado personalizado"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Aplicar cambios"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Agregar un punto de montaje"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Sa_lir del Instalador"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_No"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Sí"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4252,51 +6014,50 @@ msgstr ""
 "¿Está seguro que quiere salir\n"
 "del proceso de instalación?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Salir"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "RESUMEN DE LA INSTALACIÓN"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Salir"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "Comenzar la _instalación"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "CONFIGURACIÓN"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Preparando la instalación"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s está ahora correctamente instalada en su sistema, pero aún se necesita "
-"otra hacer otra configuración. \n"
-"Termínela y haga clic en el botón de Terminar configuración."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Terminar configuración"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"¡%s ya está instalado exitosamente en su sistema y listo\n"
-"para usar! ¡Prosiga y reinicie para comenzar a usarlo!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Reiniciar"
 
@@ -4312,16 +6073,16 @@ msgstr "Instalar"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalar el CD vivo en su disco duro"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Iniciando instalación en el disco duro"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Bienvenido a Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4330,25 +6091,26 @@ msgstr ""
 "%s requiere %s MB de memoria para la instalación, pero solo tiene %s MB en "
 "este equipo.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "El instalador gráfico %s requiere %s MB de memoria, pero solo tiene %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "No hay suficiente RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4362,25 +6124,25 @@ msgstr ""
 "\n"
 " desde una terminal root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Iniciando el modo texto."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Error"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "La variable DISPLAY no se ha establecido. Iniciando en modo texto"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 "La instalación gráfica no se encuentra disponible. Iniciando en modo texto."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4391,20 +6153,20 @@ msgstr ""
 "ejemplo, no le permite definir su propio esquema de particiones, ni elegir "
 "paquetes determinados. ¿Le gustaría en su lugar utilizar el modo VNC?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Ejecute ssh install@%s para comenzar la instalación."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Ejecute ssh install@<equipo> para continuar la instalación."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Probar Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4414,7 +6176,7 @@ msgstr ""
 " Puede instalar Fedora ahora, o elegir \"Instalar en el Disco Rígido\" en el "
 "Resumen de Actividades en cualquier momento."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4422,10 +6184,300 @@ msgstr ""
 "Puede elegir \"Instalar en el Disco Rígido\"\n"
 " en el Resumen de Actividades en cualquier momento."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Cerrar"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "El nombre del equipo debe comenzar con un carácter válido dentro de los "
+#~ "rangos 'a-z', 'A-Z' o '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Necesita más espacio en los siguientes sistemas de archivos:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "¡No puede escribir una pregunta en el modo de línea de comandos!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Ese punto de montaje es inválido. ¿Desea intentar algo diferente?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Ha elegido configurar manualmente los sistemas de archivos de su nueva "
+#~ "instalación de %(productName)s. Antes de empezar, debería tomar un minuto "
+#~ "para familiarizarse. Han cambiado bastantes cosas.\n"
+#~ "\n"
+#~ "El cambio más importante es que la creación de nuevos sistemas de "
+#~ "archivos se ha modernizado. Ya no tiene que crear complejos dispositivos "
+#~ "como volúmenes lógicos LVM en etapas (volumen físico, luego grupo de "
+#~ "volúmenes, luego volumen lógico), ahora cree simplemente un volumen "
+#~ "lógico y nos encargaremos de preparar los volúmenes físicos y el grupo de "
+#~ "volúmenes que lo contiene. También nos encargaremos de ajustar el grupo "
+#~ "de volúmenes al añadir, quitar o redimensionar volúmenes lógicos para que "
+#~ "no se tenga que preocupar de los tediosos detalles.\n"
+#~ "\n"
+#~ "\n"
+#~ "Disposición de la pantalla\n"
+#~ "\n"
+#~ "El lado izquierdo de la pantalla muestra las instalaciones de los "
+#~ "sistemas operativos que hemos podido encontrar en su equipo. La nueva "
+#~ "instalación de %(productName)s está al principio de la lista. Puede "
+#~ "pulsar en los nombres de las instalaciones para ver qué sistemas de "
+#~ "archivos contienen.\n"
+#~ "\n"
+#~ "Debajo de las diversas instalaciones y puntos de montaje de la izquierda "
+#~ "hay botones para añadir un nuevo sistema de archivos, quitar el sistema "
+#~ "de archivos seleccionado o configurar el sistema de archivos "
+#~ "seleccionado.\n"
+#~ "\n"
+#~ "En la derecha de la pantalla es donde se puede personalizar el punto de "
+#~ "montaje seleccionado en ese momento.\n"
+#~ "\n"
+#~ "Abajo a la izquierda verá un resumen de los discos que ha elegido para "
+#~ "usar en la instalacion. Puede pulsar en el texto azul para ver "
+#~ "información más detallada sobre los discos seleccionados.\n"
+#~ "\n"
+#~ "\n"
+#~ "Cómo crear un nuevo sistema de archivos en un nuevo dispositivo\n"
+#~ "\n"
+#~ "1. Pulse en el botón «+».\n"
+#~ "2. Introduzca el punto de montaje y el tamaño (consejo: Pose el puntero "
+#~ "del ratón encima de cualquiera de las áreas de introducción de texto para "
+#~ "obtener ayuda).\n"
+#~ "3. Seleccione el nuevo punto de montaje debajo de «Nueva instalación de "
+#~ "%(productName)s» en el lado izquierdo de la pantalla y personalícelo para "
+#~ "acomodarlo a sus necesidades.\n"
+#~ "\n"
+#~ "\n"
+#~ "Cómo reformatear un dispositivo/sistema de archivos que ya existe en el "
+#~ "disco\n"
+#~ "\n"
+#~ "1. Seleccione el sistema de archivos en el lado izquierdo de la "
+#~ "pantalla.\n"
+#~ "2. Pulse en «Personalizar» en el área de personalización del punto de "
+#~ "montaje a la derecha de la pantalla.\n"
+#~ "3. Marque la casilla «Reformatear», seleccione un tipo de sistema de "
+#~ "archivos y, si procede, introduzca un punto de montaje en el área de "
+#~ "entrada de texto «Punto de montaje».\n"
+#~ "4. Pulse en «Aplicar cambios».\n"
+#~ "\n"
+#~ "\n"
+#~ "Cómo establecer un punto de montaje para un sistema de archivos que ya "
+#~ "existe en el disco\n"
+#~ "\n"
+#~ "1. Seleccione el sistema de archivos en el lado izquierdo de la "
+#~ "pantalla.\n"
+#~ "2. Introduzca un punto de montaje en el área de entrada de texto «Punto "
+#~ "de montaje» en el área de personalización del punto de montaje.\n"
+#~ "3. Pulse en «Aplicar cambios».\n"
+#~ "\n"
+#~ "\n"
+#~ "Cómo quitar un sistema de archivos que ya existe en el disco\n"
+#~ "\n"
+#~ "1. Seleccione el sistema de archivos que desea quitar en el lado "
+#~ "izquierdo de la pantalla.\n"
+#~ "2. Pulse el botón «-».\n"
+#~ "\n"
+#~ "Consejo: Quitar un dispositivo que ya existe en el disco de la «Nueva "
+#~ "instalación de %(productName)s» no lo quita del disco. Tan solo devuelve "
+#~ "el dispositivo a su estado original. Para quitar un dispositivo que ya "
+#~ "existe en el disco, debe seleccionarlo de cualquiera de las otras "
+#~ "instalaciones detectadas (o «Desconocido») y pulsar el botón «-».\n"
+#~ "\n"
+#~ "\n"
+#~ "Trucos y consejos\n"
+#~ "\n"
+#~ "Puede introducir tamaños para nuevos sistemas de archivos que son mayores "
+#~ "que el espacio libre total disponible. El instalador se acercará el "
+#~ "máximo posible el tamaño solicitado.\n"
+#~ "\n"
+#~ "De manera predeterminada, los nuevos dispositivos usan cualquiera/todos "
+#~ "los discos seleccionados.\n"
+#~ "\n"
+#~ "Puede cambiar a qué discos puede asignarse un nuevo dispositivo pulsando "
+#~ "el botón de configuración (el del dibujo de herramientas) mientras el "
+#~ "dispositivo está seleccionado.\n"
+#~ "\n"
+#~ "Al añadir un nuevo punto de montaje al pulsar el botón «+», deje el "
+#~ "tamaño en blanco para hacer que el nuevo dispositivo use todo el espacio "
+#~ "libre disponible.\n"
+#~ "\n"
+#~ "Cuando quite el último dispositivo de un dispositivo contenedor como un "
+#~ "grupo de volúmenes LVM, quitaremos automáticamente el dispositivo "
+#~ "contenedor para hacer sitio a nuevos dispositivos.\n"
+#~ "\n"
+#~ "Cuando se quita la última partición de un disco, este disco puede "
+#~ "reinicializarse con una una nueva tabla de particiones si consideramos "
+#~ "que hay un tipo más apropiado para ese disco.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "CONFIGURACIÓN DE REDES"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Error al descargar metadatos de paquetes..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "No se seleccionó nada"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Falta el firmware"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Se requiere autenticación"
+
+#~ msgid "column"
+#~ msgstr "columna"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Tipo de partición:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>URL del Proxy</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Usuario</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Contraseña</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Ese punto de montaje es inválido. ¿Desea intentar algo diferente?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etiqueta:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Sistema de archivos:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispositivo RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Configurar el punto de montaje seleccionado."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Pulse para obtener ayuda"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ESPACIO DISPONIBLE</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ESPACIO TOTAL</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Completado"
 
@@ -4479,42 +6531,9 @@ msgstr "Cerrar"
 #~ msgid "Install on System"
 #~ msgstr "Instalar en el sistema"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Ocurrió el siguiente error mientras se configuraba el repositorio de "
-#~ "instalación:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "La instalación no puede continuar."
-
 #~ msgid "Exit installer"
 #~ msgstr "Salir del instalador"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "La instalación se ha detenido debido a lo que parecería ser un problema "
-#~ "con su hardware. El mensaje exacto del error es:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Ahora el instalador finalizará."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Se ha encontrado un error de hardware"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Salir del instalador"
 
@@ -4816,9 +6835,6 @@ msgstr "Cerrar"
 #~ msgid "Software Development"
 #~ msgstr "Desarrollo de software"
 
-#~ msgid "Web Server"
-#~ msgstr "Servidor web"
-
 #~ msgid "Minimal"
 #~ msgstr "Mínima"
 
@@ -4863,52 +6879,6 @@ msgstr "Cerrar"
 #~ "lógicas que no pueden ser eliminadas:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "No ha definido una partición root (/), necesaria para que la instalación "
-#~ "de %s continúe."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Su partición root posee menos de 250 megabytes, tamaño que habitualmente "
-#~ "no basta para instalar %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Esta plataforma necesita un /boot en un volumen o partición dedicada. Si "
-#~ "no quiere un volumen /boot, lo debe poner en / en una partición no LVM "
-#~ "dedicada."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Su partición %(mount)s es menor de %(size)s megabytes, que es menos de lo "
-#~ "que se recomienda en una instalación %(productName)s normal."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Su partición %(mount)s es demasiado pequeña para el tipo de formato "
-#~ "%(format)s (cuyo tamaño permitido es entre %(minSize)d MB y %(maxSize)d "
-#~ "MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Su partición %(mount)s es demasiado grande para el tipo de formato "
-#~ "%(format)s (cuyo tamaño permitido es entre %(minSize)d MB y %(maxSize)d "
-#~ "MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4926,60 +6896,6 @@ msgstr "Cerrar"
 #~ msgstr ""
 #~ "no ha creado un gestor de arranque etapa 1 en el dispositivo destino"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "No ha creado una partición de arranque."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Su sistema basado en BIOS necesita una partición de arranque especial con "
-#~ "el nuevo formato de etiqueta de disco %s (GPT). Para continuar, por favor "
-#~ "crear una partición del tipo 'BIOS Boot' de 1 MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "No ha definido una partición swap. Se necesitan %(requiredMem)s MB de "
-#~ "memoria para poder continuar con la instalación sin una partición swap, "
-#~ "pero solo dispone de %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "No ha especificado una partición swap. Si bien esto no es indispensable, "
-#~ "mejorará considerablemente el rendimiento en la mayoría de las "
-#~ "instalaciones."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Por lo menos uno de sus dispositivos swap no posee un UUID, algo que "
-#~ "suele suceder cuando el espacio swap ha sido generado con versiones "
-#~ "antiguas de mkswap. Estos dispositivos serán referenciados de acuerdo a "
-#~ "su ruta en el archivo /etc/fstab, algo que no es recomendado ya que las "
-#~ "rutas a los dispositivos se modifican de acuerdo a las circunstancias. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Este punto de montaje no es válido. El directorio %s debe estar dentro "
-#~ "del sistema de archivos /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "El punto de montaje %s debe establecerse dentro de un sistema de archivos "
-#~ "linux."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux en %s"
 
@@ -4989,11 +6905,6 @@ msgstr "Cerrar"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "Linux %(product)s %(version)s para %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formateando dispositivo DASD"
-#~ msgstr[1] "Formateando dispositivos DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Preparando %d dispositivo DASD para utilizar con Linux..."
@@ -5271,9 +7182,6 @@ msgstr "Cerrar"
 #~ msgid "Error setting root password"
 #~ msgstr "Error estableciendo la constraseña de root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Debe proveer y confirmar una contraseña."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Eliminar Paquetes"
 
@@ -5307,24 +7215,12 @@ msgstr "Cerrar"
 #~ msgid "%s of %s"
 #~ msgstr "%s de %s"
 
-#~ msgid "Region:"
-#~ msgstr "Región:"
-
-#~ msgid "City:"
-#~ msgstr "Ciudad:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 horas"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Elija sus agregados"
 
@@ -5408,9 +7304,6 @@ msgstr "Cerrar"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Finalizar el particionado"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "CONFIGURAR GRUPO DE VOLUMEN"
 
diff --git a/anaconda/po/et.po b/anaconda/po/et.po
index 57c46b3..839bca6 100644
--- a/anaconda/po/et.po
+++ b/anaconda/po/et.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/fedora/language/"
@@ -25,217 +25,465 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot failisüsteem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s ei saa olla tüüp %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s ei tohi olla väiksem, kui %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s ei tohi olla suurem, kui %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s peab olema primaarsel partitsioonil."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ei saa olla krüpteeritud blokkseade."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ei saa olla tüüp %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Käivita VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Kasuta tekstiolekut"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Parool on määratud."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Paroolid ei klapi!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Sa valisid nõrga parooli: %s. Klõpsa Valmis nupul kui, soovid seda kasutada."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 "Sa valisid nõrga parooli: %s. Klõpsa Valmis nupul kui, soovid seda kasutada."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Nõrk"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Korralik"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Olgu"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Jah"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Ei"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Paigaldusvaramu ülesseadmisel tekkisid järgmised vead:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Paigaldusprotsess ei saa jätkuda."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Paigaldusvaramu ülesseadmisel tekkisid järgmised vead:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Paigaldusprotsess ei saa jätkuda."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Tekkis riistvaraline tõrge"
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Se_distuse URL"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Eelpaigalduse skriptide käivitamine"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Pakkide paidaldamise protsessi alustamine"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Järelpaigalduse ülesannete sooritamine"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -244,85 +492,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s puudub. Tulemüüri ülesseadmine nurjus."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s puudub. Tulemüüri ülesseadmine nurjus."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "See failisüsteem ei toeta silte."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Eelpaigalduse skriptide käivitamine"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Masinanimi peab olema alla 255 tähemärgi."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "Masinanimi peab algama tähemärgiga vahemikus 'a-z', 'A-Z või '0-9'."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Traadiga (%s) ühendatud"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Pole ühendatud"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Võrguseadmeid pole saadaval"
 
@@ -331,7 +871,12 @@ msgstr "Võrguseadmeid pole saadaval"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Uus %s %s paigaldus"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Käivita %s süsteemi lahtiühendamiseks, kui oled lõpetanud."
@@ -344,8 +889,8 @@ msgstr "Kui oled lõpetanud, siis välju shell-st ning arvuti taaskäivitatakse.
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Käivitamiseks vajalik /bin/sh leidmine nurjus. Shelli ei käivitata"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Päästmine"
 
@@ -383,21 +928,15 @@ msgstr "Parandatav arvuti"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Millisel seadmel on sinu paigalduse juurpartitsioon?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Olgu"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Välju"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Süsteem taaskäivitatakse automaatselt, kui väljud shellist."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -406,7 +945,7 @@ msgstr ""
 "Sinu süsteemil on täpane failisüsteem, mida sa ei nõustunud ühendama. Shelli "
 "saamiseks vajuta enter, kus sa saad fsck ja ühendada oma partitsioone. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -427,7 +966,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -440,29 +979,207 @@ msgstr ""
 "\n"
 "Shelli saamiseks vajuta <enter>."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Sul ei ole ühtegi Linuxi partitsiooni. Taaskäivitan.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Süsteem taaskäivitatakse automaatselt, kui väljud shellist."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Päästerežiim"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Sul ei ole ühtegi Linuxi partitsiooni. Shelli saamiseks vajuta <enter>. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Süsteem on ühendatud kataloogi %s külge."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Sandardne partitsioon"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Ketas"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Juurpartitsioon (/) on väiksem kui 250MB. Tavaliselt ei ole see %s "
+"paigaldamiseks piisav."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "%s paigaldamiseks hädavajalik juurpartitsioon (/) on jäetud määramata."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Juurpartitsioon (/) on väiksem kui 250MB. Tavaliselt ei ole see %s "
+"paigaldamiseks piisav."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Sa ei ole loonud alglaetavat partitsiooni."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Saaleala ei ole määratud. See ei ole küll hädavajalik, kuid enamusel "
+"juhtudest parandab see arvuti jõudlust."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, fuzzy, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "Haakepunkt on vigane. Proovi midagi muud?"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Parool on määratud."
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -562,84 +1279,234 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Allika ülesseadmine nurjus"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Viga pakkia metaandmete allalaadimisel..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Pole saadaval ühtegi paigaldamise allikat"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Tarkvara paigaldamine"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Pakkide paidaldamise protsessi alustamine"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Sa vajad järgnevatel failisüsteemidel rohkem ruumi:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Ettevalmistus ülekandeks paigalduse allikast"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Paigaldamine"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Pakki metaandmete allalaadimine..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Paigaldamine"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Paigaldamiseks valmistumine"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "VAIKIMISI PEALKIRI"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALISEERIMINE"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALISEERIMINE"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "TARKVARA"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SÜSTEEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Paigaldusjärgne"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Automatiseeritud paigalduse käivitamine"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Käsureaolekus ei ole küsimused lubatud!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Viga"
 
@@ -663,31 +1530,34 @@ msgstr "jah"
 msgid "no"
 msgstr "ei"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Soovid tõesti väljuda?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -702,468 +1572,543 @@ msgstr ""
 "teise arvutiga, et proovida graafilist installeerimist või jätkad "
 "tekstiolekus installeerimist?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC parool"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Parool:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Parool (kinnitus):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Paroolid ei klapi!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Parool peab olema vähemalt 6 märki pikk."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Parool peab olema vähemalt 6 märki pikk."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Ajatsooni sätted"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Ajatsooni pole määratud."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "_Lõpeta seadistamine"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Traadiga (%s) ühendatud"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Traadiga (%s) ühendatud"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Masinanimi"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Masinanimi"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Masinanimi"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Lõpeta seadistamine"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Võrgulüüs"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Administraatori parool"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Parool on määratud."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Administraatori konto on keeltaud."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Parooli pole määratud."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Palun vali uusadministraatori parool. Sa pead teda kaks korda kirjutama."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Parool:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Kasuta kogu ruumi"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Asenda olemas-olevad Linuxi süsteemid"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Kasuta vaba ruumi"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Paigalduse sihtkoht"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Ühtegi ketast pole valitud"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Uuendusjärgse seadistuse läbiviimine"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Valitud automaatne partitsioneerimine"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Valitud kohandatud partitsioneerimine"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Ühtegi ketast pole valitud; palun vali vähemalt üks ketas kuhu paigaldada."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Ajatsooni sätted"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s ajatsoon"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Ajatsooni pole määratud."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Käivita VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Paigaldamise edenemine"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Lähim peegel"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-i server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Tarkvara allika ülesseadmisel tekkis tõrge"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Midagi pole valitud"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD seade"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO fail:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Võrgu aeg"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Pole saadaval ühtegi paigaldamise allikat"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Allika ülesseadmine nurjus"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Viga pakkia metaandmete allalaadimisel..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Pole saadaval ühtegi paigaldamise allikat"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-i server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "_Lisa haakepunkt"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Paigaldamise allika ülesseadmine nurjus, kontrolli varamu url-i"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "seade, mis sisaldab /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Allika ülesseadmine nurjus"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Muuda tarkvara valikut"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Viga tarkvara valiku kontrollimisel"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Paigaldamise allikat ei seatud üles"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Kohandatud tarkvara valitud"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Paigaldamise allikat ei seatud üles"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Kasuta autentimist"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Sa pead valima ja kinnitama parooli."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Hoiatus"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1179,36 +2124,36 @@ msgstr "Töötlemisel"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Uus seade"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Parool (kinnitus):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1216,7 +2161,7 @@ msgid ""
 msgstr ""
 "Sa valisid nõrga parooli: %s. Klõpsa Valmis nupul kui, soovid seda kasutada."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1224,550 +2169,375 @@ msgid ""
 msgstr ""
 "Sa valisid nõrga parooli: %s. Klõpsa Valmis nupul kui, soovid seda kasutada."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Parool on määratud."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Välju paigaldajast"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Välju"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Ei"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Jah"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "VAIKIMISI PEALKIRI"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALISEERIMINE"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALISEERIMINE"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "TARKVARA"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SÜSTEEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Valmis!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Valmis!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Välju"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Uus %s %s paigaldus"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "veerg"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Palun kirjuta korrektne haakepunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Haakepunkt on vigane. Proovi midagi muud?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Haakepunkt on juba kasutuses. Proovi midagi muud?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Palun kirjuta korrektne haakepunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Haakepunkt on vigane. Proovi midagi muud?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Sandardne partitsioon"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Ketas"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Puudub"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Sa pead looma juurseadmele uue failisüsteemi."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "KÄSITSI PARTITSIONERIMINE"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Sa pead looma juurseadmele uue failisüsteemi."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "See failisüsteem ei toeta silte."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Ühtegi ketast pole valitud"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Selle failisüsteemi suurust ei saa muuta."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Viga tarkvara sõltuvuste kontrollimisel. Klõpsa detailide nägemiseks."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Viga tarkvara sõltuvuste kontrollimisel. Klõpsa detailide nägemiseks."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "vaba ruum"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Valitud kettal pole piisavalt ruumi."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automaatne partitsioneerimine nurjus. Info saamiseks klõpsa."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Muuda tarkvara valikut"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "KUUPÄEV & KELLAAEG"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Vigane ajatsoon"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Enne NTP kasutamist pead võrgu üles seadma"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Sul pole töötavat NTP serverit seadistatud"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "PAIGALDAMISE SIHTKOHT"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KLAVIATUUR"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "KEEL"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Staatus teadmata (puudub)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Staatus teadmata"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Pole saadaval"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Puudub firmware"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kaabel pole ühendatud"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Pole saadaval"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Ühendamata"
@@ -1792,194 +2562,241 @@ msgstr "Ühenduse katkestamine"
 msgid "Connection failed"
 msgstr "Ühendus nurjus"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "ühendamata"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Traadita"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "ühendamata"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 aadress"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 aadress"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP aadress"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Ettevõte"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Puudub"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Nõtud autentimine"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Parool:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "VÕRGU SEADISTAMINE"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ADMINISTRAATORI PAROOL"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Parool on määratud."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Administraatori konto on keelatud"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Administraatori parool pole määratud"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "TARKVARA VALIK"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Tarkvaraliste sõltuvuste kontrollimine..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Viga tarkvaraliste sõltuvuste kontrollimisel"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Pakki metaandmete allalaadimine..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Grupi metaandmete allalaadimine..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Tarkvaraliste sõltuvuste kontrollimine..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Viga tarkvaraliste sõltuvuste kontrollimisel"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Viga tarkvara sõltuvuste kontrollimisel. Klõpsa detailide nägemiseks."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Katkesta"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Välju"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Muuda tarkvara allikat"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Muuda tarkvara valikut"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Viga pakkia metaandmete allalaadimisel..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Nõtud autentimine"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "See meedia sobib paigaldamiseks."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "See meedia ei sobi paigaldamiseks."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "PAIGALDAMISE ALLIKAS"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Paigaldamise allika ülesseadmine nurjus, kontrolli varamu url-i"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Varamu ülesseadmine nurjus"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Tarkvara allika ülesseadmisel tekkis tõrge"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -1987,96 +2804,78 @@ msgstr ""
 "Paigaldamise allika ülesseadmine nurjus, kontrolli varamu url-i ja proksi "
 "sätteid"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Varamu ülesseadmine nurjus"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Tarkvara allika ülesseadmisel tekkis tõrge"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Seade:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-i server %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Vigane ajatsoon"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Vigane ajatsoon"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Vigane ajatsoon"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Palun oota... tarkvara metaandmeid ikka laaditakse."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Palun oota... tarkvara metaandmeid ikka laaditakse."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2084,14 +2883,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2100,132 +2899,156 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "PAIGALDAMISE SIHTKOHT"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD seadme vormindamine"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Viga tarkvara sõltuvuste kontrollimisel. Klõpsa detailide nägemiseks."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "vaba ruum"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
-msgid "_Modify Storage Layout"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Välju"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Modify Storage Layout"
+msgstr "_Muuda tarkvara allikat"
+
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Olgu"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "VÕRGU SEADISTAMINE"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Vigane ajatsoon"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "TERETULEMAST %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "ANDMED"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Sa pole veel loonud ühtegi haakepunkti oma %s %s paigalduse jaoks:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Või loo uued haakepunktid '+' ikoonile klõpsates."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2236,69 +3059,170 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
+msgstr "Valitud seade"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "veerg"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Haakepunkt on juba kasutuses. Proovi midagi muud?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Palun kirjuta korrektne haakepunkt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Haakepunkt on vigane. Proovi midagi muud?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Sa pead looma juurseadmele uue failisüsteemi."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Vigane ajatsoon"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Välju"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Säilita"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Kahanda"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Kustuta"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Pole valmis"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Kasuta vaba ruumi"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2306,984 +3230,1435 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Kustuta"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Säilita"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Uus seade"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Valmis"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Jätka"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Rakenda muudatused"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "VÕRGU SEADISTAMINE"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Grupi nimi"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Katkesta"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Olgu"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "KUUPÄEV & KELLAAEG"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Veebiserver"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Töötamine."
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Kasuta"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Se_adista"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "KUUPÄEV & KELLAAEG"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Regioon:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Regioon:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Linn:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Linn:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Võrgu nimi"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Võrgu nimi"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "PAIGALDAMISE SIHTKOHT"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Maht"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Pole ühendatud"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Valitud seade"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Midagi pole valitud"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Silt:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Puudub firmware"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Ei"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN-i tüüp"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Valitud seade"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "kokkuvõte"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID seade"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "Lis_a"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Vaikimisi marsruut"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Võrgu mask"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Kiirus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Riistvara aadress"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Se_adista"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Turvalisus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Võrgu nimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Võrgu nimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Turva võti"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Se_adista"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Teenusepakkuja"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Se_adista"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN-i tüüp"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Võrgulüüs"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Grupi nimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Grupi parool"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Se_adista"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Meetod"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "Se_distuse URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP proksi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS proksi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP proksi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "_Lõpeta seadistamine"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Lukusta lahti"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Lennuki režiim"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "_Lõpeta seadistamine"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Masinanimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "VÕRGU SEADISTAMINE"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Vaikimisi marsruut"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Võrgu mask"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Kiirus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Riistvara aadress"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "Se_adista"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Turvalisus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Võrgu nimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Võrgu nimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Turva võti"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "Se_adista"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Teenusepakkuja"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN-i tüüp"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Võrgulüüs"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Grupi nimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Grupi parool"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Kasutajanimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Meetod"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "Se_distuse URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP proksi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS proksi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP proksi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Lukusta lahti"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Lennuki režiim"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Masinanimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Kasuta autentimist"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Nõtud autentimine"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Ühendatud"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "TARKVARA VALIK"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "veerg"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Katkesta & lis_a rohkem kettaid"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "PAIGALDUSE VALIKUD"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-#, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Partitsiooni tüüp:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Valitud kohandatud partitsioneerimine"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "PAIGALDUSE VALIKUD"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "vaba ruum"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Kasutamiseks olev vaba ruum."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Siin me kirjeldame, millised sinu valikud on."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Kasuta vaba ruumi"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Välju paigaldajast"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Seadme kirjeldus"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Valitud kohandatud partitsioneerimine"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Krüpteeri"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Valitud automaatne partitsioneerimine"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Lõpeta seadistamine"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Krüpteeri"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "_Valikud"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "kokkuvõte"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "LISA KLAVIATUURI ASETUS"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nimi"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "KLAVIATUURI ASETUS"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nimi"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Lisa asetus"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Eemalda asetus"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Liiguta valitud asetus üles"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Lisa asetus"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Eemalda asetus"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Liiguta valitud asetus üles"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Liiguta valitud asetus alla"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Asetuse eelvaade"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Valikud"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "Lis_a"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "LISA KLAVIATUURI ASETUS"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nimi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Lisa asetus"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Olgu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ASETUSE VAHETAMINE VALIKUD"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "kasuta"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "kirjeldus"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "_Lisa haakepunkt"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "KEEL"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Midagi pole valitud"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ADMINISTRAATORI PAROOL"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Administraatori parool"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Kinnita:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC parool"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Määra administraatori parool"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Valmis"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MEEDIA KONTROLLIMINE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Meedia kontrollimine, palun oota..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "Lis_a"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Olgu"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Võimalda HTTP proksi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proksi URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Näide:</b> squid.minuleht.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Kasuta autentimist"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Kasutajanimi</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Kasutajanimi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Parool</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Parool:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "PAIGALDAMISE ALLIKAS"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Seade:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Silt:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Kontrolli"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO fail:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Seade:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Vali ISO fail"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "_Võrgus:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proksi häälestamine..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "_Lisa haakepunkt"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Lisa uus haakepunkt."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "Lis_a"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Eemalda valitud haakepunkt(id.)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Eemalda asetus"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Määra administraatori parool"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nimi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proksi URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Kasutajanimi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Parool:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Haakepunkt on vigane. Proovi midagi muud?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Vii mind siit ära!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Lepin oma saatusega."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3291,622 +4666,1029 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "TERETULEMAST %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Millist keelt kasutatakse paigaldamisel?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Välju"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Jätka"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Kasutajanimi"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Grupi nimi"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Parool:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC parool"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Lisa haakepunkt"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Seadmetüüp:</b>"
+msgid "Add a new mount point."
+msgstr "Lisa uus haakepunkt."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Haakepunkt:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "Lis_a"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "LISA UUS HAAKEPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Kustuta see"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "SEADISTA HAAKEPUNKT"
+msgid "Remove the selected mount point(s)."
+msgstr "Eemalda valitud haakepunkt(id.)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Vaba"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID seade"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Eemalda asetus"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Krüpteeri"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Valitud seade"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Seadme kirjeldus"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
-msgstr "<b>Silt:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Haakepunkt:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:409
 #, fuzzy
-msgid "<b>Device _Type:</b>"
+msgid "_Desired Capacity:"
 msgstr "<b>Seadmetüüp:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
+#: pyanaconda/ui/gui/spokes/custom.glade:461
 #, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Failisüsteem:</b>"
+msgid "_Label:"
+msgstr "<b>Silt:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Krüpteeri"
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Seade:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nimi"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Seadmetüüp:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Krüpteeri"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Failisüsteem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "veerg"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID seade"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
-msgstr ""
+msgstr "Parool:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
-msgstr ""
+msgstr "Lukusta lahti"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Lisa uus haakepunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Eemalda valitud haakepunkt(id.)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Se_adista"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">SAADAVALOLEV RUUM</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">KKETTARUUM KOKKU</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Katkesta"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "SEADISTA HAAKEPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Olgu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP aadress"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Kasuta autentimist"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Näide:</b> squid.minuleht.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Kasutajanimi"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC parool"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Kasutajanimi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC parool"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Kasutajanimi"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC parool"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Võrgu nimi"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Kasuta autentimist"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Kasutajanimi"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC parool"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Kasutajanimi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC parool"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Kasutajanimi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC parool"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Ühendus nurjus"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Olgu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Seade:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "VALITUD KETTAD"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Sulge"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Vaba"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Eemalda asetus"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Kokkuvõte ketastest läheb siia"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Kustuta see"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Midagi pole valitud"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "SEADISTA HAAKEPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Lisa haakepunkt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Seadmetüüp:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Haakepunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "LISA UUS HAAKEPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "SEADISTA HAAKEPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nimi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID seade"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Krüpteeri"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Palun kirjuta korrektne haakepunkt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Olgu"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD seadme vormindamine"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Save Passphrase"
+msgstr "_Rakenda muudatused"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
 msgid "DISK ENCRYPTION PASSPHRASE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
-msgid "_Save Passphrase"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Parool:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Kinnita:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "VALITUD KETTAD"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Olgu"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Katkesta"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Failisüsteem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Tegevus"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Säilita"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Kustuta"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Kahanda"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Valitud kohandatud partitsioneerimine"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Rakenda muudatused"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Seade:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Lisa haakepunkt"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Välju paigaldajast"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Ei"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Jah"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -3914,48 +5696,52 @@ msgstr ""
 "Kas sa oled kindel,et soovid\n"
 "paigaldusprotseduuri katkestada?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Välju"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "PAIGALDUSE KOKKUVÕTE"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Välju"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Paigaldusjärgne"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "SEADISTUS"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Paigaldamiseks valmistumine"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Lõpeta seadistamine"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Taas_käivita"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3969,16 +5755,16 @@ msgstr "Paigalda"
 msgid "Install the live CD to your hard disk"
 msgstr "Paigalda laiv CD kõvakettale"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Kõvakettale paigaldamise alustamine"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Teretulemast Fedorasse"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3986,26 +5772,27 @@ msgid ""
 msgstr ""
 "%s nõuab paigaldamiseks %s MB mälu, aga selles masinas on ainult %s MB.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s graafiline paigaldaja nõuab %s MB mälu, aga selles masinas on ainult %s "
 "MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Pole piisavalt RAM-i"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4019,24 +5806,24 @@ msgstr ""
 "\n"
 "administraatorina terminalist."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Tekstirežiimi käivitamine."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Viga"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY muutuja on määramata. Tekstirežiimi käivitamine."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Graafiline paigaldus ei ole võimalik. Tekstirežiimi käivitamine."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4047,36 +5834,107 @@ msgstr ""
 "Ta ei luba sul määrata kohandatud partitsioonide paigutust ega pakkide "
 "valikut. Kas sa sooviksid kasutada selleasemel VNC režiimi?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Paigaldamise alustamiseks palun ssh install@%s."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Paigadamise jätkamiseks palun ssh install@<host>."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Proovi FEdorat"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Sulge"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "Masinanimi peab algama tähemärgiga vahemikus 'a-z', 'A-Z või '0-9'."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Sa vajad järgnevatel failisüsteemidel rohkem ruumi:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Käsureaolekus ei ole küsimused lubatud!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Haakepunkt on vigane. Proovi midagi muud?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Viga pakkia metaandmete allalaadimisel..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Midagi pole valitud"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Puudub firmware"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Nõtud autentimine"
+
+#~ msgid "column"
+#~ msgstr "veerg"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Partitsiooni tüüp:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proksi URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Kasutajanimi</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Parool</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Haakepunkt on vigane. Proovi midagi muud?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Silt:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Failisüsteem:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID seade"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">SAADAVALOLEV RUUM</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">KKETTARUUM KOKKU</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Valmis"
 
@@ -4119,26 +5977,9 @@ msgstr "Sulge"
 #~ msgid "Install on System"
 #~ msgstr "Paigalda süsteemi"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Paigaldusvaramu ülesseadmisel tekkisid järgmised vead:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Paigaldusprotsess ei saa jätkuda."
-
 #~ msgid "Exit installer"
 #~ msgstr "Välju paigaldajast"
 
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Tekkis riistvaraline tõrge"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Välju paigaldajast"
 
@@ -4229,9 +6070,6 @@ msgstr "Sulge"
 #~ msgid "No Network Available"
 #~ msgstr "Puudub võrk"
 
-#~ msgid "Re_boot"
-#~ msgstr "Taas_käivita"
-
 #~ msgid "_Eject"
 #~ msgstr "_Väljasta"
 
@@ -4307,9 +6145,6 @@ msgstr "Sulge"
 #~ msgid "Software Development"
 #~ msgstr "Tarkvara arendus"
 
-#~ msgid "Web Server"
-#~ msgstr "Veebiserver"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimaalne"
 
@@ -4332,19 +6167,6 @@ msgstr "Sulge"
 #~ msgid "This device is part of a LVM volume group."
 #~ msgstr "See seade on osa LVM volüümi grupist."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "%s paigaldamiseks hädavajalik juurpartitsioon (/) on jäetud määramata."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Juurpartitsioon (/) on väiksem kui 250MB. Tavaliselt ei ole see %s "
-#~ "paigaldamiseks piisav."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4359,25 +6181,9 @@ msgstr "Sulge"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "sa ei ole loonud alglaaduri stage1 sihtseadet"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Sa ei ole loonud alglaetavat partitsiooni."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Saaleala ei ole määratud. See ei ole küll hädavajalik, kuid enamusel "
-#~ "juhtudest parandab see arvuti jõudlust."
-
 #~ msgid "Unknown Linux"
 #~ msgstr "Tundmatu Linux"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD seadme vormindamine"
-#~ msgstr[1] "DASD seadmete vormindamine"
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo nurjus %s"
 
@@ -4444,9 +6250,6 @@ msgstr "Sulge"
 #~ msgid "Error setting root password"
 #~ msgstr "Tõrge administraatori parooli seadmisel"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Sa pead valima ja kinnitama parooli."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Eemalda pakke"
 
@@ -4456,12 +6259,6 @@ msgstr "Sulge"
 #~ msgid "enter URL of your desired repository"
 #~ msgstr "sisesta soovitud varamu URL"
 
-#~ msgid "Region:"
-#~ msgstr "Regioon:"
-
-#~ msgid "City:"
-#~ msgstr "Linn:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
diff --git a/anaconda/po/eu.po b/anaconda/po/eu.po
index d233fec..81e94c6 100644
--- a/anaconda/po/eu.po
+++ b/anaconda/po/eu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/fedora/language/"
@@ -23,213 +23,449 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot fitxategi-sistema"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Abiaratu VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Erabili testu modua"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Pasahitza ezarri da."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Pasahitzak ez datoz bat!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Ahula"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Nahikoa"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Ona"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Indartsua"
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Ados"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Bai"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Ez"
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Erabiltzaileak sortzen"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Instalazio aurreko scriptak exekutatzen"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Instalazio prozesua abiarazten"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Abioko kargatzailea instalatzen"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Instalazio ondorengo konfigurazioa gauzatzen"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Abioko kargatzailea instalatzen"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -238,85 +474,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Instalazio aurreko scriptak exekutatzen"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Ostalari-izenak 255 karaktere edo gutxiagoko luzera izan behar du."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Konektatzen..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Deskonektatzen..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Konektatu gabe"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -325,7 +853,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -338,8 +871,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Berreskuratu"
 
@@ -377,28 +910,22 @@ msgstr ""
 msgid "Which device holds the root partition of your installation?"
 msgstr "Zein gailuk dauka zure instalazioaren erro partizioa?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Ados"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Irten"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -411,7 +938,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -420,28 +947,204 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Ez daukazu Linux partiziorik.  Berrabiarazten.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Berreskurapen modua"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr ""
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Partizio estandarra"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Diskoa"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Zure erro partizioak 250 megabyte baino gutxiago ditu eta normalean %s "
+"instalatzeko txikiegia da."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Zure erro partizioak 250 megabyte baino gutxiago ditu eta normalean %s "
+"instalatzeko txikiegia da."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Pasaesaldia:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -540,84 +1243,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Errorea paketea instalatzean"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Softwarea instalatzen"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Instalatzen"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Errorea paketea instalatzean"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instalatzen"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Instalatzeko prestatzen"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALIZAZIOA"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALIZAZIOA"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWAREA"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Instalazio ondorena"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Errorea"
 
@@ -641,31 +1492,33 @@ msgstr "bai"
 msgid "no"
 msgstr "ez"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -676,464 +1529,539 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC pasahitza"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Pasahitza:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Pasahitza (baieztatu):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Pasahitzak ez datoz bat!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Pasahitzak gutxienez sei karaktere izan behar ditu."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Pasahitzak gutxienez sei karaktere izan behar ditu."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Pasahitza ez da ezarri."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "_Amaitu konfigurazioa"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Ostalari-izena:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Ostalari-izena"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Ostalari-izena"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Ostalari-izena ez da baliozkoa: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Amaitu konfigurazioa"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Atebidea"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Ezarri root-en pasahitza"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Pasahitza ezarri da."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root kontua ezgaituta."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Pasahitza ez da ezarri."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Mesedez, aukeratu root erabiltzailearentzat pasahitza. Birritan idatzi "
 "beharko duzu."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Pasahitza:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Instalazioa abiarazten"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Ez dago diskorik aukeratuta"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "_Amaitu konfigurazioa"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Hautatu"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Abiaratu VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Instalazioaren aurrerapena"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "%s NFS zerbitzaria"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Konektatzen..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD irakurlea"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO fitxategia:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Sarearen izena"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Errorea paketea instalatzean"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "%s NFS zerbitzaria"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot dagoen gailua"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Software garapena"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Aukeratu zure ingurunea"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Ezarri root-en pasahitza"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Abisua"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1149,588 +2077,414 @@ msgstr "Abian"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Gailu berria"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Pasahitza (baieztatu):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Pasahitza ezarri da."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Irt_en instalatzailetik"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Laguntza"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "Irt_en"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Ez"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Bai"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALIZAZIOA"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALIZAZIOA"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWAREA"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SISTEMA"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Amaituta!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Amaituta!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "Irt_en"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "zutabea"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Partizio estandarra"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Diskoa"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s ezin da zifratu"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Ez dago diskorik aukeratuta"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Ez da diskarik aukeratu."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Software garapena"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATA ETA ORDUA"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "INSTALAZIOKO AUKERAK"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TEKLATUA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "HIZKUNTZA"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Egoera ezezaguna"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1757,284 +2511,310 @@ msgstr "Deskonektatzen"
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "konektatu gabea"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "konektatu gabea"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Ipv4 helbidea"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 helbidea"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP helbidea"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Pasahitza:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "SARE KONFIGURAZIOA"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Pasahitza ezarri da."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root erabiltzailearen pasahitza ezarri gabe"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SOFTWARE AUKERAKETA"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Utzi"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "Irt_en"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Software garapena"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALAZIO ITURRIA"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Errorea biltegia konfiguratzean"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Errorea biltegia konfiguratzean"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Gailua:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "%s NFS zerbitzaria"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Ostalari-izena"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2042,14 +2822,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2058,129 +2838,151 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "INSTALAZIOKO AUKERAK"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "Irt_en"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Ados"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "SARE KONFIGURAZIOA"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "ONGI ETORRI %s %s"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2191,68 +2993,168 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Ez instalatu abioko kargatzailea"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
+msgstr "Aukeratutako gailua"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "zutabea"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "Irt_en"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2260,975 +3162,1429 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Ezabatu"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
-msgstr ""
+msgstr "Ezabatu"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Gailu berria"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Hautatzaile berria"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Eginda"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Jarraitu"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
-msgid "_Save Changes"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Save Changes"
+msgstr "Gorde pasaesaldia"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "SARE KONFIGURAZIOA"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Talde izena"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Ados"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATA ETA ORDUA"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web zerbitzaria"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Lanean"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Erabili"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfiguratu..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATA ETA ORDUA"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Herrialde"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Herrialde"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Hiria"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Hiria"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Sarearen izena"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Sarearen izena"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-hour"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Edukiera"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Konektatu gabe"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
-msgid "_Other SAN Devices"
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
+msgid "_Other SAN Devices"
+msgstr "Aukeratutako gailua"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etiketa:</b>"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Ez"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN mota"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Aukeratutako gailua"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "laburpena"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID gailua"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Abiadura"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardware helbidea"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfiguratu..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Segurtasuna"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Sarearen izena"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Sarearen izena"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Segurtasun gakoa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfiguratu..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Hornitzailea"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfiguratu..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN mota"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Atebidea"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Talde izena"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Talde pasahitza"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Erabiltzaile-izena"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfiguratu..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metodoa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Amaitu konfigurazioa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "_Amaitu konfigurazioa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Desblokeatu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "_Amaitu konfigurazioa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Ostalari-izena:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "SARE KONFIGURAZIOA"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Abiadura"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardware helbidea"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfiguratu..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Segurtasuna"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Sarearen izena"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Sarearen izena"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Segurtasun gakoa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfiguratu..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Hornitzailea"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN mota"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Atebidea"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Talde izena"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Talde pasahitza"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Erabiltzaile-izena"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metodoa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Desblokeatu"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Ostalari-izena:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "Ekintza"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Konektatua"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SOFTWARE AUKERAKETA"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Aukeratu zure ingurunea"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "zutabea"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "INSTALAZIOKO AUKERAK"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-#, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Fitxategi-sistema:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI sistema-partizioa"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "INSTALAZIOKO AUKERAK"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "Irt_en instalatzailetik"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "_Amaitu konfigurazioa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI sistema-partizioa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Zifratu"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI sistema-partizioa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Amaitu konfigurazioa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Zifratu"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "_Aukerak"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "laburpena"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Izena"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "TEKLATU-DISEINUA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "izena"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr "Gehitu diseinua"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr "Kendu diseinua"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr "Kendu diseinua"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Aukerak"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Izena"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Gehitu diseinua"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Ados"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "deskribapena"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "_Aukerak"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "HIZKUNTZA"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "_Hautatu"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Pasahitza:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Berretsi:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC pasahitza"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Ezarri root-en pasahitza"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Eginda"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Gehitu"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Ados"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Gaitu HTTP Proxya"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxyaren URLa</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Adibidea:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
-msgstr ""
+msgstr "Ekintza"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Erabiltzaile izena</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Erabiltzaile-izena"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Pasahitza</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Pasahitza:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALAZIO ITURRIA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Gailua:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etiketa:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Egiaztatu"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO fitxategia:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Gailua:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Aukeratu ISO bat"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "S_arean:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Gehitu"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Kendu"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Ezarri root-en pasahitza"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Izena:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxyaren URLa</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Erabiltzaile-izena"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Pasahitza:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Atera nazazu hemendik!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3236,663 +4592,1073 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "ONGI ETORRI %s %s"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Ze hizkuntza erabili nahi duzu instalazio prozesuan?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "Irt_en"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Jarraitu"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Erabiltzaile-izena"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Talde izena"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Pasahitza:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC pasahitza"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Muntai puntua:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Gehitu"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Ezabatu"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Gorde"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "KONFIGURAZIOA"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "_Kendu"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Libre"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
-#, fuzzy
-msgid "RAID Level:"
-msgstr "RAID gailua"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Zifratu"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Aukeratutako gailua"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Muntai puntua:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Edukiera"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etiketa:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Fitxategi-sistema:</b>"
+msgid "Device(s):"
+msgstr "Gailua:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Fitxategi-sistema:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Zifratu"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Aldatu..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Izena:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Fitxategi-sistema:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Zifratu"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Fitxategi sistema"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "zutabea"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Aldatu..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID gailua"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Pasaesaldia:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Desblokeatu"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfiguratu..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Laguntza"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Hautatu"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Ados"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP helbidea"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
-msgstr ""
+msgstr "Ekintza"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Adibidea:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Erabiltzaile-izena"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC pasahitza"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Erabiltzaile-izena"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC pasahitza"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Erabiltzaile-izena"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC pasahitza"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Sarearen izena"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Erabiltzaile-izena"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC pasahitza"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Erabiltzaile-izena"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC pasahitza"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Erabiltzaile-izena"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC pasahitza"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Konexioak huts egin du"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Ados"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Gailua:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "AUKERATUTAKO DISKAK"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Itxi"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Deskribapena"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Libre"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Ezabatu"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Hautatu"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "<b>Muntai puntua:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Edukiera"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Muntai puntua:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Gorde"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "KONFIGURAZIOA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Izena:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID gailua"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Zifratu"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Ados"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Gorde pasaesaldia"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Pasaesaldia:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Berretsi:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "AUKERATUTAKO DISKAK"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Ados"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Fitxategi sistema"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Ekintza"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Ezabatu"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI sistema-partizioa"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Gailua:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "<b>Muntai puntua:</b>"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Irt_en instalatzailetik"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Ez"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Bai"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "Irt_en"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "Irt_en"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Instalazio ondorena"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURAZIOA"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Instalatzeko prestatzen"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Amaitu konfigurazioa"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Berrabiarazi"
 
@@ -3908,40 +5674,41 @@ msgstr "Instalatu"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalatu live CDa zure disko gogorrean"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Disko gogorrera instalazioa abiarazten"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Ongi etorri Fedora-ra"
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "RAM nahikorik ez"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3950,60 +5717,91 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Testu modua hasieratzen."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Errorea"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Instalazio grafikoa ez dago eskuragarri. Testu modua hasieratzen."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Frogatu Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Itxi"
 
+#~ msgid "column"
+#~ msgstr "zutabea"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Fitxategi-sistema:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxyaren URLa</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Erabiltzaile izena</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Pasahitza</b>"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etiketa:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Fitxategi-sistema:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID gailua"
+
 #~ msgid "Completed"
 #~ msgstr "Osatuta"
 
@@ -4135,22 +5933,12 @@ msgstr "Itxi"
 #~ msgid "Graphical Desktop"
 #~ msgstr "Mahaigain grafikoa"
 
-#~ msgid "Web Server"
-#~ msgstr "Web zerbitzaria"
-
 #~ msgid "Minimal"
 #~ msgstr "Gutxienezkoa"
 
 #~ msgid "Upgrading"
 #~ msgstr "Eguneratzen"
 
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Zure erro partizioak 250 megabyte baino gutxiago ditu eta normalean %s "
-#~ "instalatzeko txikiegia da."
-
 #~ msgid "Unknown Linux"
 #~ msgstr "Linux ezezaguna"
 
@@ -4196,24 +5984,12 @@ msgstr "Itxi"
 #~ msgid "_Remove Packages"
 #~ msgstr "_Kendu paketeak"
 
-#~ msgid "Region:"
-#~ msgstr "Herrialde"
-
-#~ msgid "City:"
-#~ msgstr "Hiria"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-hour"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Aukeratu zure gehigarriak"
 
diff --git a/anaconda/po/fa.po b/anaconda/po/fa.po
index b07c9b1..001da4a 100644
--- a/anaconda/po/fa.po
+++ b/anaconda/po/fa.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/fedora/language/"
@@ -29,211 +29,445 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "آغاز VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "استفاده از حالت متنی"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "تأیید"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "اجرای اسکریپ های پیش-نصب"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "آغاز روند نصب"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "در حال انجام پیکربندی پس از نصب"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -245,86 +479,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "اجرای اسکریپ های پیش-نصب"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "نام‌میزبان باید ۲۵۵ نویسه یا کوتاه‌تر باشد."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"نام‌میزبان باید با نویسه‌ایی معتبر در محدودهٔ 'a-z' یا 'A-Z'  یا '0-9' آغاز شود"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -333,7 +858,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "نصب %(productName)s %(productVersion)s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "%s را برای از مانت بیرون کردن سیستم وقتی شما تمام کردید اجرا کنید."
@@ -347,8 +877,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "قادر به یافتن  /bin/sh برای اجرا نیست. شل (پوسته) اجرا نمی شود"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "نجات"
 
@@ -386,23 +916,17 @@ msgstr "نجات سیستم"
 msgid "Which device holds the root partition of your installation?"
 msgstr "کدام وسیله پارتیشن ریشه نصب شما را خواهد داشت؟"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "تأیید"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "خروج"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "سیستم به طور اتوماتیک مجدداً راه اندازی می شود هنگامی که شما از محیط شل خارج "
 "شوید "
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -412,7 +936,7 @@ msgstr ""
 "را بزنید تا شلی دریافت کنید که بتوانید fsck را انجام دهید و پارتیشن‌هایتان را "
 "سوار کنید.%s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -433,7 +957,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -442,28 +966,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "شما هیچ پارتیشن لینوکسی ندارید. در حال بارگذاری مجدد.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "هنگامی شما از شل خارج شوید سیستم به‌صورت خودکار دوباره راه‌اندازی می‌شود."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "حالت نجات"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "شما هیچ پارتیشن لینوکسی ندارید. اینتر را برای گرفتن یک شل فشار دهید.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "سیستم شما در شاخهٔ %s سوار شد."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"افراز ریشهٔ شما کوچکتر از ۲۵۰ مگابایت است که معمولاً کوچکتر از آن است که بتوان "
+"%s را روی آن نصب کرد."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "شما افراز ریشه (/) را که برای ادامهٔ نصب %s ضروری است تعیین نکرده‌اید."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"افراز%(mount)s شما کوچکتر از %(size)s مگابایت است که کمتر از مقدار توصیه شده "
+"برای نصب معمولی %(productName)sاست."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "شما پارتیشن قابل بووت شدن نساخته اید."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"شما افراز حافظهٔ مبادله‌ای مشخص نکرده‌اید. هرچند وجود چنین افرازی در همهٔ موارد "
+"اجباری نیست ولی وجود آن به نحو محسوسی کارآیی بیشتر نصب‌ها را بهبود خواهد "
+"بخشید."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"این نقطه سوار کردن معتبر نیست. این شاخه ی %s باید در /  فایل سیستم باشد."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "نقطهٔ سوار کردن %s باید فایل سیستمی لینوکس باشد."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -572,84 +1275,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "فدورا"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "لینوکس اینترپرایز ردهت"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "آماده سازی اجرا از منبع نصب"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "خطا در نصب بسته‌"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "شما به فضا بیشتر برای فایل  سیستم های زیر نیاز دارید:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "آماده سازی اجرا از منبع نصب"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "خطا در نصب بسته‌"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "پس-نصب"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "آماده ی نصب"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "پس-نصب"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "در حالت سطر فرمان نمی‌شود سؤال پرسید!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "خطا"
 
@@ -673,31 +1523,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -712,452 +1564,523 @@ msgstr ""
 "به رایانهٔ دیگری متصل کنید و نصب گرافیکی انجام دهید، یا این که نصب را در حالت "
 "متنی ادامه می‌دهید؟"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "طول گذرواژه باید حداقل شش نویسه باشد."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "طول گذرواژه باید حداقل شش نویسه باشد."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "گم شدن نوعی از تنظیم فایل‌سیستم"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "آغاز نصب"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "در حال انجام پیکربندی پس از نصب"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "آغاز VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "روند نصب"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "آماده سازی اجرا از منبع نصب"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "خطا در نصب بسته‌"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "دستگاه شامل /boot می‌شود"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "توسعهٔ نرم‌افزار"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "اخطار"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1173,579 +2096,402 @@ msgstr "در حال پیشرفت"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "نصب %(productName)s %(productVersion)s"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "توسعهٔ نرم‌افزار"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1772,279 +2518,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "آدرس IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "آدرس IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_لغو"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "توسعهٔ نرم‌افزار"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "خطا در تنظیم مخزن"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "خطا در تنظیم مخزن"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2052,14 +2822,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2068,127 +2838,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "در حال قالب‌بندی"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "تأیید"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2198,1019 +2989,1537 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "نقطهٔ سوار کردن %s باید فایل سیستمی لینوکس باشد."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "ساختن %(type)s روی %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "...ادامه"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_لغو"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "تأیید"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "کارگذار وب"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "تایید"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "هیچ شبکه‌ای موجود نیست"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "استفاده از حالت متنی"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ظرفیت"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "دستگاه RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "ا_ضافه کردن"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "تایید"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "هیچ شبکه‌ای موجود نیست"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "تایید"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "تایید"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "تایید"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "نام کاربر"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "وصل شد!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "پارتیشن سیستم EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "خروج نصاب"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "پارتیشن سیستم EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "رمزنگاری شده"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "پارتیشن سیستم EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "ا_ضافه کردن"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "تأیید"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "تایید"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "ا_ضافه کردن"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "تأیید"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "دستگاه RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "ا_ضافه کردن"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "خطا عملگری"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "خطا عملگری"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3218,649 +4527,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "در طی روند نصب می‌خواهید از چه زبانی استفاده کنید؟"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "...ادامه"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "تایید"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "آزاد"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "دستگاه RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "ا_ضافه کردن"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "رمزنگاری شده"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "ظرفیت"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "دستگاه RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "دستگاه RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "رمزنگاری شده"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "دستگاه RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "تایید"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_لغو"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "تأیید"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "آدرس IPv4"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "باید نام یک آغازگر iSCSI را وارد کنید."
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "نام کاربر"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "تأیید"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "دستگاه RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "آزاد"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "ظرفیت"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "نام کاربر"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "دستگاه RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "رمزنگاری شده"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "تأیید"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "در حال قالب‌بندی"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "تایید"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "تأیید"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "پارتیشن سیستم EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "پس-نصب"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "آماده ی نصب"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "در حال انجام پیکربندی پس از نصب"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "_راه‌اندازی مجدد"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3874,16 +5574,16 @@ msgstr "نصب"
 msgid "Install the live CD to your hard disk"
 msgstr "نصب سی‌دی زنده بر روی هارد دیسک"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "آغاز نصب بر روی هارد دیسک"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3892,26 +5592,27 @@ msgstr ""
 "%s نیازمند %s MB حافظه برای نصب می‌باشد، ولی شما روی این ماشین تنها %s MB "
 "دارید.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "نصب‌کننده گرافیکی %s نیازمند %s MB از حافظه است، ولی شما تنها %s MB حافظه "
 "دارید."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "فضای کافی بر روی رم وجود ندارد"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3925,24 +5626,24 @@ msgstr ""
 "\n"
 "از راه یک پایانه ریشه امتحان کنید."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "شروع حالت متنی "
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "خطا"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "متغیر نمایشگر تنظیم نشده است. آغاز مدل متنی"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "نصب گرافیکی ممکن نیست..حالت متنی آغاز می‌شود."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3953,36 +5654,57 @@ msgstr ""
 "الگوی پارتیشن‌بندی خودتان یا گزینش بسته‌ها را نمی‌دهد. مایل هستید به‌جای آن حالت "
 "VNC را به کار ببرید؟"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "نام‌میزبان باید با نویسه‌ایی معتبر در محدودهٔ 'a-z' یا 'A-Z'  یا '0-9' آغاز "
+#~ "شود"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "شما به فضا بیشتر برای فایل  سیستم های زیر نیاز دارید:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "در حالت سطر فرمان نمی‌شود سؤال پرسید!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "دستگاه RAID"
+
 #~ msgid "Completed"
 #~ msgstr "تمام شد"
 
@@ -4015,9 +5737,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "خروج نصاب"
 
-#~ msgid "_Exit installer"
-#~ msgstr "خروج نصاب"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4075,9 +5794,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "مخزن  %r نام را در تنظیمات گم کرده است، در حال استفاده از شناسه"
 
-#~ msgid "No Network Available"
-#~ msgstr "هیچ شبکه‌ای موجود نیست"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4085,9 +5801,6 @@ msgstr ""
 #~ "برخی مخازن نرم افزار نیاز به دسترسی شبکه دارند اما خطای در فعال سازی شبکه "
 #~ "بر روی سیستم شما وجود دارد."
 
-#~ msgid "Re_boot"
-#~ msgstr "_راه‌اندازی مجدد"
-
 #~ msgid "_Eject"
 #~ msgstr "خروج دیسک"
 
@@ -4234,9 +5947,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "رومیزی گرافیکی"
 
-#~ msgid "Web Server"
-#~ msgstr "کارگذار وب"
-
 #~ msgid "Minimal"
 #~ msgstr "خرد (محدود)"
 
@@ -4274,26 +5984,6 @@ msgstr ""
 #~ "توانند حذف شوند::\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "شما افراز ریشه (/) را که برای ادامهٔ نصب %s ضروری است تعیین نکرده‌اید."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "افراز ریشهٔ شما کوچکتر از ۲۵۰ مگابایت است که معمولاً کوچکتر از آن است که "
-#~ "بتوان %s را روی آن نصب کرد."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "افراز%(mount)s شما کوچکتر از %(size)s مگابایت است که کمتر از مقدار توصیه "
-#~ "شده برای نصب معمولی %(productName)sاست."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "نصب بر روی وسیله یو‌اس‌بی. این شاید سیستم کاری تولید نکند."
@@ -4305,31 +5995,6 @@ msgstr ""
 #~ "در حال نصب وسیله دیواره ی آتش. این شاید و شاید نه باعث بوجود آمد سیستم "
 #~ "کاری شود."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "شما پارتیشن قابل بووت شدن نساخته اید."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "شما افراز حافظهٔ مبادله‌ای مشخص نکرده‌اید. هرچند وجود چنین افرازی در همهٔ "
-#~ "موارد اجباری نیست ولی وجود آن به نحو محسوسی کارآیی بیشتر نصب‌ها را بهبود "
-#~ "خواهد بخشید."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "این نقطه سوار کردن معتبر نیست. این شاخه ی %s باید در /  فایل سیستم باشد."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "نقطهٔ سوار کردن %s باید فایل سیستمی لینوکس باشد."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "در حال قالب‌بندی"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "درحال آماده سازی %d وسیله DASD برای استفاده در لینوکس..."
diff --git a/anaconda/po/fi.po b/anaconda/po/fi.po
index c142bec..3ea4f3f 100644
--- a/anaconda/po/fi.po
+++ b/anaconda/po/fi.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/fedora/language/"
@@ -27,11 +27,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot-tiedostojärjestelmä"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -40,7 +40,7 @@ msgstr ""
 "%sn sisältävien RAID-tiedostojärjestelmien on oltava jollakin seuraavista "
 "RAID-tasoista: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -49,7 +49,7 @@ msgstr ""
 "%sn sisältävillä RAID-tiedostojärjestelmillä on oltava jokin seuraavista "
 "metadata-versioista: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -58,107 +58,128 @@ msgstr ""
 "%sn sisältävien RAID-tiedostojärjestelmien on oltava jollakin seuraavista "
 "laitetyypeistä: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "Laitteella %s on oltava jokin seuraavista levynimiötyypeistä: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s ei voi olla tyyppiä %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 "Laite %s on oltava liitettynä johonkin seuraavista liitospisteistä: %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%sn koon on oltava väliltä %d-%d Mt."
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%sn koon on oltava ainakin %d Mt."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%sn koko voi olla enintään %d Mt."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%sn on oltava levyn ensimmäisen %d Mt:n sisällä."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s on oltava primääriosiolla."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ei voi olla salatulla lohkolaitteella."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ei voi olla tyyppiä %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Käynnistä VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Käytä tekstitilaa"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Salasana on asetettu."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Salasanat eivät täsmää!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Olet antanut heikon salasanan: %s. Napsauta Valmis uudelleen sen "
 "käyttämiseksi silti."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -166,87 +187,337 @@ msgstr ""
 "käyttämiseksi silti."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Kyllä"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Ei"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Seuraava virhe tapahtui asetettaessa asennuslähdettä:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Asennusta ei voida jatkaa."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Seuraava virhe tapahtui asetettaessa asennuslähdettä:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Asennusta ei voida jatkaa."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Seuraavissa asennettaviksi merkityissä ohjelmissa on virheitä. Tämä johtuu "
+"todennäköisesti asennuslähteen virheestä.\n"
+"Voit kokeilla poistaa nämä paketit asennuksesta, vaihtaa asennuslähdettä tai "
+"lopettaa asennusohjelman."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Asennus keskeytyi ongelmaan, joka näyttää johtuvan laitteistosta. "
+"Virheviesti on:\n"
+"\n"
+"%s.\n"
+"\n"
+" Asennusohjelma lopetetaan."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Asennus keskeytyi ongelmaan, joka näyttää johtuvan laitteistosta. "
+"Virheviesti on:\n"
+"\n"
+"%s.\n"
+"\n"
+" Asennusohjelma lopetetaan."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Tapahtui laitteistovirhe"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Asennus keskeytyi ongelmaan, joka näyttää johtuvan laitteistosta. "
+"Virheviesti on:\n"
+"\n"
+"%s.\n"
+"\n"
+" Asennusohjelma lopetetaan."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Tehdään asennetun järjestelmän asetuksia"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Tehdään käyttäjiä"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Tehdään asennetun järjestelmän asetuksia"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Suoritetaan asennusta edeltäviä komentoja"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Tehdään asennuslähteen asetuksia…"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Asennetaan käynnistyslatainta"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Tehdään asennuksen jälkeisiä asetuksia"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Asennetaan käynnistyslatainta"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Vara-avainjärjestelmän sertifikaatti %s vaatii verkkoyhteyden"
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -259,87 +530,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s puuttuu. Palomuurin asetuksia ei voi tehdä."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s puuttuu. Palomuurin asetuksia ei voi tehdä."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Tämä tiedostojärjestelmä ei tue nimiöitä."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Määritetty nimi %s on jo käytössä."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Määritetty nimi %s on jo käytössä."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Suoritetaan asennusta edeltäviä komentoja"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Konenimi saa olla korkeintaan 255 merkkiä pitkä."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Konenimen ensimmäisen merkin on oltava kirjain väliltä \"a-z\", \"A-Z\" tai "
-"\"0-9\""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Katkaistaan yhteys..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Kiinteä yhteys (%s) kytketty"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Langaton yhteys verkkoon %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Ei yhteyttä"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Verkkolaitteita ei löytynyt"
 
@@ -348,7 +909,12 @@ msgstr "Verkkolaitteita ei löytynyt"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s ASENNUS"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Uusi %s %s -asennus"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Kun olet valmis, irrota järjestelmä suorittamalla komento %s."
@@ -363,8 +929,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "Ohjelmaa /bin/sh ei löydy suoritettavaksi! Komentotulkkia ei käynnistetä"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Pelastus"
 
@@ -410,22 +976,16 @@ msgstr "Pelastettava järjestelmä"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Millä laitteella on asennuksen juuriosio?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Poistu"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "Järjestelmä käynnistyy uudelleen automaattisesti, kun suljet komentotulkin."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -435,7 +995,7 @@ msgstr ""
 "liitettäväksi. Paina enteriä, niin komentotulkki käynnistyy ja voit "
 "tarkistaa sekä liittää tiedostojärjestelmät. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -456,7 +1016,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -469,31 +1029,239 @@ msgstr ""
 "\n"
 "Paina <enter> päästäksesi komentoriville."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Järjestelmässä ei ole yhtään Linux-osiota. Käynnistetään uudelleen.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " Järjestelmä käynnistyy uudelleen automaattisesti, kun suljet komentotulkin."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Pelastustila"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Järjestelmässä ei ole yhtään Linux-osiota. Paina Enter päästäksesi "
 "komentotulkkiin.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Järjestelmäsi on liitetty %s-hakemistoon."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Tavallinen osio"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr "Tietokone käyttää \"swap\"-aluetta kun muisti on vähissä."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"\"boot\"-alueelle tallennetaan järjestelmän käynnistyksessä\n"
+"tarvittavat tiedostot."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"\"root\"-alueelle tallennetaan järjestelmän perustiedostot\n"
+"ja ohjelmat."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr "Kaikki omat tiedostosi tallennetaan \"home\"-alueelle."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS-käynnistysosio tarvitaan BIOS-laitteistoa\n"
+"GPT-osioiduilta levyiltä käynnistettäessä"
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr "PReP-käynnistysosio tarvitaan joillakin PPC-alustoilla."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Juuriosiosi koko on alle 250 megatavua, mikä on yleensä liian vähän %sn "
+"asennusta varten."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Et ole valinnut juuriosiota (/), joka tarvitaan, jotta %sn asennusta voidaan "
+"jatkaa."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Tämä ympäristö tarvitsee erillisellä osiolla tai loogisella taltiolla "
+"olevan /boot-hakemiston. Jos et halua /boot-taltiota, laita /-liitospiste "
+"erilliselle osiolle (ei LVM:lle)."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s-osion koko on alle %(size)s megatavua, joka on vähemmän kuin "
+"normaalille %(productName)s -asennukselle suositellaan."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Osio %(mount)s on liian pieni muodolle %(format)s (sallittu koko on väliltä "
+"%(minSize)d Mt - %(maxSize)d Mt)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Osio %(mount)s on liian suuri muodolle %(format)s (sallittu koko on väliltä "
+"%(minSize)d Mt - %(maxSize)d Mt)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+"Uuden laitteen lisääminen epäonnistui. Katso lisätiedot napsauttamalla tästä."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Käynnistysosiota ei ole luotu."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"BIOSia käyttävä järjestelmä vaatii erityisosion jotta se voi käynnistää %sn "
+"uudelta levynimiömuodolta (GPT). Luo 1 Mt:n \"Bios Boot\" -osio asennuksen "
+"jatkamiseksi."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Sivutusosiota ei ole määritetty. Asennus ilman sivutusosiota vaatii "
+"%(requiredMem)s Mt, mutta käytettävissä on vain %(installedMem)s Mt."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Et ole valinnut sivutusosiota. Vaikka se ei kaikissa tapauksissa ole "
+"ehdottoman välttämätön, se parantaa useimmissa asennuksissa suorituskykyä "
+"huomattavasti."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Ainakin yhdellä swap-laitteella ei ole UUID:tä, mikä on tyypillistä "
+"vanhemmilla mkswapin versioilla tehdyille swap-laitteille. Näihin "
+"laitteisiin viitataan /etc/fstab-tiedostossa laitepolulla, joka ei ole paras "
+"tapa, koska laitepolut voivat muuttua eri syistä."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Liitospiste on virheellinen. Hakemiston %s pitää sijaita /-"
+"tiedostojärjestelmässä."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Liitospisteen %s pitää sijaita Linux-tiedostojärjestelmässä."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Salasana on asetettu."
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -604,88 +1372,240 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Annettu VNC-salasana oli lyhyempi kuin kuusi merkkiä.\n"
 "Anna uusi salasana. Jätä kenttä tyhjäksi jos et halua käyttää ollenkaan "
 "salasanaa."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Asennuslähteen asetus epäonnistui"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Virhe ladattaessa pakettien metadataa..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Yhtään asennuslähdettä ei ole saatavilla"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Asennetaan ohjelmistoja"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Aloitetaan asennus"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Tarvitaan lisää tilaa seuraavilla tiedostojärjestelmillä:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Valmistellaan transaktiota asennuslähteestä"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Asennetaan"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Ladataan pakettien metadataa..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Asennetaan"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Valmistellaan asennusta"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Tarkistetaan tallennustilan asetuksia..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "Oletusotsikko"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "Lokalisointi"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "Lokalisointi"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "Ohjelmisto"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "JÄRJESTELMÄ"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "KÄYTTÄJÄASETUKSET"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Asennuskeskus"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Aloitetaan automaattinen asennus"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Ei kysymyksiä komentorivitilassa!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  Tee valinta [\"l\" lopettaa | \"c\" jatkaa]:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Tee kaikki vaiheet valmiiksi ennen jatkamista"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "j"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Keskuksen oletusotsikko"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "j"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Tee kaikki vaiheet valmiiksi ennen jatkamista"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Virhe"
 
@@ -709,32 +1629,35 @@ msgstr "kyllä"
 msgid "no"
 msgstr "ei"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Haluatko lopettaa?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "l"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  Tee valinta [\"l\" lopettaa | \"c\" jatkaa]:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -749,219 +1672,258 @@ msgstr ""
 "käyttäen tälle koneelle voidaan ottaa yhteys toiselta koneelta graafista "
 "asennusta varten, vai jatketaanko asennusta tekstitilassa?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "l"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC-salasana"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Anna VNC-salasana. Se on kirjoitettava kahdesti.\n"
 "Jätä kenttä tyhjäksi jos et halua käyttää ollenkaan salasanaa."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Salasana: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Salasana (vahvistus): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Salasanat eivät täsmää!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Salasanan on oltava vähintään kuusi merkkiä pitkä."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Salasanan on oltava vähintään kuusi merkkiä pitkä."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Aikavyöhykeasetukset"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Aikavyöhykettä ei ole asetettu."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Käytettävissä olevat alueet"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Käytettävissä olevat alueet"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Tarkistetaan tallennustilan asetuksia..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Kiinteä yhteys (%s) kytketty"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Kiinteä yhteys (%s) kytketty"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Konenimi"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Konenimi"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Konenimi"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Viimeistele asetukset"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Yhdyskäytävä"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "tiedostojärjestelmäasetuksista puuttuu tyyppi"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Tehdään asennetun järjestelmän asetuksia"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Pääkäyttäjän salasana:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Salasana on asetettu."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Pääkäyttäjän tunnus on kytketty pois käytöstä."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Salasanaa ei ole asetettu."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Valitse uusi pääkäyttäjän salasana. Salasana on annettava kahdesti."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Salasana: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Käytä kaikki tila"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Korvaa olemassa olevat Linux-järjestelmät"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Käytä vapaata tilaa"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Asennuksen kohde"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Yhtään levyä ei ole valittu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Virhe tarkistettaessa tallennustilan asetuksia"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Virhe tarkistettaessa tallennustilan asetuksia"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automaattinen osiointi valittu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Mukautettu osiointi valittu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -969,40 +1931,61 @@ msgstr ""
 "Levyjä ei löytynyt. Sammuta tietokone, liitä ainakin yksi levy ja käynnistä "
 "kone uudelleen asennuksen jatkamiseksi."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Yhtään levyä ei ole valittuna. Valitse ainakin yksi levy, jolle asennus "
 "tehdään."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Tutkitaan tallennustilaa..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Luodaan päivitetyt tallennustilan asetukset"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Tarkistetaan tallennustilan asetuksia..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Automaattisen osioinnin valinnat"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1011,41 +1994,41 @@ msgstr ""
 "Asennus vaatii kiintolevyn osiointia. Valitse mitä tilaa käytetään "
 "asennuksessa."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Automaattisen osioinnin valinnat"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Massamuistin kokoonpanon tallentaminen epäonnistui..."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Aikavyöhykeasetukset"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s-aikavyöhyke"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Aikavyöhykettä ei ole asetettu."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Alueen %s aikavyöhykkeet"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Käytettävissä olevat alueet"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1054,178 +2037,196 @@ msgstr ""
 "Käytä numeroita tai kirjoita nimet suoraan [b:llä alueluetteloon, l "
 "lopettaa]:"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Käynnistä VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Asennuksen edistyminen"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Lähin peilipalvelin"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-palvelin %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Virhe asetettaessa ohjelmistolähdettä"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Mitään ei ole valittu"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Yhdistetään..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD-asema"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-tiedosto:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Verkkoaika"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Yhtään asennuslähdettä ei ole saatavilla"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Asennuslähteen asetus epäonnistui"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Virhe ladattaessa pakettien metadataa..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Yhtään asennuslähdettä ei ole saatavilla"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-palvelin %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS-liitosvalinnat:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Asennuslähteen asetus epäonnistui, tarkista osoite"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot-osion sisältävältä laitteelta"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Asennuslähteen asetus epäonnistui"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Muokkaa ohjelmistovalintaa"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Virhe tarkistettaessa ohjelmistovalikoimaa"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Ohjelmistolähdettä ei ole asetettu"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Mukautettuja ohjelmia on valittu"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Ohjelmistolähdettä ei ole asetettu"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Valitse ympäristösi"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Käytä tunnistautumista"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Salasana on annettava ja vahvistettava."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Varoitus"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1241,36 +2242,36 @@ msgstr "Kesken"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tAsennus on valmis. Paina Enter lopettaaksesi"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Vaiheen oletusotsikko"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "tarkistetaan tilaa..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Uusi laite"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Salasana (vahvistus): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1279,7 +2280,7 @@ msgstr ""
 "Olet antanut heikon salasanan: %s. Napsauta Valmis uudelleen sen "
 "käyttämiseksi silti."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1288,63 +2289,46 @@ msgstr ""
 "Olet antanut heikon salasanan: %s. Napsauta Valmis uudelleen sen "
 "käyttämiseksi silti."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Salasana on asetettu."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Lopeta asennusohjelma"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Ei"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "Oletusotsikko"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "Lokalisointi"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "Lokalisointi"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "Ohjelmisto"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "JÄRJESTELMÄ"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "KÄYTTÄJÄASETUKSET"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1352,7 +2336,11 @@ msgstr ""
 "Viimeistele kaikki tällä kuvakkeella merkityt kohdat ennen seuraavaan "
 "vaiheeseen siirtymistä."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Valmis!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1361,166 +2349,68 @@ msgstr ""
 "%s on nyt asennettu koneellesi ja valmiina käyttöön!\n"
 "Käynnistä uudelleen ja voit alkaa käyttämään sitä!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Valmis!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Lopeta"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Uusi %s %s -asennus"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s on nyt asennettu järjestelmääsi, mutta joitain asetuksia täytyy vielä "
+"tehdä. \n"
+"Viimeistele ne ja paina sitten \"Viimeistele asetukset\" -painiketta."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s on nyt asennettu koneellesi ja valmiina käyttöön!\n"
+"Käynnistä uudelleen ja voit alkaa käyttämään sitä!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Luo uusi taltioryhmä..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
 msgstr ""
+"Laitteen uudelleenasetus epäonnistui. Katso lisätiedot napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "sarake"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Massamuistiasetukset tyhjennettiin virheen vuoksi. Katso lisätiedot "
 "napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr ""
-"Laitteen uudelleenasetus epäonnistui. Katso lisätiedot napsauttamalla tästä."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Anna kelvollinen liitospiste."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Liitospiste on virheellinen, kokeile jotain muuta."
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Liitospiste on jo käytössä, kokeile jotain muuta."
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Anna kelvollinen liitospiste."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Liitospiste on virheellinen, kokeile jotain muuta."
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Tavallinen osio"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Ei mitään"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Juurilaitteelle on luotava uusi tiedostojärjestelmä."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "Manuaalinen osiointi"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d massamuistilaite valittuna"
 msgstr[1] "%d massamuistilaitetta valittuna"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1529,331 +2419,269 @@ msgstr ""
 "Kun luot liitospisteitä %s %s -asennuksellesi,\n"
 "voit tarkastella niiden lisätietoja tässä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr "Tietokone käyttää \"swap\"-aluetta kun muisti on vähissä."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"\"boot\"-alueelle tallennetaan järjestelmän käynnistyksessä\n"
-"tarvittavat tiedostot."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"\"root\"-alueelle tallennetaan järjestelmän perustiedostot\n"
-"ja ohjelmat."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr "Kaikki omat tiedostosi tallennetaan \"home\"-alueelle."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS-käynnistysosio tarvitaan BIOS-laitteistoa\n"
-"GPT-osioiduilta levyiltä käynnistettäessä"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr "PReP-käynnistysosio tarvitaan joillakin PPC-alustoilla."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "Liitospisteen /boot/efi on oltava laitteella, jonka tyyppi on %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "Tiedostojärjestelmän %s on oltava laitteella, jonka tyyppi on %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "Liitospistettä %s ei voi salata"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Juurilaitteelle on luotava uusi tiedostojärjestelmä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Laitteen koon muuttaminen epäonnistui. Katso lisätiedot napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Laitteen alustaminen epäonnistui. Katso lisätiedot napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Määritetty nimi %s on jo käytössä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Tämä tiedostojärjestelmä ei tue nimiöitä."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Yhtään levyä ei ole valittu"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Tämän tiedostojärjestelmän kokoa ei voi muuttaa."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Virhe tarkistettaessa massamuistin kokoonpanoa. Lisätietoja napsauttamalla."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Virhe tarkistettaessa massamuistin kokoonpanoa. Lisätietoja napsauttamalla."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 "Uuden laitteen lisääminen epäonnistui. Katso lisätiedot napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "Laitteen poistaminen epäonnistui. Katso lisätiedot napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "tiedostojärjestelmä vapaata"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Yhtään levyä ei ole valittu."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Valituilla levyillä ei ole riittävästi vapaata tilaa."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 "Automaattinen osiointi epäonnistui. Katso lisätiedot napsauttamalla tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Muokkaa ohjelmistovalintaa"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Salatun lohkolaitteen avaaminen epäonnistui. Katso lisätiedot napsauttamalla "
 "tästä."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "Päiväys ja aika"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "ip"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Jos haluat käyttää NTP:tä, verkkoyhteyden asetukset on tehtävä ensin"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Toimivaa NTP-palvelinta ei ole asetettu"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "ASENNUKSEN KOHDE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d massamuistilaite valittuna"
+msgstr[1] "%d massamuistilaitetta valittuna"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "Vaihda asettelua painamalla %s."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "Näppäimistö"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Näppäimistöasetteluja ei pysty vielä testaamaan."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "tarkistetaan tilaa..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Asettelujen vaihtamisen asetuksia ei ole tehty."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "KIELI"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Tuntematon tila (puuttuu)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Tuntematon tila"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Ei hallinnassa"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Ei käytettävissä"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Laiteohjelmisto puuttuu"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kaapeli on irti"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Ei käytettävissä"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
@@ -1878,201 +2706,248 @@ msgstr "Katkaistaan yhteys"
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "kytkemättä"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Langaton"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "kytkemättä"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4-osoite"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6-osoite"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mt/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Ei mitään"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Salasana: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "Verkkoasetukset"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "Pääkäyttäjän salasana"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Salasana on asetettu."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Pääkäyttäjän salasana on asetettu"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Pääkäyttäjän tunnus on kytketty pois käytöstä."
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Pääkäyttäjän salasanaa ei ole asetettu"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "Ohjelmistovalinnat"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Tarkistetaan ohjelmien riippuvuuksia..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Virhe tarkistettaessa ohjelmien riippuvuuksia"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Ladataan pakettien metadataa..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Ladataan ryhmien metadataa..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Tarkistetaan ohjelmien riippuvuuksia..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Virhe tarkistettaessa ohjelmien riippuvuuksia"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Virhe tarkistettaessa ohjelmien riippuvuuksia. Lisätietoja napsauttamalla "
 "tästä."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Seuraavissa asennettaviksi merkityissä ohjelmissa on virheitä. Tämä johtuu "
 "todennäköisesti asennuslähteen virheestä.\n"
 "Voit kokeilla poistaa nämä paketit asennuksesta, vaihtaa asennuslähdettä tai "
 "lopettaa asennusohjelman."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Peru"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Lopeta"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Muokkaa ohjelmistolähdettä"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Muokkaa ohjelmistovalintaa"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Tehdään asennuslähteen asetuksia…"
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Virhe ladattaessa pakettien metadataa..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Tunnistautuminen vaaditaan"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Tältä medialta voi asentaa."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Tältä medialta ei kannata asentaa."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "Asennuslähde"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Asennuslähteen asetus epäonnistui, tarkista osoite"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Virhe asennuslähteen asettamisessa"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Virhe asetettaessa ohjelmistolähdettä"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2080,98 +2955,80 @@ msgstr ""
 "Asennuslähteen asetus epäonnistui, tarkista osoite ja "
 "välityspalvelinasetukset"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Virhe asennuslähteen asettamisessa"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Virhe asetettaessa ohjelmistolähdettä"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Laite:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-palvelin %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Virheellinen aikavyöhyke"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Virheellinen aikavyöhyke"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Virheellinen aikavyöhyke"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Valitsemillasi levyillä on seuraava määrä vapaata tilaa:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2182,7 +3039,7 @@ msgstr ""
 "voimme auttaa sinua\n"
 "vapauttamaan tilaa kutistamalla tai poistamalla olemassa olevia osioita."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2193,7 +3050,7 @@ msgstr ""
 "käyttäisit kaiken vapaan\n"
 "tilan valituilla levyillä."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2208,44 +3065,51 @@ msgstr ""
 "ohjelmistovalikoimasi pienempään saadaksesi pienemmän version\n"
 "<b>%s:stä</b> tai lopettaa asentimen."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "ASENNUKSEN KOHDE"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Massamuistin kokoonpanon tallentaminen epäonnistui..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Alustetaan DASD-laitetta"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Virhe tarkistettaessa massamuistin kokoonpanoa. Lisätietoja napsauttamalla."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Virhe tarkistettaessa massamuistin kokoonpanoa. Lisätietoja napsauttamalla."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "tiedostojärjestelmä vapaata"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d levy valittu; %s kapasiteetti; %s vapaata"
 msgstr[1] "%d levyä valittu; %s kapasiteetti; %s vapaata"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2253,7 +3117,11 @@ msgstr ""
 "Ohitit käynnistyslataimen asentamisen. Järjestelmää ei ehkä pysty "
 "käynnistämään."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2263,11 +3131,19 @@ msgstr ""
 "muuttaa massamuistin\n"
 "asettelua tai lopettaa asennuksen."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
-msgid "_Modify Storage Layout"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Lopeta"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Modify Storage Layout"
+msgstr "_Muokkaa ohjelmistolähdettä"
+
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2278,75 +3154,79 @@ msgstr ""
 "muuttaa massamuistin\n"
 "asettelua tai lopettaa asennuksen."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "KÄYTTÄJÄASETUKSET"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Virheellinen aikavyöhyke"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "TERVETULOA %s %s:n."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Et ole vielä luonut liitospisteitä %s %s -asennuksellesi:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Tai luo uusia liitospisteitä \"+\"-kuvakkeella alapuolella."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2357,69 +3237,172 @@ msgid_plural ""
 msgstr[0] "<b>%s levy; %s vapautettavaa tilaa</b> (tiedostojärjestelmissä)"
 msgstr[1] "<b>%s levyä; %s vapautettavaa tilaa</b> (tiedostojärjestelmissä)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "Ä_lä asenna käynnistyslatainta"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
+msgstr "Valittu laite"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "sarake"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Liitospisteen %s pitää sijaita Linux-tiedostojärjestelmässä."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Liitospiste on jo käytössä, kokeile jotain muuta."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Anna kelvollinen liitospiste."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Liitospiste on virheellinen, kokeile jotain muuta."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Juurilaitteelle on luotava uusi tiedostojärjestelmä."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Virheellinen aikavyöhyke"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Säilytä"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Kutista"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Poista"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Tämä laite sisältää asennuslähteen."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Luodaan %(type)s-tyyppistä tiedostojärjestelmää laitteelle %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Ei valmis"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Käytä vapaata tilaa"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2427,557 +3410,820 @@ msgid_plural ""
 msgstr[0] "<b>%s levy; %s vapautettavaa tilaa</b> (tiedostojärjestelmissä)"
 msgstr[1] "<b>%s levyä; %s vapautettavaa tilaa</b> (tiedostojärjestelmissä)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Tilaa valittu vapautettavaksi yhteensä: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Poista"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Säilytä"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "JAKELUN ASENNUS"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "ESIJULKAISU / KOEKÄYTTÖ"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Uusi laite"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 Mt"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 Gt"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Uusi valitsin"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "V_almis"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Jatka"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "Verkkoasetukset"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Ryhmän nimi"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "Päiväys ja aika"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "ip"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "WWW-palvelin"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Toimii"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Käytä"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Määritä..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "Päiväys ja aika"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Alue:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Alue:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Kaupunki:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Kaupunki:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Verkon nimi"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Verkon nimi"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "ap/ip"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "ap/ip"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 tunnin kello"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "ap/ip"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "ASENNUKSEN KOHDE"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Koko"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Ei yhteyttä"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "TUNNISTE"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Valittu laite"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Mitään ei ole valittu"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Nimiö:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Laiteohjelmisto puuttuu"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Ei"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN-tyyppi"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Valittu laite"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "yhteenveto"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-laite"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Lisää"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Oletusreitti"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Aliverkon peite"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Nopeus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Laiteosoite"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "_Määritä..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Turvallisuus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Verkon nimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Verkon nimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Turvallisuusavain"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Määritä..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Toimittaja"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Määritä..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN-tyyppi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Yhdyskäytävä"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Ryhmän nimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Ryhmän salasana"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Määritä..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metodi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Asetuksien URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP-välityspalvelin"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS-välityspalvelin"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP-välityspalvelin"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "So_cks-isäntä"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Tarkistetaan tallennustilan asetuksia..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Avaa lukitus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "_Lentokonetila"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Tarkistetaan tallennustilan asetuksia..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Konenimi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "Verkkoasetukset"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Oletusreitti"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Aliverkon peite"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Nopeus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Laiteosoite"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "_Määritä..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Turvallisuus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Verkon nimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Verkon nimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Turvallisuusavain"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Määritä..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Toimittaja"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN-tyyppi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Yhdyskäytävä"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Ryhmän nimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Ryhmän salasana"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Käyttäjätunnus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metodi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Asetuksien URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP-välityspalvelin"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS-välityspalvelin"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP-välityspalvelin"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "So_cks-isäntä"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Avaa lukitus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "_Lentokonetila"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Konenimi"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Käytä tunnistautumista"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Tunnistautuminen vaaditaan"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Yhdistetty"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "Ohjelmistovalinnat"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Valitse ympäristösi"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "sarake"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Peruuta ja _lisää levyjä"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ASENNUSVALINNAT"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Osion tyyppi:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Mukautettu osiointi valittu"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Vapauta tilaa"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ASENNUSVALINNAT"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -2985,197 +4231,343 @@ msgstr ""
 "Tässä on selitetty, kuinka paljon tilaa tarvitaan nykyiselle "
 "ohjelmistovalinnalle."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "levy vapaata"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Vapaata tilaa, jota voi käyttää."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "tiedostojärjestelmä vapaata"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Tässä on selitetty, mitkä ovat vaihtoehtosi."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Käytä vapaata tilaa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Lopeta asennus"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Laitteen kuvaus"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Mukautettu osiointi valittu"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Salaa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automaattinen osiointi valittu"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Viimeistele asetukset"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Salaa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Automaattisen osioinnin valinnat"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "yhteenveto"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "LISÄÄ NÄPPÄIMISTÖASETTELU"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Lisää näppäimistöasettelu valitsemalla se tästä:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nimi"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "NÄPPÄIMISTÖASETTELU"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nimi"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Poista asettelu"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Siirrä valittua asettelua ylöspäin"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Poista asettelu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Siirrä valittua asettelua ylöspäin"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Siirrä valittua asettelua alaspäin"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Esikatsele asettelua"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Näppäimistöasetteluja ei pysty vielä testaamaan."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Vaihda asettelua painamalla Alt + Shift."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Lisää"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "LISÄÄ NÄPPÄIMISTÖASETTELU"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Lisää näppäimistöasettelu valitsemalla se tästä:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nimi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Käytettävissä olevat alueet"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "käytä"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "kuvaus"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS-liitosvalinnat:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "KIELI"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Mitään ei ole valittu"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "Pääkäyttäjän salasana"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Pääkäyttäjän salasana:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Vahvista:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC-salasana"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Aseta pääkäyttäjän salasana"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3183,236 +4575,283 @@ msgstr ""
 "Pääkäyttäjän root-tunnusta käytetään järjestelmän ylläpitoon. Anna salasana "
 "root-käyttäjälle."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "V_almis"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MEDIAN TARKISTUS"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Tarkistetaan mediaa, odota..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Lisää"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Ota käyttöön HTTP-välityspavelin"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Välityspalvelimen URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Esimerkki:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Käytä tunnistautumista"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Käyttäjänimi</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Käyttäjätunnus"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Salasana</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Salasana: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "Asennuslähde"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Mitä asennuslähdettä haluat käyttää?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "T_unnistettu asennusmedia:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Laite:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Nimiö:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Tarkista"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-tiedosto:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Laite:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Valitse ISO-tiedosto"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "_Verkossa:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Välitys_palvelimen asetukset..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS-liitosvalinnat:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Tämä kenttä on valinnainen."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People -pakettivarastot"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Standardi YUM-lähde:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Lisää"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Haetaan tietoja pyydetystä asennuslähteestä"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Poista asettelu"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Toimintavirhe."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Aseta pääkäyttäjän salasana"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nimi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Välityspalvelimen URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Käyttäjätunnus"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Salasana: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Liitospiste on virheellinen, kokeile jotain muuta."
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Tahdon pois täältä!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Hyväksyn kohtaloni."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Tämä on epävakaa esijulkaisuversio ohjelmistosta."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3425,508 +4864,860 @@ msgstr ""
 "tulevaisuudesta, se ei ole vakaa, siihen ei voi luottaa. Se on vain "
 "koekäyttöön."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "TERVETULOA %s %s:n."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Mitä kieltä asennuksen aikana käytetään?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Jatka"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Käyttäjätunnus"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Ryhmän nimi"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Salasana: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC-salasana"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
 msgstr "_Lisää liitospiste"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Haluttu kapasiteetti:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Lisää"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Liitospiste:</b>"
+msgid "Remove the selected mount point(s)."
+msgstr "Siirrä valittua asettelua alaspäin"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "LISÄÄ UUSI LIITOSPISTE"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr "Liitospiste on jo käytössä. Kokeillaanko jotain muuta?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "esim. ”20 GB”, ”500mb” (ilman lainausmerkkejä)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Poista"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "LIITOSPISTEEN ASETUKSET"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Poista asettelu"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Vapaana"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-laite"
+msgid "Reload storage configuration from disk."
+msgstr "Tarkistetaan tallennustilan asetuksia..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Salaa"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Valittu laite"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Laitteen kuvaus"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Liitospiste:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Haluttu kapasiteetti:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Nimiö:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Laitetyyppi:</b>"
+msgid "Device(s):"
+msgstr "Laite:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Tiedostojärjestelmä:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Salaa"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nimi"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Laitetyyppi:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Salaa"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "<b>Tiedostojärjestelmä:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "sarake"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID-laite"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
-msgstr ""
+msgstr "Salasana: "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
-msgstr ""
+msgstr "Avaa lukitus"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Siirrä valittua asettelua alaspäin"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Määritä..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "Tarkistetaan tallennustilan asetuksia..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">VAPAATA TILAA</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TILAA YHTEENSÄ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "LIITOSPISTEEN ASETUKSET"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-osoite"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI-asiakaslaitteen nimi on annettava."
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Käytä tunnistautumista"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Esimerkki:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Käyttäjätunnus"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC-salasana"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Käyttäjätunnus"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-salasana"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Käyttäjätunnus"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC-salasana"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Verkon nimi"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Käytä tunnistautumista"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Käyttäjätunnus"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-salasana"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Käyttäjätunnus"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-salasana"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Käyttäjätunnus"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC-salasana"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Yhteys epäonnistui"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Laite:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "VALITUT LEVYT"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Sulje"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Kuvaus"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Vapaana"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Poista asettelu"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Levyjen yhteenveto tulee tähän"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Poista"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Mitään ei ole valittu"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "LIITOSPISTEEN ASETUKSET"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Lisää liitospiste"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Haluttu kapasiteetti:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Liitospiste:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "LISÄÄ UUSI LIITOSPISTE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr "Liitospiste on jo käytössä. Kokeillaanko jotain muuta?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "esim. ”20 GB”, ”500mb” (ilman lainausmerkkejä)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "LIITOSPISTEEN ASETUKSET"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nimi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-laite"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Salaa"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Anna kelvollinen liitospiste."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Alustetaan DASD-laitetta"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Asennuksen aikana ilmeni tuntematon virhe. Lisätiedot alla."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Salasana: "
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Vahvista:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3935,116 +5726,171 @@ msgstr ""
 "Varoitus: Näppäimistöasettelusi on nyt <b>%s</b>. Jos muutat sitä asennuksen "
 "jälkeen, et voi välttämättä enää purkaa salausta."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "VAPAUTA LEVYTILAA"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Peru"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Vapauta tilaa"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "VAPAUTA LEVYTILAA"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Säilytä"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Poista"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Kutista"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Mukautettu osiointi valittu"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Laite:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Lisää liitospiste"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Lopeta asennusohjelma"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Ei"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Kyllä"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4052,51 +5898,50 @@ msgstr ""
 "Haluatko varmasti poistua\n"
 "asennusohjelmasta?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Lopeta"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ASENNUKSEN YHTEENVETO"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Aloita asennus"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "ASETUKSET"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Valmistellaan asennusta"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s on nyt asennettu järjestelmääsi, mutta joitain asetuksia täytyy vielä "
-"tehdä. \n"
-"Viimeistele ne ja paina sitten \"Viimeistele asetukset\" -painiketta."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Viimeistele asetukset"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s on nyt asennettu koneellesi ja valmiina käyttöön!\n"
-"Käynnistä uudelleen ja voit alkaa käyttämään sitä!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Käynnistä uudelleen"
 
@@ -4112,16 +5957,16 @@ msgstr "Asenna"
 msgid "Install the live CD to your hard disk"
 msgstr "Asenna live-CD kiintolevylle"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Aloitetaan asennus kiintolevylle"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Tervetuloa Fedoraan"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4130,26 +5975,27 @@ msgstr ""
 "%s tarvitsee %s Mt muistia asennusta varten, mutta tässä tietokoneessa on "
 "vain %s Mt muistia.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Tuotteen %s graafinen asennusohjelma tarvitsee %s Mt muistia, mutta tässä "
 "tietokoneessa on vain %s Mt muistia."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Ei riittävästi muistia"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4163,24 +6009,24 @@ msgstr ""
 "\n"
 " pääkäyttäjän päätteessä."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Käynnistetään tekstitila."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Virhe"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY-muuttujaa ei ole asetettu. Käynnistetään tekstitila."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Graafinen asennus ei ole käytettävissä. Käynnistetään tekstiasennus."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4191,20 +6037,20 @@ msgstr ""
 "määrittää osiointijärjestelyä tai pakettivalintoja. Käytetäänkö tekstitilan "
 "sijasta VNC-tilaa?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Käytä komentoa ssh install@%s asennuksen aloittamiseksi."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Käytä komentoa ssh install@<konenimi> asennuksen jatkamiseksi."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Kokeile Fedoraa"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4214,7 +6060,7 @@ msgstr ""
 "Voit asentaa Fedoran nyt tai valita \"Asenna levylle\" -valinnan toimintojen "
 "yleiskatsauksesta myöhemmin."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4222,10 +6068,83 @@ msgstr ""
 "Voit valita \"Asenna levylle\" -valinnan toimintojen yleiskatsauksesta "
 "myöhemmin."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Sulje"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Konenimen ensimmäisen merkin on oltava kirjain väliltä \"a-z\", \"A-Z\" "
+#~ "tai \"0-9\""
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Tarvitaan lisää tilaa seuraavilla tiedostojärjestelmillä:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Ei kysymyksiä komentorivitilassa!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Liitospiste on virheellinen, kokeile jotain muuta."
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "Verkkoasetukset"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Virhe ladattaessa pakettien metadataa..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Mitään ei ole valittu"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Laiteohjelmisto puuttuu"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Tunnistautuminen vaaditaan"
+
+#~ msgid "column"
+#~ msgstr "sarake"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Osion tyyppi:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Välityspalvelimen URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Käyttäjänimi</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Salasana</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Liitospiste on virheellinen, kokeile jotain muuta."
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Nimiö:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-laite"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">VAPAATA TILAA</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">TILAA YHTEENSÄ</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Valmiina"
 
@@ -4278,41 +6197,9 @@ msgstr "Sulje"
 #~ msgid "Install on System"
 #~ msgstr "Asenna järjestelmä"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Seuraava virhe tapahtui asetettaessa asennuslähdettä:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Asennusta ei voida jatkaa."
-
 #~ msgid "Exit installer"
 #~ msgstr "Lopeta asennusohjelma"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Asennus keskeytyi ongelmaan, joka näyttää johtuvan laitteistosta. "
-#~ "Virheviesti on:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Asennusohjelma lopetetaan."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Tapahtui laitteistovirhe"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Lopeta asennusohjelma"
 
@@ -4603,9 +6490,6 @@ msgstr "Sulje"
 #~ msgid "Software Development"
 #~ msgstr "Ohjelmistokehitys"
 
-#~ msgid "Web Server"
-#~ msgstr "WWW-palvelin"
-
 #~ msgid "Minimal"
 #~ msgstr "Vähimmäisasennus"
 
@@ -4651,50 +6535,6 @@ msgstr "Sulje"
 #~ "voida poistaa:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Et ole valinnut juuriosiota (/), joka tarvitaan, jotta %sn asennusta "
-#~ "voidaan jatkaa."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Juuriosiosi koko on alle 250 megatavua, mikä on yleensä liian vähän %sn "
-#~ "asennusta varten."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Tämä ympäristö tarvitsee erillisellä osiolla tai loogisella taltiolla "
-#~ "olevan /boot-hakemiston. Jos et halua /boot-taltiota, laita /-liitospiste "
-#~ "erilliselle osiolle (ei LVM:lle)."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s-osion koko on alle %(size)s megatavua, joka on vähemmän kuin "
-#~ "normaalille %(productName)s -asennukselle suositellaan."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Osio %(mount)s on liian pieni muodolle %(format)s (sallittu koko on "
-#~ "väliltä %(minSize)d Mt - %(maxSize)d Mt)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Osio %(mount)s on liian suuri muodolle %(format)s (sallittu koko on "
-#~ "väliltä %(minSize)d Mt - %(maxSize)d Mt)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "USB-laitteelle asennettu järjestelmä ei välttämättä tule toimimaan."
@@ -4708,61 +6548,6 @@ msgstr "Sulje"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "käynnistyslataimen stage1-kohdelaitetta ei ole luotu"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Käynnistysosiota ei ole luotu."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "BIOSia käyttävä järjestelmä vaatii erityisosion jotta se voi käynnistää "
-#~ "%sn uudelta levynimiömuodolta (GPT). Luo 1 Mt:n \"Bios Boot\" -osio "
-#~ "asennuksen jatkamiseksi."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Sivutusosiota ei ole määritetty. Asennus ilman sivutusosiota vaatii "
-#~ "%(requiredMem)s Mt, mutta käytettävissä on vain %(installedMem)s Mt."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Et ole valinnut sivutusosiota. Vaikka se ei kaikissa tapauksissa ole "
-#~ "ehdottoman välttämätön, se parantaa useimmissa asennuksissa suorituskykyä "
-#~ "huomattavasti."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Ainakin yhdellä swap-laitteella ei ole UUID:tä, mikä on tyypillistä "
-#~ "vanhemmilla mkswapin versioilla tehdyille swap-laitteille. Näihin "
-#~ "laitteisiin viitataan /etc/fstab-tiedostossa laitepolulla, joka ei ole "
-#~ "paras tapa, koska laitepolut voivat muuttua eri syistä."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Liitospiste on virheellinen. Hakemiston %s pitää sijaita /-"
-#~ "tiedostojärjestelmässä."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Liitospisteen %s pitää sijaita Linux-tiedostojärjestelmässä."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Alustetaan DASD-laitetta"
-#~ msgstr[1] "Alustetaan DASD-laitteita"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Valmistellaan %d DASD-laitetta Linux-käyttöä varten..."
@@ -4972,9 +6757,6 @@ msgstr "Sulje"
 #~ msgid "Error setting root password"
 #~ msgstr "Virhe asetettaessa pääkäyttäjän salasanaa"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Salasana on annettava ja vahvistettava."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Poista paketit"
 
@@ -5001,21 +6783,9 @@ msgstr "Sulje"
 #~ msgid "%s of %s"
 #~ msgstr "%s/%s"
 
-#~ msgid "Region:"
-#~ msgstr "Alue:"
-
-#~ msgid "City:"
-#~ msgstr "Kaupunki:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
-#~ msgid "24-hour"
-#~ msgstr "24 tunnin kello"
-
-#~ msgid "AM/PM"
-#~ msgstr "ap/ip"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Valitse lisäosasi"
 
diff --git a/anaconda/po/fr.po b/anaconda/po/fr.po
index fe1c7c4..5283262 100644
--- a/anaconda/po/fr.po
+++ b/anaconda/po/fr.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-07 12:10+0000\n"
 "Last-Translator: Kévin Raymond <shaiton@fedoraproject.org>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
@@ -33,11 +33,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "Système de fichiers /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -46,7 +46,7 @@ msgstr ""
 "Les volumes RAID qui contiennent « %s » doivent avoir un des niveaux de raid "
 "suivant : %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -55,7 +55,7 @@ msgstr ""
 "Les volumes RAID qui contiennent « %s » doivent avoir une des versions de "
 "métadonnées suivantes : %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -64,108 +64,129 @@ msgstr ""
 "Les volumes RAID qui contiennent « %s » doivent avoir l'un des types de "
 "périphérique suivant : %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s doit avoir une des étiquettes de disque suivante : %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s ne peut pas être de type %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s doit être monté sur l'un des %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s doit avoir une taille comprise entre %d et %d Mio"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s ne doit pas avoir une taille inférieure à %d Mio."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s ne doit pas être plus grand que %d Mio."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s doit être compris dans le premier %d Mio du disque."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s doit être une partition primaire."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ne peut pas être sur un périphérique chiffré."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ne peut pas être de type %s."
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s peut ne pas avoir assez d'espace pour que GRUB2 puisse intégrer core.img "
 "si vous utiliser le système de fichier %s sur %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Démarrer VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Utiliser le mode texte"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Le mot de passe est défini."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Les mots de passe ne correspondent pas !"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Le mot de passe fourni est trop faible : %s. Appuyez sur Terminé pour "
 "l'utiliser quand même."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -173,87 +194,338 @@ msgstr ""
 "l'utiliser quand même."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Faible"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Convenable"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Bonne"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Forte"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Valider"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Oui"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Non"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"L'erreur suivante s'est produite lors de la configuration des dépôts "
+"d'installation : \n"
+"\n"
+"%(e)s\n"
+"L'installation ne peut pas continuer."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"L'erreur suivante s'est produite lors de la configuration des dépôts "
+"d'installation : \n"
+"\n"
+"%(e)s\n"
+"L'installation ne peut pas continuer."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Les logiciels suivant marqués pour installation ont des erreurs. Cela est "
+"probablement dû à une erreur avec\n"
+"votre source d'installation. Vous pouvez essayé de supprimer ces paquets de "
+"votre installation,\n"
+"modifier votre source d'installation ou quitter l'installateur."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"L'installation a été interrompue à cause de ce qui semble être un problème "
+"avec votre matériel. Le message d'erreur exact est : \n"
+"\n"
+"%s.\n"
+"\n"
+"Le programme d'installation va maintenant s'arrêter."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"L'installation a été interrompue à cause de ce qui semble être un problème "
+"avec votre matériel. Le message d'erreur exact est : \n"
+"\n"
+"%s.\n"
+"\n"
+"Le programme d'installation va maintenant s'arrêter."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Erreur matériel rencontrée"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"L'installation a été interrompue à cause de ce qui semble être un problème "
+"avec votre matériel. Le message d'erreur exact est : \n"
+"\n"
+"%s.\n"
+"\n"
+"Le programme d'installation va maintenant s'arrêter."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Configuration du système installé"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Écriture de la configuration réseau"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Création des utilisateurs"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Configuration du système installé"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Exécution des scripts préalables à l'installation"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Configuration de la source d'installation..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Installation du chargeur de démarrage"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Exécution des tâches de configuration différée"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Installation du chargeur de démarrage"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Le certificat Escrow %s nécessite une connexion réseau."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -266,32 +538,324 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s est manquant. Impossible de configurer le pare-feu."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s est manquant. Impossible de configurer le pare-feu."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Ce système de fichiers ne prend pas en charge les étiquettes."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Le nom spécifié %s est déjà utilisé."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+"Le nom %s pour le groupe de volumes est déjà utilisé. Les modifications ne "
+"seront pas enregistrées."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Exécution des scripts préalables à l'installation"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Le nom d'hôte ne peut être ni nul ni une chaîne vide."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Le nom d'hôte ne peut pas comporter plus de 255 caractères."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Le nom d'hôte doit débuter par un caractère valide pris dans une des plages "
-"« a-z », « A-Z » ou « 0-9 »"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -301,55 +865,55 @@ msgstr ""
 "« 0-9 », « - », ou « . », les parties entre des points doivent contenir "
 "quelque chose et ne peuvent commencer ni finir par « - »."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Connexion en cours..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Déconnexion..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Le réseau câblé (%s) est connecté"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Le sans fil est connecté à %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Non connecté"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Pas périphérique réseau disponible"
 
@@ -358,7 +922,12 @@ msgstr "Pas périphérique réseau disponible"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "INSTALLATION DE %(productName)s %(productVersion)s"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nouvelle installation de %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Exécutez %s pour démonter le système une fois que vous avez terminé."
@@ -375,8 +944,8 @@ msgstr ""
 "Impossible de trouver /bin/sh à exécuter ! L'interpréteur de commande ne "
 "démarre pas"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Dépannage"
 
@@ -425,23 +994,17 @@ msgstr "Système à dépanner"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Quel périphérique contient la partition racine de votre installation ?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Valider"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Quitter"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "Le système redémarrera automatiquement lorsque vous quitterez l'interpréteur "
 "de commandes."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -452,7 +1015,7 @@ msgstr ""
 "interpréteur de commandes à partir duquel vous pourrez, au moyen des "
 "commandes « fsck » et « mount », vérifier et monter vos partitions. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -474,7 +1037,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -487,32 +1050,250 @@ msgstr ""
 "\n"
 "Appuyez sur <entrée> pour obtenir un terminal."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Aucune partition Linux n'est présente. Redémarrage.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " Le système redémarrera automatiquement lorsque vous quitterez "
 "l'interpréteur de commandes."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mode de dépannage"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Aucune partition Linux n'est présente. Pressez la touche Entrée pour obtenir "
 "un interpréteur de commandes.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Votre système a été monté sous le répertoire %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Partition standard"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disque"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"La zone de « swap » de votre ordinateur est utilisée par le\n"
+"système si vous avez peu d'espace mémoire disponible."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"La zone de « boot » sur votre ordinateur est l'endroit où\n"
+"les fichiers nécessaires pour démarrer le système sont stockés."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"La zone « root » de votre ordinateur est l'endroit où\n"
+"les fichiers du cœur du système et les applications sont stockés."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"La zone « home » de votre ordinateur est l'endroit où toutes\n"
+"vos données personnelles sont stockées."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Une partition de démarrage BIOS est requise pour permettre\n"
+"le démarrage depuis les disques partitionnés en GPT sur un BIOS matériel."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"La partition de démarrage PReP est requise comme une partie\n"
+"de la configuration du chargeur de démarrage sur la plupart des plateformes "
+"PPC."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Votre partition racine est inférieure à 250 Mio, ce qui est normalement trop "
+"petit pour installer %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Aucune partition racine (/) n'a été définie. Cette partition est nécessaire "
+"pour que l'installation de %s puisse se poursuivre."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Cette plate-forme exige un /boot sur une partition dédiée ou un volume "
+"logique. Si vous ne souhaitez pas de partition /boot, vous devez placer / "
+"dans une partition dédiée non-LVM."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"La taille de votre partition %(mount)s est inférieure à %(size)s Mio, ce qui "
+"est inférieur à la taille recommandée pour une installation normale de "
+"%(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Votre partition %(mount)s est trop petite pour formater en %(format)s (la "
+"taille permise est de %(minSize)d Mio à %(maxSize)d Mio)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Votre partition %(mount)s est trop grande pour formater en %(format)s (la "
+"taille permise est de %(minSize)d Mio à %(maxSize)d Mio)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+"Impossible d'ajouter un nouveau périphérique. Cliquez pour plus de détails."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Vous n'avez pas créé de partition amorçable."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Votre système BIOS nécessite une partition spéciale pour démarrer le nouveau "
+"disque %s au format GPT. Pour continuer, veuillez créer une partition de "
+"type « BIOS Boot » de 1 Mio."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Vous n'avez pas défini de partition swap. %(requiredMem)s Mio de mémoire "
+"vive est nécessaire pour continuer l'installation sans partition swap, mais "
+"vous n'avez que %(installedMem)s Mio."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Aucune partition swap n'a été indiquée. Bien qu'elle ne soit pas "
+"indispensable, elle améliore nettement les performances de la plupart des "
+"installations."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Au moins une de vos partitions swap n'a pas de UUID, ce qui était courant "
+"pour les partitions swap créées avec l'ancienne version de mkswap. Ces "
+"partitions seront définies par leurs chemins dans /etc/fstab, ce qui n'est "
+"pas idéal car ces chemins peuvent être modifiés suivant les circonstances."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Ce point de montage n'est pas valide. Le répertoire %s doit être dans le "
+"système de fichiers racine /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+"Le point de montage « %s » doit être associé à un système de fichiers linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Phrase de passe :"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -627,54 +1408,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Le mot de passe VNC fourni n'a pas le minimum requis de 6 caractères.\n"
 "Merci d'en fournir un nouveau. Laisser vide pour aucun mot de passe."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Échec de la configuration de la source d'installation"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Erreur lors du téléchargement des métadonnées du paquet..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Pas de sourde d'installation disponible"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Installation du logiciel"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Démarrage du processus d'installation"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-"Vous devez libérer plus d'espace sur les systèmes de fichiers suivants :\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Préparation de la transaction depuis la source d'installation"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Installation"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Téléchargement des métadonnées du paquet..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installation"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Préparation de l'installation"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Vérification de la configuration de l'espace de stockage..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "TITRE PAR DÉFAUT"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOCALISATION"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOCALISATION"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "LOGICIEL"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTÈME"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "PARAMÈTRES UTILISATEUR"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -683,34 +1548,103 @@ msgstr ""
 "Il n'y a pas assez d'espace dans le système de fichiers pour les logiciels "
 "sélectionnés. Un %s supplémentaire est nécessaire."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Hub d'installation"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Début de l'installation automatique"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Impossible d'avoir une question en ligne de commande !"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Veuillez faire votre choix ci-dessus [« q » pour quitter | « c » pour "
+"continuer] : "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Veuillez remplir tous les champs avant de continuer"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Nom par défaut du HUB"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Veuillez remplir tous les champs avant de continuer"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Erreur"
 
@@ -734,25 +1668,28 @@ msgstr "oui"
 msgid "no"
 msgstr "non"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Voulez-vous vraiment quitter ?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -761,7 +1698,7 @@ msgstr ""
 "  Veuillez faire votre choix ci-dessus [« q » pour quitter | « c » pour "
 "continuer] : "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -777,223 +1714,262 @@ msgstr ""
 "installation en mode graphique ou bien continuer avec une installation en "
 "mode texte ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Mot de passe VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Merci de fournir le mot de passe VNC. Vous aurez à le saisir deux fois.\n"
 "Laisser vide pour aucun mot de passe."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Mot de passe :"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Confirmation du mot de passe :"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Les mots de passe ne correspondent pas !"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Le mot de passe doit compter au moins six caractères."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Le mot de passe doit compter au moins six caractères."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Paramètres de fuseau horaire"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Le fuseau horaire n'est pas défini"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Régions disponibles"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Régions disponibles"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Écriture de la configuration réseau"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Le réseau câblé (%s) est connecté"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Le réseau câblé (%s) est connecté"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Nom d'hôte :"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Nom d'hôte"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Le nom d'hôte n'est pas valide : %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Terminer la configuration"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Passerelle"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "Type manquant lors de la configuration du système de fichiers"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Configuration du système installé"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Mot de passe administrateur :"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Le mot de passe est défini."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Le compte administrateur est désactivé."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Le mot de passe n'est pas défini."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Veuillez sélectionner un nouveau mot de passe administrateur. Vous devrez le "
 "saisir deux fois."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Mot de passe :"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Utiliser tout l'espace"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Remplacer les systèmes Linux existants"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Utiliser l'espace libre"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Destination de l'installation"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Pas de disques sélectionnés"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 "Erreur lors de la vérification de la configuration de l'espace de stockage"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr ""
 "Erreur lors de la vérification de la configuration de l'espace de stockage"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Partitionnement automatique sélectionné"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Partitionnement personnalisé sélectionné"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -1001,40 +1977,62 @@ msgstr ""
 "Pas de disque détecté. Veuillez éteindre votre ordinateur, connecter au "
 "moins un disque puis redémarrer pour terminer l'installation."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Pas de disque sélectionné : veuillez en choisir au moins un pour "
 "l'installation."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Analyse de l'espace de stockage..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Sélectionnez"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Génération de la configuration de stockage"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "échec de la configuration du stockage : %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Vérification de la configuration de l'espace de stockage..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Options de l'auto-partitionnement"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1043,41 +2041,41 @@ msgstr ""
 "L'installation requiert le partitionnement de votre disque dur. Sélectionnez "
 "quel espace utiliser pour la cible de l'installation."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Configuration du partitionnement"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Configuration du partitionnement"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Paramètres de fuseau horaire"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Fuseau horaire %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Le fuseau horaire n'est pas défini"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Fuseaux horaire disponibles pour la région %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Régions disponibles"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1086,180 +2084,198 @@ msgstr ""
 "Utilisez les chiffres ou inscrivez les noms directement [b pour la liste des "
 "régions, q pour quitter] :"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Démarrer VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Avancement de l'installation"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Miroir le plus proche"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Serveur NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Erreur de configuration de la source des logiciels"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Rien de sélectionné"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Connexion en cours..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Lecteur de CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "Fichier _ISO :"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Heure du réseau"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Pas de sourde d'installation disponible"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Échec de la configuration de la source d'installation"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Erreur lors du téléchargement des métadonnées du paquet..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Pas de sourde d'installation disponible"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Serveur NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Options de montage NFS :"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Échec de la configuration de la source d'installation, vérifiez l'url du "
 "dépôt"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "ce périphérique contient /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Échec de la configuration de la source d'installation"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Modifier la sélection de logiciels"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Erreur lors de la vérification de la sélection des logiciels"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "La source d'installation n'est pas mise en place"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "La source a été modifiée - veuillez la contrôler"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "La personnalisation des logiciels est sélectionnée"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "La source d'installation n'est pas mise en place"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Choisissez votre environnement"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Utiliser l'authentification"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Vous devez fournir et confirmer un mot de passe."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Avertissement"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1275,36 +2291,36 @@ msgstr "En cours"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstallation terminée. Appuyez sur « Entrée » pour quitter"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Titre par défaut du champ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "test du status..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Nouveau périphérique"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Confirmation du mot de passe :"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1313,7 +2329,7 @@ msgstr ""
 "Le mot de passe fourni est trop faible : %s. Appuyez sur Terminé pour "
 "l'utiliser quand même."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1322,63 +2338,47 @@ msgstr ""
 "Le mot de passe fourni est trop faible : %s. Appuyez sur Terminé pour "
 "l'utiliser quand même."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Le mot de passe est défini."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Quitter le logiciel d'installation"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Aide"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Non"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Oui"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "TITRE PAR DÉFAUT"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOCALISATION"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOCALISATION"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "LOGICIEL"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTÈME"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "PARAMÈTRES UTILISATEUR"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1386,7 +2386,11 @@ msgstr ""
 "Veuillez compléter les points marqués avec cette icône avant de passer à la "
 "prochaine étape."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Terminé !"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1395,173 +2399,69 @@ msgstr ""
 "%s s'est installé avec succès sur votre système et est près\n"
 "à fonctionner. Allez-y et redémarrer pour commencer à l'utiliser !"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Terminé !"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Quitter"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nouvelle installation de %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s s'est installé avec succès sur votre système, mais un certain nombre de "
+"configurations reste à faire. \n"
+"Terminez-les et veuillez ensuite cliquer sur le bouton « Terminer la "
+"configuration »."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s s'est installé avec succès sur votre système et est près\n"
+"à fonctionner. Allez-y et redémarrer pour commencer à l'utiliser !"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Créer un nouveau groupe de volumes ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
 msgstr ""
+"la reconfiguration du périphérique a échoué. Cliquez pour plus de détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Veuillez donner un nom à votre groupe de volumes et choisir au moins un des "
-"disques suivants."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Groupe de volumes :"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "colonne"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Réinitialisation de la configuration de stockage due à une erreur "
 "irrécupérable. Cliquez pour plus de détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr ""
-"la reconfiguration du périphérique a échoué. Cliquez pour plus de détails."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Veuillez entrer un point de montage valide."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Ce point de montage est invalide. Voulez-vous en essayer un autre ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-"Ce point de montage est déjà utilisé. Voulez-vous en essayer un autre ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Le niveau RAID que vous avez sélectionné demande plus de disques que ceux "
-"actuellement choisis."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Veuillez entrer un point de montage valide."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Ce point de montage est invalide. Voulez-vous en essayer un autre ?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Partition standard"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disque"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Aucune"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-"Supprimer aussi tous les autres systèmes de fichiers sur la racine de %s"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Êtes-vous sur de vouloir supprimer toutes les données sur %s ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Êtes-vous sur de vouloir supprimer toutes les données sur %s ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "PARTITIONNEMENT MANUEL"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "Dispositif de stockage %d sélectionné"
 msgstr[1] "Dispositifs de stockages %d sélectionnés"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1570,143 +2470,127 @@ msgstr ""
 "Lorsque vous créerez un point de montage pour votre installation %s %s,\n"
 "vous serez en mesure de consulter les détails ici."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"La zone de « swap » de votre ordinateur est utilisée par le\n"
-"système si vous avez peu d'espace mémoire disponible."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"La zone de « boot » sur votre ordinateur est l'endroit où\n"
-"les fichiers nécessaires pour démarrer le système sont stockés."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"La zone « root » de votre ordinateur est l'endroit où\n"
-"les fichiers du cœur du système et les applications sont stockés."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"La zone « home » de votre ordinateur est l'endroit où toutes\n"
-"vos données personnelles sont stockées."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Une partition de démarrage BIOS est requise pour permettre\n"
-"le démarrage depuis les disques partitionnés en GPT sur un BIOS matériel."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"La partition de démarrage PReP est requise comme une partie\n"
-"de la configuration du chargeur de démarrage sur la plupart des plateformes "
-"PPC."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi doit être sur un périphérique de type %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s doit être sur un périphérique de type %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s ne peut pas être chiffré"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 "Vous devez créer un nouveau système de fichiers sur le périphérique racine."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 "Les périphériques de type %s exigent une sélection de niveau RAID valide."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "La demande de redimensionnement du périphérique a échoué. Cliquez pour plus "
 "de détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "La demande de reformatage du périphérique a échoué. Cliquez pour plus de "
 "détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Le nom spécifié %s est déjà utilisé."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Ce système de fichiers ne prend pas en charge les étiquettes."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Pas de disques sélectionnés"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Ce système de fichiers ne peut pas être redimensionné."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Erreur lors de la vérification de la configuration de l'espace de stockage. "
+"Cliquez pour plus de détails."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Erreur lors de la vérification de la configuration de l'espace de stockage. "
+"Cliquez pour plus de détails."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Ajout d'un nouveau %s au conteneur %s existant."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 "Impossible d'ajouter un nouveau périphérique. Cliquez pour plus de détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "Définition de la taille de la partition non valable. Utilisez un entier "
 "valide."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "La demande de suppression du périphérique a échoué. Cliquez pour plus de "
 "détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 "Le nom %s pour le groupe de volumes est déjà utilisé. Les modifications ne "
 "seront pas enregistrées."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs libre"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1715,7 +2599,7 @@ msgstr ""
 "Cet ensemble RAID logiciel est absent de la partition membre %d de %d. Vous "
 "pouvez le supprimer ou en choisir un autre."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1724,301 +2608,145 @@ msgstr ""
 "Ce groupe de volume LVM est absent des volumes physiques %d de %d. Vous "
 "pouvez le supprimer ou en choisir un autre."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Pas de disques sélectionnés."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Il n'y a pas assez d'espace libre sur les disques sélectionnés."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Le partitionnement automatique a échoué. Cliquez pour plus de détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Modifier la sélection de logiciels"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Impossible de déverrouiller le périphérique de bloc chiffré. Cliquez pour "
 "plus de détails."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Vous avez choisi de configurer manuellement les systèmes de fichiers pour "
-"votre installation de %(productName)s. Avant de commencer, vous voudrez peut-"
-"être prendre une minute pour apprendre la configuration. Il y a quelques "
-"modification.\n"
-"\n"
-"La plus importante modification porte sur la rationalisation de la créations "
-"des systèmes de fichiers. Vous n'avez plus à construire un dispositif "
-"complexe, comme des volumes logiques LVM (volume physique, puis groupe de "
-"volumes et ensuite volume logique) -- vous avez juste à créer un volume "
-"logique et nous nous occuperons de mettre en place les volumes physiques et "
-"le groupe de volumes le contenant. Nous nous occuperons aussi de régler le "
-"groupe de volumes que vous ajoutez ou supprimez, et redimensionner les "
-"volumes logiques de sorte que vous n'avez pas à vous soucier des détails "
-"anodins.\n"
-"\n"
-"\n"
-"Disposition de l'écran\n"
-"\n"
-"Le côté gauche de l'écran affiche les installations d'OS que nous avons pu "
-"trouver sur cet ordinateur. L'installation du nouveau %(productName)s est en "
-"haut de la liste. Vous pouvez cliquer sur le nom des installations pour voir "
-"les systèmes de fichiers qu'ils contiennent.\n"
-"\n"
-"Dessous les différentes installations et points de montage sur le coté "
-"gauche se trouvent des boutons pour ajouter un nouveau système de fichiers, "
-"ou pour configurer le système de fichier sélectionné.\n"
-"\n"
-"Le côté droit de l'écran est l'endroit où vous pouvez personnaliser le point "
-"de montage actuellement sélectionné.\n"
-"\n"
-"Dans le coin inférieur gauche, vous verrez un résumé des disques que vous "
-"avez choisi d'utiliser pour l'installation. Vous pouvez cliquer sur le texte "
-"en bleu pour voir des informations détaillées sur votre sélection de "
-"disques.\n"
-"\n"
-"\n"
-"Comment créer un nouveau système de fichier sur un nouveau périphérique\n"
-"\n"
-"1. Cliquez sur le bouton « + »\n"
-"2. Entrez le point de montage et sa taille. (Astuce : placez le pointeur de "
-"la souris sur l'une des zones de saisie de texte pour avoir de l'aide.)\n"
-"3. Sélectionnez le nouveau point de montage sous « Nouvelle installation de "
-"%(productName)s » sur le côté gauche de l'écran et personnalisez-le en "
-"fonction de vos besoins.\n"
-"\n"
-"\n"
-"Comment reformater un périphérique ou système de fichiers existant déjà sur "
-"votre disque\n"
-"\n"
-"1. Sélectionnez le système de fichiers à partir du côté gauche de l'écran.\n"
-"2. Cliquez sur la liste déroulante « Personnalisation » dans la zone de "
-"personnalisation des points de montage sur le côté droit de l'écran.\n"
-"3. Activez la case à cocher « Reformater » , sélectionnez un type de système "
-"de fichiers, et, le cas échéant, entrez le point de montage ci-dessus dans "
-"la zone de saisie de texte « Point de montage ».\n"
-"4. Cliquez sur « Appliquez les modifications ».\n"
-"\n"
-"\n"
-"Comment configurer un point de montage pour un système de fichiers existant "
-"déjà sur votre disque\n"
-"\n"
-"1. Sélectionnez le système de fichiers à partir du côté gauche de l'écran.\n"
-"2. Entrez un point de montage dans la zone de saisie de texte « Point de "
-"montage ».\n"
-"3. Cliquez sur « Appliquez les modifications ».\n"
-"\n"
-"\n"
-"Comment supprimer un système de fichiers existant déjà sur votre disque\n"
-"\n"
-"1. Sélectionnez le système de fichiers que vous souhaitez supprimer sur le "
-"côté gauche de l'écran.\n"
-"2. Cliquez sur le bouton « - ».\n"
-"\n"
-"Astuce : supprimer un périphérique qui existe sur votre disque depuis la "
-"« Nouvelle installation de %(productName)s » ne le supprime pas. Il "
-"réinitialise seulement le périphérique dans son état d'origine. Pour "
-"supprimer un périphérique qui existe déjà sur votre disque, vous devez le "
-"sélectionner depuis une autre installation détectée ( ou « Inconnu ») et "
-"cliquez sur le bouton « - ».\n"
-"\n"
-"\n"
-"Trucs et astuces\n"
-"\n"
-"Vous pouvez saisir des tailles de nouveaux systèmes de fichiers supérieures "
-"à l'espace libre total disponible. Le programme d'installation se "
-"rapprochera le plus possible de la taille que vous demandez.\n"
-"\n"
-"Par défaut, les nouveaux périphériques utilisent l'ensemble de vos disques "
-"sélectionnés.\n"
-"\n"
-"Vous pouvez modifier sur quel disque un nouveau périphérique peut être "
-"alloué en cliquant sur le bouton de configuration (celui avec des outils "
-"graphiques) même si ce périphérique est sélectionné.\n"
-"\n"
-"Lorsque que ajoutez un nouveau point de montage en cliquant sur le bouton « -"
-" », laissez en blanc la taille pour permettre au nouveau périphérique "
-"d'utiliser tout l'espace disponible.\n"
-"\n"
-"Lorsque vous supprimer le dernier périphérique depuis un conteneur comme un "
-"groupe de volumes LVM, nous supprimerons automatiquement ce conteneur pour "
-"faire place à de nouveaux périphériques.\n"
-"\n"
-"Lorsque que la dernière partition d'un disque est supprimée, ce disque peut "
-"être réinitialisé avec une nouvelle table de partition si l'on pense qu'il y "
-"a un type plus approprié pour ce disque.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATE ET HEURE"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Fuseau horaire incorrect"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Vous devez configurer d'abord le réseau si vous voulez utiliser NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Vous n'avez pas de serveur NTP configuré"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "CIBLE DE L'INSTALLATION"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "Dispositif de stockage %d sélectionné"
+msgstr[1] "Dispositifs de stockages %d sélectionnés"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s pour basculer entre les agencements."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "CLAVIER"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Le test des agencements clavier n'est pas disponibles."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "test du status..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Le basculement entre les agencements n'est pas défini."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "LANGUE"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Statut inconnu (absent)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Statut inconnu"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Non pris en charge"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Indisponible"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Microprogramme manquant"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Câble débranché"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Indisponible"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Déconnecté"
@@ -2043,155 +2771,171 @@ msgstr "Déconnexion"
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "débranché"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Sans fil"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "débranché"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Adresse IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Adresse IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mio/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Entreprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Aucune"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Authentification requise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Mot de passe :"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "CONFIGURATION DU RÉSEAU"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "MOT DE PASSE ADMINISTRATEUR"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Le mot de passe est défini."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Le mot de passe administrateur est défini"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Le compte administrateur est désactivé"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Le mot de passe administrateur n'est pas défini"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SÉLECTION DE LOGICIELS"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Vérification des dépendances du logiciel..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Erreur lors de la vérification des dépendances du logiciel"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Téléchargement des métadonnées du paquet..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Téléchargement des métadonnées du groupe..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Vérification des dépendances du logiciel..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Erreur lors de la vérification des dépendances du logiciel"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Erreur lors de la vérification des dépendances du logiciel. Cliquez pour les "
 "détails."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Les logiciels suivant marqués pour installation ont des erreurs. Cela est "
 "probablement dû à une erreur avec\n"
@@ -2199,48 +2943,79 @@ msgstr ""
 "votre installation,\n"
 "modifier votre source d'installation ou quitter l'installateur."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Annuler"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Quitter"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Modifier la source des logiciels"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Modifier la sélection de logiciels"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Configuration de la source d'installation..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Erreur lors du téléchargement des métadonnées du paquet..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Authentification requise"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Ce support est bon pour l'installation."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Ce support n'est pas bon pour l'installation."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "SOURCE D'INSTALLATION"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Échec de la configuration de la source d'installation, vérifiez l'url du "
 "dépôt"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Erreur d'installation du dépôt"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Erreur de configuration de la source des logiciels"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2248,86 +3023,73 @@ msgstr ""
 "Échec de la configuration de la source d'installation, vérifiez l'url du "
 "dépôt et les paramètres du proxy."
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Erreur d'installation du dépôt"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Erreur de configuration de la source des logiciels"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Périphérique"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Serveur NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Fuseau horaire incorrect"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Fuseau horaire incorrect"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Fuseau horaire incorrect"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Merci de patentier... chargement des metadonnées en cours"
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
@@ -2335,12 +3097,7 @@ msgstr ""
 "Les disques que vous avez sélectionnés ont les quantités suivantes d'espace "
 "libre :"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Merci de patentier... chargement des metadonnées en cours"
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2351,7 +3108,7 @@ msgstr ""
 "nous pouvons vous aider\n"
 "à récupérer de l'espace en réduisant ou supprimant des partitions existantes."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2362,7 +3119,7 @@ msgstr ""
 "vous utilisez tout l'espace libre\n"
 "disponible sur le disque sélectionné."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2377,46 +3134,53 @@ msgstr ""
 "modifier votre sélection de logiciels pour installer une version plus petite "
 "de <b>%s</b>, ou quitter l'installateur."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "CIBLE DE L'INSTALLATION"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Sauvegarde de la configuration du stockage..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Impossible de sauvegarder la configuration de stockage..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatage du périphérique DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Erreur lors de la vérification de la configuration de l'espace de stockage. "
 "Cliquez pour plus de détails."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Erreur lors de la vérification de la configuration de l'espace de stockage. "
 "Cliquez pour plus de détails."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs libre"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d disque sélectionné ; capacité de %s ; %s d'espace libre"
 msgstr[1] "%d disques sélectionnés ; capacité de %s ; %s d'espace libre"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2424,7 +3188,11 @@ msgstr ""
 "Vous avez choisi d'ignorer l'installation du chargeur de démarrage. Votre "
 "système ne pourra peut-être pas démarrer."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2434,11 +3202,19 @@ msgstr ""
 "configuration de stockage.\n"
 "Vous pouvez modifier votre schéma de stockage ou quitter l'installateur."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Modifier votre schéma de stockage"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2449,53 +3225,53 @@ msgstr ""
 "configuration de stockage.\n"
 "Vous pouvez modifier votre schéma de stockage ou quitter l'installateur."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Valider"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "PARAMÈTRES UTILISATEUR"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Fuseau horaire incorrect"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "BIENVENUE SUR %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DONNÉES"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2504,23 +3280,27 @@ msgstr ""
 "Vous n'avez pas encore créé de point de montage pour l'installation de %s "
 "%s :"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Cliquez ici pour les créer automatiquement."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Ou, créer ci-dessous de nouveaux points de montage avec l'icône « + »."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2535,55 +3315,166 @@ msgstr[1] ""
 "<b>%d disques sélectionnés ; capacité de %s ; %s d'espace libre</b> (non "
 "partitionné et dans le système de fichiers)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Ne pas installer le chargeur de démarrage"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Définir comme périphérique d'amorçage"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Le niveau RAID que vous avez sélectionné demande plus de disques que ceux "
+"actuellement choisis."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Veuillez donner un nom à votre groupe de volumes et choisir au moins un des "
+"disques suivants."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Groupe de volumes :"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "colonne"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr ""
+"Le point de montage « %s » doit être associé à un système de fichiers linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+"Ce point de montage est déjà utilisé. Voulez-vous en essayer un autre ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Veuillez entrer un point de montage valide."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Ce point de montage est invalide. Voulez-vous en essayer un autre ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+"Supprimer aussi tous les autres systèmes de fichiers sur la racine de %s"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Êtes-vous sur de vouloir supprimer toutes les données sur %s ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Êtes-vous sur de vouloir supprimer toutes les données sur %s ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Fuseau horaire incorrect"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Vous avez fourni une phrase de passe faible : %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Les phrases de passe ne correspondent pas."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Préserver"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Réduire"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Supprimer"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Ce périphérique contient la source d'installation."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Création de %(type)s sur %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Pas prêt"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Utiliser l'espace libre"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2596,14 +3487,14 @@ msgstr ""
 "pas pour libérer de l'espace disque. Supprimer un système de fichier "
 "supprimera également toutes les données qu'il contient."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2613,353 +3504,762 @@ msgstr[0] ""
 msgstr[1] ""
 "<b>Disques %s ; %s d'espace récupérable</b> (dans les systèmes de fichiers)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Espace total sélectionné à récupérer : <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Supprimer"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Préserver"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALLATION DE LA DISTRIBUTION"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "NOM DU CHAMP"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PRE-RELEASE / TESTING"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Nouveau périphérique"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 Mio"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 Gio"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Nouveau sélecteur"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Terminé"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Poursuivre"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Appliquer les modifications"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "CONFIGURATION DU RÉSEAU"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Nom du groupe"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Annuler"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Valider"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATE ET HEURE"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr " : "
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Ajouter et marquer pour l'utilisation des serveurs NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Serveur Web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "En fonctionnement"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Utiliser"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Configurer..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATE ET HEURE"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Région :"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Région :"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Ville :"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Ville :"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Nom du réseau"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nom du réseau"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr " : "
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-heure"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "CIBLE DE L'INSTALLATION"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacité"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Non connecté"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Périphérique sélectionné"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Rien de sélectionné"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Microprogramme manquant"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Non"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Type de VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Périphérique sélectionné"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "sommaire"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Périphérique RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Route par défaut"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Masque de sous-réseau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Vitesse"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Adresse du matériel"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "C_onfigurer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Sécurité"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Nom du réseau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Nom du réseau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Clé de sécurité"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Utilisez comme Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Arrêtez le Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Configurer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Fournisseur"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Configurer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Type de VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Passerelle"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Mot de passe du groupe"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Configurer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Méthode"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Configuration de l'URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "Proxy _HTTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "Proxy H_TTPS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "Proxy _FTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Hôte _socks"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Écriture de la configuration réseau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Déverrouiller"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Mode Air_plane"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Écriture de la configuration réseau"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nom d'hôte :"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "CONFIGURATION DU RÉSEAU"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2969,206 +4269,61 @@ msgstr ""
 "votre localisation\n"
 "et pour faire les mises à jour logicielles disponibles pour vous."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Route par défaut"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Masque de sous-réseau"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Vitesse"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Adresse du matériel"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "C_onfigurer..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Sécurité"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Nom du réseau"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Nom du réseau"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Clé de sécurité"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Utilisez comme Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Arrêtez le Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Configurer..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Fournisseur"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Type de VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Passerelle"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Nom du groupe"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Mot de passe du groupe"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Méthode"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Configuration de l'URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "Proxy _HTTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "Proxy H_TTPS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "Proxy _FTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Hôte _socks"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Déverrouiller"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Mode Air_plane"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Nom d'hôte :"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Utiliser l'authentification"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Authentification requise"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Connecté"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SÉLECTION DE LOGICIELS"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Choisissez votre environnement"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "colonne"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Annuler et _ajouter plus de disques"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "OPTIONS D'INSTALLATION"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Type de partition :</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Chiffrer mes données. Je définirai une phrase de passe plus tard."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Partitionnement personnalisé sélectionné"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Récupérer de l'espace"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "OPTIONS D'INSTALLATION"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3176,79 +4331,145 @@ msgstr ""
 "Nous allons décrire ici combien d'espace est nécessaire pour la sélection de "
 "logiciels courante."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "espace libre sur le disque"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Espace libre disponible pour utilisation"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs libre"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Espace libre indisponible mais récupérable depuis des partitions existantes."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Ici, nous allons décrire quelles sont vos options."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Utiliser l'espace libre"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Quitter l'installateur"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Description du périphérique"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Disques locaux standards"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Fin du partitionnement"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Chiffrer"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Partitionnement automatique sélectionné"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Fin du partitionnement"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Chiffrer"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Chiffrer mes données. Je définirai une phrase de passe plus tard."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Options de l'auto-partitionnement"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "sommaire"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Résumé complet des disques et options..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "AJOUTER UN AGENCEMENT DU CLAVIER"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-"Vous pouvez ajouter un agencement de clavier en le sélectionnant ci-dessous :"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nom"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "AGENCEMENT DU CLAVIER"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3256,7 +4477,7 @@ msgstr ""
 "Quel agencement du clavier voulez-vous utiliser sur ce système ? Vous pouvez "
 "déplacer un agencement en haut de la liste pour le définir par défaut."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3265,118 +4486,201 @@ msgstr ""
 "Utilisez les outils de l'environnement de bureau pour configurer le clavier "
 "pendant le processus d'installation"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nom"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Ajouter un agencement"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Supprimer un agencement"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Déplacer l'agencement sélectionné vers le haut"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Ajouter un agencement"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Supprimer un agencement"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Déplacer l'agencement sélectionné vers le haut"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Déplacer l'agencement sélectionné vers le bas"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Agencement précédent"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Le test des agencements clavier n'est pas disponibles."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Maj pour modifier la configuration."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Options"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "AJOUTER UN AGENCEMENT DU CLAVIER"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+"Vous pouvez ajouter un agencement de clavier en le sélectionnant ci-dessous :"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nom"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Régions disponibles"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Ajouter un agencement"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Valider"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "OPTIONS DU BASCULEMENT DU CLAVIER"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Quelles combinaisons voulez-vous utiliser pour basculer entre les différents "
 "agencements du clavier ?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "utiliser"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "description"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Options de montage NFS :"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "LANGUE"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "Langue locale"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "Langue anglaise"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Rien de sélectionné"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "MOT DE PASSE ADMINISTRATEUR"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Mot de passe administrateur :"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirmer :"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Mot de passe VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Définir le mot de passe administrateur"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3384,237 +4688,285 @@ msgstr ""
 "Le compte root est utilisé pour administrer le système. Entrez un mot de "
 "passe pour l'utilisateur root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Terminé"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "VÉRIFICATION DU MEDIA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Vérification du média, veuillez patienter..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Ajouter"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Valider"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Activer le proxy HTTP"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>URL du proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Exemple:</b> squid.mysite.org:3128</span"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Utiliser l'authentification"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Nom d'utilisateur</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Nom d'utilisateur"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Mot de passe</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Mot de passe :"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "SOURCE D'INSTALLATION"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Quelle source d'installation voulez-vous utiliser ?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "Détection _automatique du média d'installation"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Périphérique"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Vérification"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "Fichier _ISO :"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Périphérique"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Choisissez un ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Sur le réseau :"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Configuration du proxy..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Cette URL se réfère à une liste _miroir."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Options de montage NFS :"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Ce champ est optionnel"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Dépôts personnels de Fedora"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Ajouter un nouveau point de montage."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Ajouter"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Supprimer les points de montages sélectionnés."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Supprimez"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Erreur opérationnelle."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Définir le mot de passe administrateur"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Cette URL se réfère à une liste _miroir."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nom :"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>URL du proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nom d'utilisateur"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Mot de passe :"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Ce point de montage est invalide. Voulez-vous en essayer un autre ?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Sortez-moi d'ici !"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Je sais ce que je fais."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Ceci est un logiciel instable en préversion "
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3627,205 +4979,265 @@ msgstr ""
 "vivre. Et pour le moment ce système d'exploitation n'est pas stable, il est "
 "dédié aux tests uniquement."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "BIENVENUE SUR %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 "Quelle langue souhaitez-vous utiliser durant le processus d'installation ?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Poursuivre"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nom d'utilisateur"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Nom du groupe"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Mot de passe :"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Mot de passe VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Ajouter un point de montage"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Capacité désirée :</b>"
+msgid "Add a new mount point."
+msgstr "Ajouter un nouveau point de montage."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Point de montage :</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Ajouter"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "AJOUTER UN NOUVEAU POINT DE MONTAGE"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Plus d'options de personnalisation seront disponible\n"
-"après avoir créé le point de montage ci-dessous."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Ce point de montage est déjà\n"
-"utilisé. Voulez vous en essayer un autre ?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "par exemple : « 20 Gio » , « 500 Mio » (sans les guillemets)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Supprimer"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Sauvegarder"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CONFIGURER LE POINT DE MONTAGE"
+msgid "Remove the selected mount point(s)."
+msgstr "Supprimer les points de montages sélectionnés."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Veuillez donner un nom à votre groupe de volumes et choisir au moins un des "
-"disques suivants."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "_Supprimez"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Libre"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Périphérique RAID"
+msgid "Reload storage configuration from disk."
+msgstr "échec de la configuration du stockage : %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Chiffrer"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Périphérique sélectionné"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Description du périphérique"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Point de montage :</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Capacité désirée :</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Type de périphérique :</b>"
+msgid "Device(s):"
+msgstr "Périphérique"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Système de fichiers :</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Chiffrer"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Reformater"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Groupe de volumes :"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Modifier ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nom :"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Type de périphérique :</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Chiffrer"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Système de fichier"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Reformater"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Groupe de volumes :"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Modifier ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Périphérique RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3833,17 +5245,19 @@ msgstr ""
 "Ce périphérique est chiffré et ne peut être lu sans une phrase de passe "
 "valide. Vous pouvez le déverrouiller ci-dessous."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Phrase de passe :"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Déverrouiller"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3851,297 +5265,574 @@ msgstr ""
 "Ce périphérique ne peut pas être modifié directement. Vous pouvez le "
 "supprimer ou en choisir un autre."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Ajouter un nouveau point de montage."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Supprimer les points de montages sélectionnés."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Configurer le point de montage sélectionné."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Configurer..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "échec de la configuration du stockage : %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Cliquez pour avoir de l'aide"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Aide"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ESPACE DISPONIBLE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ESPACE TOTAL</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Sélectionnez"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Annuler"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGURER LE POINT DE MONTAGE"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Sélectionnez un ou plusieurs disques où sera installé ce périphérique."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Valider"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Adresse IP"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Vous devez fournir un nom d'initiateur iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Utiliser l'authentification"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Exemple:</b> squid.mysite.org:3128</span"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nom d'utilisateur"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Mot de passe VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nom d'utilisateur"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Mot de passe VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Mot de passe VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Nom du réseau"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Utiliser l'authentification"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nom d'utilisateur"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Mot de passe VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nom d'utilisateur"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Mot de passe VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Nom d'utilisateur"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Mot de passe VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Échec de la connexion"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Valider"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Périphérique"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "DISQUES SÉLECTIONNÉS"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Fermez"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Amorçage"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Description"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Libre"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Supprimez"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Le résumé du disque est ici"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Supprimer"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Sélectionnez"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGURER LE POINT DE MONTAGE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Sélectionnez un ou plusieurs disques où sera installé ce périphérique."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Ajouter un point de montage"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Capacité désirée :</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Point de montage :</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "AJOUTER UN NOUVEAU POINT DE MONTAGE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Plus d'options de personnalisation seront disponible\n"
+"après avoir créé le point de montage ci-dessous."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Ce point de montage est déjà\n"
+"utilisé. Voulez vous en essayer un autre ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "par exemple : « 20 Gio » , « 500 Mio » (sans les guillemets)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Sauvegarder"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CONFIGURER LE POINT DE MONTAGE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Veuillez donner un nom à votre groupe de volumes et choisir au moins un des "
+"disques suivants."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nom :"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Périphérique RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Chiffrer"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Veuillez entrer un point de montage valide."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Valider"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formatage du périphérique DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Une erreur inconnue est survenue durant l'installation. Les détails sont ci-"
 "dessous."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "PHRASE DE PASSE POUR LE CHIFFREMENT DU DISQUE"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Sauvegarder la phrase de passe"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "PHRASE DE PASSE POUR LE CHIFFREMENT DU DISQUE"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4151,7 +5842,19 @@ msgstr ""
 "phrase de passe qui sera utilisée pour accéder à vos données lors de "
 "démarrage de votre ordinateur."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Phrase de passe :"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirmer :"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4161,117 +5864,172 @@ msgstr ""
 "modifiez cet agencement, vous ne serez peut-être pas en mesure de déchiffrer "
 "votre disque après l'installation."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "RÉCUPÉRER DE L'ESPACE DISQUE"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Valider"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Annuler"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Récupérer de l'espace"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "RÉCUPÉRER DE L'ESPACE DISQUE"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "La description est la suivante."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Système de fichier"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Espace récupérable"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Action"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Préserver"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Supprimer"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Réduire"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Partitionnement personnalisé sélectionné"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Appliquer les modifications"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Périphérique"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Ajouter un point de montage"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Quitter le logiciel d'installation"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Non"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Oui"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4279,52 +6037,50 @@ msgstr ""
 "Êtes-vous sur de vouloir quitter le\n"
 "processus d'installation ?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Quitter"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "RÉSUMÉ DE L'INSTALLATION"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "Dé_but de l'installation"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "CONFIGURATION"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Préparation de l'installation"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s s'est installé avec succès sur votre système, mais un certain nombre de "
-"configurations reste à faire. \n"
-"Terminez-les et veuillez ensuite cliquer sur le bouton « Terminer la "
-"configuration »."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Terminer la configuration"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s s'est installé avec succès sur votre système et est près\n"
-"à fonctionner. Allez-y et redémarrer pour commencer à l'utiliser !"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Redémarrer"
 
@@ -4340,16 +6096,16 @@ msgstr "Installer"
 msgid "Install the live CD to your hard disk"
 msgstr "Installer le CD live sur votre disque dur"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Démarrage de l'installation sur le disque dur"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Bienvenue sur Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4358,26 +6114,27 @@ msgstr ""
 "%s nécessite %s Mio de mémoire pour s'installer, mais vous ne disposez que "
 "de %s Mio sur cette machine.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Le programme d'installation graphique %s nécessite %s Mio de mémoire pour "
 "s'installer, mais vous ne disposez que de %s Mio."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Mémoire RAM insuffisante"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4391,24 +6148,24 @@ msgstr ""
 "\n"
 " depuis un interpréteur de commande en administrateur."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Démarrage du mode texte."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Erreur"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "La variable DISPLAY n'est pas définie. Lancement du mode texte."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Installation graphique non disponible. Démarrage en mode texte."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4420,23 +6177,23 @@ msgstr ""
 "partitionnement ni de sélectionner vos paquets. Souhaitez-vous utiliser le "
 "mode VNC à la place&nbsp;?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 "Veuillez exécuter la commande « ssh install@%s » pour démarrer l'installation"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 "Veuillez exécuter la commande « ssh install@<host> » pour continuer "
 "l'installation."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Essayez Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4446,7 +6203,7 @@ msgstr ""
 "Vous pouvez l'installer maintenant, ou choisir « Installer sur le disque "
 "dur » dans la vue d'ensemble des activités plus tard."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4454,10 +6211,304 @@ msgstr ""
 "Vous pouvez choisir « Installer sur le disque dur »\n"
 "dans la vue d'ensemble des activités plus tard."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Fermé"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Le nom d'hôte doit débuter par un caractère valide pris dans une des "
+#~ "plages « a-z », « A-Z » ou « 0-9 »"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr ""
+#~ "Vous devez libérer plus d'espace sur les systèmes de fichiers suivants :\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Impossible d'avoir une question en ligne de commande !"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Ce point de montage est invalide. Voulez-vous en essayer un autre ?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Vous avez choisi de configurer manuellement les systèmes de fichiers pour "
+#~ "votre installation de %(productName)s. Avant de commencer, vous voudrez "
+#~ "peut-être prendre une minute pour apprendre la configuration. Il y a "
+#~ "quelques modification.\n"
+#~ "\n"
+#~ "La plus importante modification porte sur la rationalisation de la "
+#~ "créations des systèmes de fichiers. Vous n'avez plus à construire un "
+#~ "dispositif complexe, comme des volumes logiques LVM (volume physique, "
+#~ "puis groupe de volumes et ensuite volume logique) -- vous avez juste à "
+#~ "créer un volume logique et nous nous occuperons de mettre en place les "
+#~ "volumes physiques et le groupe de volumes le contenant. Nous nous "
+#~ "occuperons aussi de régler le groupe de volumes que vous ajoutez ou "
+#~ "supprimez, et redimensionner les volumes logiques de sorte que vous "
+#~ "n'avez pas à vous soucier des détails anodins.\n"
+#~ "\n"
+#~ "\n"
+#~ "Disposition de l'écran\n"
+#~ "\n"
+#~ "Le côté gauche de l'écran affiche les installations d'OS que nous avons "
+#~ "pu trouver sur cet ordinateur. L'installation du nouveau %(productName)s "
+#~ "est en haut de la liste. Vous pouvez cliquer sur le nom des installations "
+#~ "pour voir les systèmes de fichiers qu'ils contiennent.\n"
+#~ "\n"
+#~ "Dessous les différentes installations et points de montage sur le coté "
+#~ "gauche se trouvent des boutons pour ajouter un nouveau système de "
+#~ "fichiers, ou pour configurer le système de fichier sélectionné.\n"
+#~ "\n"
+#~ "Le côté droit de l'écran est l'endroit où vous pouvez personnaliser le "
+#~ "point de montage actuellement sélectionné.\n"
+#~ "\n"
+#~ "Dans le coin inférieur gauche, vous verrez un résumé des disques que vous "
+#~ "avez choisi d'utiliser pour l'installation. Vous pouvez cliquer sur le "
+#~ "texte en bleu pour voir des informations détaillées sur votre sélection "
+#~ "de disques.\n"
+#~ "\n"
+#~ "\n"
+#~ "Comment créer un nouveau système de fichier sur un nouveau périphérique\n"
+#~ "\n"
+#~ "1. Cliquez sur le bouton « + »\n"
+#~ "2. Entrez le point de montage et sa taille. (Astuce : placez le pointeur "
+#~ "de la souris sur l'une des zones de saisie de texte pour avoir de "
+#~ "l'aide.)\n"
+#~ "3. Sélectionnez le nouveau point de montage sous « Nouvelle installation "
+#~ "de %(productName)s » sur le côté gauche de l'écran et personnalisez-le en "
+#~ "fonction de vos besoins.\n"
+#~ "\n"
+#~ "\n"
+#~ "Comment reformater un périphérique ou système de fichiers existant déjà "
+#~ "sur votre disque\n"
+#~ "\n"
+#~ "1. Sélectionnez le système de fichiers à partir du côté gauche de "
+#~ "l'écran.\n"
+#~ "2. Cliquez sur la liste déroulante « Personnalisation » dans la zone de "
+#~ "personnalisation des points de montage sur le côté droit de l'écran.\n"
+#~ "3. Activez la case à cocher « Reformater » , sélectionnez un type de "
+#~ "système de fichiers, et, le cas échéant, entrez le point de montage ci-"
+#~ "dessus dans la zone de saisie de texte « Point de montage ».\n"
+#~ "4. Cliquez sur « Appliquez les modifications ».\n"
+#~ "\n"
+#~ "\n"
+#~ "Comment configurer un point de montage pour un système de fichiers "
+#~ "existant déjà sur votre disque\n"
+#~ "\n"
+#~ "1. Sélectionnez le système de fichiers à partir du côté gauche de "
+#~ "l'écran.\n"
+#~ "2. Entrez un point de montage dans la zone de saisie de texte « Point de "
+#~ "montage ».\n"
+#~ "3. Cliquez sur « Appliquez les modifications ».\n"
+#~ "\n"
+#~ "\n"
+#~ "Comment supprimer un système de fichiers existant déjà sur votre disque\n"
+#~ "\n"
+#~ "1. Sélectionnez le système de fichiers que vous souhaitez supprimer sur "
+#~ "le côté gauche de l'écran.\n"
+#~ "2. Cliquez sur le bouton « - ».\n"
+#~ "\n"
+#~ "Astuce : supprimer un périphérique qui existe sur votre disque depuis la "
+#~ "« Nouvelle installation de %(productName)s » ne le supprime pas. Il "
+#~ "réinitialise seulement le périphérique dans son état d'origine. Pour "
+#~ "supprimer un périphérique qui existe déjà sur votre disque, vous devez le "
+#~ "sélectionner depuis une autre installation détectée ( ou « Inconnu ») et "
+#~ "cliquez sur le bouton « - ».\n"
+#~ "\n"
+#~ "\n"
+#~ "Trucs et astuces\n"
+#~ "\n"
+#~ "Vous pouvez saisir des tailles de nouveaux systèmes de fichiers "
+#~ "supérieures à l'espace libre total disponible. Le programme "
+#~ "d'installation se rapprochera le plus possible de la taille que vous "
+#~ "demandez.\n"
+#~ "\n"
+#~ "Par défaut, les nouveaux périphériques utilisent l'ensemble de vos "
+#~ "disques sélectionnés.\n"
+#~ "\n"
+#~ "Vous pouvez modifier sur quel disque un nouveau périphérique peut être "
+#~ "alloué en cliquant sur le bouton de configuration (celui avec des outils "
+#~ "graphiques) même si ce périphérique est sélectionné.\n"
+#~ "\n"
+#~ "Lorsque que ajoutez un nouveau point de montage en cliquant sur le bouton "
+#~ "« - », laissez en blanc la taille pour permettre au nouveau périphérique "
+#~ "d'utiliser tout l'espace disponible.\n"
+#~ "\n"
+#~ "Lorsque vous supprimer le dernier périphérique depuis un conteneur comme "
+#~ "un groupe de volumes LVM, nous supprimerons automatiquement ce conteneur "
+#~ "pour faire place à de nouveaux périphériques.\n"
+#~ "\n"
+#~ "Lorsque que la dernière partition d'un disque est supprimée, ce disque "
+#~ "peut être réinitialisé avec une nouvelle table de partition si l'on pense "
+#~ "qu'il y a un type plus approprié pour ce disque.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "CONFIGURATION DU RÉSEAU"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Erreur lors du téléchargement des métadonnées du paquet..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Rien de sélectionné"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Microprogramme manquant"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Authentification requise"
+
+#~ msgid "column"
+#~ msgstr "colonne"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Type de partition :</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>URL du proxy</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Nom d'utilisateur</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Mot de passe</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Ce point de montage est invalide. Voulez-vous en essayer un autre ?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Label:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Système de fichiers :</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Périphérique RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Configurer le point de montage sélectionné."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Cliquez pour avoir de l'aide"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ESPACE DISPONIBLE</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ESPACE TOTAL</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Terminé"
 
@@ -4511,41 +6562,9 @@ msgstr "Fermé"
 #~ msgid "Install on System"
 #~ msgstr "Installer sur le système"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "L'erreur suivante s'est produite lors de la configuration des dépôts "
-#~ "d'installation : \n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "L'installation ne peut pas continuer."
-
 #~ msgid "Exit installer"
 #~ msgstr "Quitter le programme d'installation"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "L'installation a été interrompue à cause de ce qui semble être un "
-#~ "problème avec votre matériel. Le message d'erreur exact est : \n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "Le programme d'installation va maintenant s'arrêter."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Erreur matériel rencontrée"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Quitter le programme d'installation"
 
@@ -4855,9 +6874,6 @@ msgstr "Fermé"
 #~ msgid "Software Development"
 #~ msgstr "Développement logiciel"
 
-#~ msgid "Web Server"
-#~ msgstr "Serveur Web"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimale"
 
@@ -4904,51 +6920,6 @@ msgstr "Fermé"
 #~ "logiques ne pouvant pas être effacées :\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Aucune partition racine (/) n'a été définie. Cette partition est "
-#~ "nécessaire pour que l'installation de %s puisse se poursuivre."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Votre partition racine est inférieure à 250 Mio, ce qui est normalement "
-#~ "trop petit pour installer %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Cette plate-forme exige un /boot sur une partition dédiée ou un volume "
-#~ "logique. Si vous ne souhaitez pas de partition /boot, vous devez placer / "
-#~ "dans une partition dédiée non-LVM."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "La taille de votre partition %(mount)s est inférieure à %(size)s Mio, ce "
-#~ "qui est inférieur à la taille recommandée pour une installation normale "
-#~ "de %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Votre partition %(mount)s est trop petite pour formater en %(format)s (la "
-#~ "taille permise est de %(minSize)d Mio à %(maxSize)d Mio)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Votre partition %(mount)s est trop grande pour formater en %(format)s (la "
-#~ "taille permise est de %(minSize)d Mio à %(maxSize)d Mio)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4967,60 +6938,6 @@ msgstr "Fermé"
 #~ "Vous n'avez pas créé de périphérique cible pour le chargeur d'amorçage "
 #~ "stage1"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Vous n'avez pas créé de partition amorçable."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Votre système BIOS nécessite une partition spéciale pour démarrer le "
-#~ "nouveau disque %s au format GPT. Pour continuer, veuillez créer une "
-#~ "partition de type « BIOS Boot » de 1 Mio."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Vous n'avez pas défini de partition swap. %(requiredMem)s Mio de mémoire "
-#~ "vive est nécessaire pour continuer l'installation sans partition swap, "
-#~ "mais vous n'avez que %(installedMem)s Mio."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Aucune partition swap n'a été indiquée. Bien qu'elle ne soit pas "
-#~ "indispensable, elle améliore nettement les performances de la plupart des "
-#~ "installations."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Au moins une de vos partitions swap n'a pas de UUID, ce qui était courant "
-#~ "pour les partitions swap créées avec l'ancienne version de mkswap. Ces "
-#~ "partitions seront définies par leurs chemins dans /etc/fstab, ce qui "
-#~ "n'est pas idéal car ces chemins peuvent être modifiés suivant les "
-#~ "circonstances."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Ce point de montage n'est pas valide. Le répertoire %s doit être dans le "
-#~ "système de fichiers racine /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "Le point de montage « %s » doit être associé à un système de fichiers "
-#~ "linux."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux sur %s"
 
@@ -5030,11 +6947,6 @@ msgstr "Fermé"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s pour %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatage du périphérique DASD"
-#~ msgstr[1] "Formatage des périphériques DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] ""
@@ -5331,9 +7243,6 @@ msgstr "Fermé"
 #~ msgid "Error setting root password"
 #~ msgstr "Erreur lors de la configuration du mot de passe administrateur"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Vous devez fournir et confirmer un mot de passe."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Supprimer des paquets"
 
@@ -5367,24 +7276,12 @@ msgstr "Fermé"
 #~ msgid "%s of %s"
 #~ msgstr "%s de %s"
 
-#~ msgid "Region:"
-#~ msgstr "Région :"
-
-#~ msgid "City:"
-#~ msgstr "Ville :"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-heure"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Choisissez vos add-on"
 
@@ -5475,9 +7372,6 @@ msgstr "Fermé"
 #~ msgid "configureButton"
 #~ msgstr "Bouton « configurer »"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Fin du partitionnement"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "CONFIGURATION DU GROUPE DE VOLUMES"
 
diff --git a/anaconda/po/gl.po b/anaconda/po/gl.po
index 57e91d1..7e440ec 100644
--- a/anaconda/po/gl.po
+++ b/anaconda/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/fedora/language/"
@@ -19,208 +19,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Iniciar VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr ""
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Aceptar"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -229,85 +462,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -316,7 +841,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -329,8 +859,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rescate"
 
@@ -368,28 +898,22 @@ msgstr ""
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Aceptar"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Saír"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -402,7 +926,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -411,28 +935,203 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr ""
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr ""
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"A partición raíz ten menos de 250 megabytes o cal é normalmente moi pouco "
+"para instalar %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"A partición raíz ten menos de 250 megabytes o cal é normalmente moi pouco "
+"para instalar %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -523,84 +1222,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Precisa máis espacio nos seguintes sistemas de ficheiros:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Progreso da Instalación"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Progreso da Instalación"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Erro"
 
@@ -624,31 +1468,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -659,446 +1505,519 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "O contrasinal debe ter como mínimo seis caracteres de lonxitude."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "O contrasinal debe ter como mínimo seis caracteres de lonxitude."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Progreso da Instalación"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Iniciar VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progreso da Instalación"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Advertencia"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1113,580 +2032,404 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1713,277 +2456,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1991,14 +2757,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2007,128 +2773,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Aceptar"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2139,68 +2925,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2208,945 +3089,1347 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continuar"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Aceptar"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+msgid "Use Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Engadir"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Continuar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Continuar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Continuar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Conectado!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Advertencia"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Engadir"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Engadir"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Engadir"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3154,641 +4437,1003 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dispositivo RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Engadir"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Aceptar"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Progreso da Instalación"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr ""
 
@@ -3804,40 +5449,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3846,60 +5492,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Erro"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Precisa máis espacio nos seguintes sistemas de ficheiros:\n"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispositivo RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Completado"
 
@@ -3914,10 +5567,3 @@ msgstr ""
 
 #~ msgid "required package"
 #~ msgstr "paquete requirido"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "A partición raíz ten menos de 250 megabytes o cal é normalmente moi pouco "
-#~ "para instalar %s."
diff --git a/anaconda/po/gu.po b/anaconda/po/gu.po
index 2a134a0..d03c620 100644
--- a/anaconda/po/gu.po
+++ b/anaconda/po/gu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ફાઇલસિસ્ટમ"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "RAID સુયોજિત કરે છે તે '%s' ને સમાવતા પાસે નીચેનાં raid સ્તરોનું એક હોવુ જ જોઇએ: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -43,7 +43,7 @@ msgstr ""
 "RAID સુયોજિત કરે છે તે '%s' ને સમાવતા પાસે નીચેની મેટાડેટા આવૃત્તિઓમાંની એક હોવી જ જોઇએ: "
 "%s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -51,190 +51,453 @@ msgid ""
 msgstr ""
 "RAID સુયોજિત કરે છે તે '%s' ને સમાવતા પાસે નીચેનાં ઉપકરણ પ્રકારોમાંનુ એક હોવુ જ જોઇએ: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s પાસે નીચેનાં ડિસ્કલેબલ પ્રકારોમાંનુ એક હોવુ જ જોઇએ: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s એ પ્રકાર %s નુ થઇ શકતુ નથી."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s એ %d અને %d MB માપમાં હોવા જ જોઇએ"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s એ %dMB કરતા નાનુ હોવુ જ જોઇએ નહિં."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s એ %dMB કરતા વધારે હોવુ જોઇએ નહિં."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s એ ડિસ્કની પ્રથમ %dMB માં હોવુ જ જોઇએ."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ને એનક્રિપ્ટ થયેલ બ્લોક ઉપકરણ પર કરી શકાતુ નથી."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s એ પ્રકાર %s નુ થઇ શકતુ નથી"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC શરુ કરો"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "લખાણ સ્થિતિ વાપરો"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "પાસવર્ડ સુયોજિત છે."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "પાસવર્ડ બંધબેસતો નથી!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "તમને નબળો પાસવર્ડ પૂરો પાડેલ છે: %s. "
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "તમને નબળો પાસવર્ડ પૂરો પાડેલ છે: %s. "
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "નબળું"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "વ્યાજબી"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "સારુ"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "મજબૂત"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "બરાબર"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "હાં (_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "ના (_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"નીચેની ભૂલ ઉદ્ભવી જ્યારે સ્થાપન રિપોઝીટરીને સુયોજિત કરી રહ્યા હોય:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"સ્થાપનને ચાલુ રાખી શકાતુ નથી."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"નીચેની ભૂલ ઉદ્ભવી જ્યારે સ્થાપન રિપોઝીટરીને સુયોજિત કરી રહ્યા હોય:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"સ્થાપનને ચાલુ રાખી શકાતુ નથી."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"તમારાં હાર્ડવેર સાથે કંઇક સમસ્યાને કારણે સ્થાપન બંધ થઇ ગયુ હતુ. ચોક્કસ ભૂલ સંદેશો આ છે:\n"
+"\n"
+"%s.\n"
+"\n"
+" સ્થાપકનો હવે અંત આવી જશે."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"તમારાં હાર્ડવેર સાથે કંઇક સમસ્યાને કારણે સ્થાપન બંધ થઇ ગયુ હતુ. ચોક્કસ ભૂલ સંદેશો આ છે:\n"
+"\n"
+"%s.\n"
+"\n"
+" સ્થાપકનો હવે અંત આવી જશે."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "હાર્ડવેર ભૂલ શોધાઇ"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"તમારાં હાર્ડવેર સાથે કંઇક સમસ્યાને કારણે સ્થાપન બંધ થઇ ગયુ હતુ. ચોક્કસ ભૂલ સંદેશો આ છે:\n"
+"\n"
+"%s.\n"
+"\n"
+" સ્થાપકનો હવે અંત આવી જશે."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "રૂપરેખાંકન URL (_C)"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "પૂર્વ-સ્થાપન સ્ક્રિપ્ટો ચાલી રહી છે"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરી રહ્યા છે..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "સ્થાપન પછીનાં રૂપરેખાંકનને ચાલુ કરી રહ્યા છે"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -246,87 +509,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "આ ફાઇલ સિસ્ટમ લેબલોને આધાર આપતુ નથી."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "પૂર્વ-સ્થાપન સ્ક્રિપ્ટો ચાલી રહી છે"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "યજમાનનું નામ ૨૫૫ અથવા તેનાથી ઓછા અક્ષરો જેટલું હોવું જોઈએ."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"યજમાનનું નામ યોગ્ય અક્ષરો કે જે a-z', 'A-Z' અથવા '૦-૯' ના વિસ્તારમાં હોય તેનાથી શરુ થવું "
-"જોઈએ"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "જોડાઇ રહ્યા છે..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "જોડાણ તૂટી રહ્યુ છે..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "જોડાયેલ નથી"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "નેટવર્ક ઉપકરણો ઉપલબ્ધ નથી"
 
@@ -335,7 +888,12 @@ msgstr "નેટવર્ક ઉપકરણો ઉપલબ્ધ નથી"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "નવું %s %s સ્થાપન"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "સિસ્ટમને અનમાઉન્ટ કરવા માટે %s ને ચલાવો જ્યારે તમે સમાપ્ત થાઓ."
@@ -349,8 +907,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "/bin/sh ચલાવવાનુ શોધવામાં અસમર્થ!  શેલ ની શરૂઆત નથી કરી રહ્યા"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "જોખમ"
 
@@ -388,21 +946,15 @@ msgstr "જોખમી સિસ્ટમ"
 msgid "Which device holds the root partition of your installation?"
 msgstr "કયો ઉપકરણ તમારા રુટ પાર્ટીશનના સ્થાપનને પકડી રાખશે?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "બરાબર"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "બહાર નીકળો"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "સિસ્ટમ આપમેળે રિબુટ થઇ જશે જ્યારે તમે શેલમાંથી બહાર નીકળો."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -412,7 +964,7 @@ msgstr ""
 "મેળવવા માટે પાછા જાઓ બટનને દબાવો કે જેમાંથી તમે તમારા પાર્ટીશનો માઉન્ટ અને fsck કરી "
 "શકો છો. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -433,7 +985,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -446,29 +998,219 @@ msgstr ""
 "\n"
 "શેલને મેળવવા માટે <return> દબાવો."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "તમારી પાસે કોઇપણ Linux પાર્ટીશનો નથી. રીબુટ કરી રહ્યા છે.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " સિસ્ટમ આપમેળે રિબુટ થઇ જશે જ્યારે તમે શેલમાંથી બહાર નીકળો."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "જોખમી સ્થિતિ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "તમારી પાસે કોઇપણ Linux પાર્ટીશનો નથી. શેલને મેળવવા માટે પાછા જાઓ બટનને દબાવો.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "તમારી સિસ્ટમ %s ડિરેક્ટરી હેઠળ માઉન્ટ થયેલ છે."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "મૂળભૂત પાર્ટીશન"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "ડિસ્ક"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"તમારુ રુટ પાર્ટીશન એ ૨૫૦ મેગાબાઈટ કરતાં ઓછું છે કે જે %s સ્થાપિત કરવા માટે ખૂબ નાનું છે."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"તમે રુટ પાર્ટીશન (/) વ્યાખ્યાયિત નથી કર્યું, કે જે %s નું સ્થાપન ચાલુ રાખવા માટે જરુરી છે."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"આ પ્લેટફોર્મને સમર્પિત પાર્ટીશન અથવા લોજિકલ વોલ્યુમ પર /boot ની જરૂર છે. જો તમે /boot "
+"વોલ્યુમને ઇચ્છતા ન હોય તો, તમારે સમર્પિત બિન-LVM પાર્ટીશન પર  / ને સ્થિત કરવુ જ જોઇએ."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"તમારુ %(mount)s પાર્ટીશન એ %(size)s મેગાબાઈટ કે જે સામાન્ય %(productName)s ના "
+"સ્થાપન માટે જરુરી છે તેના કરતાં નાનું છે."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"તમારુ %(mount)s પાર્ટીશન %(format)s બંધારણ માટે ઘણુ નાનું છે (પરવાનગી મળેલ મારે એ "
+"%(minSize)d MB થી %(maxSize)d MB નુ છે)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"તમારુ %(mount)s પાર્ટીશન %(format)s બંધારણ માટે ઘણુ મોટુ છે (પરવાનગી મળેલ માપ એ "
+"%(minSize)d MB થી %(maxSize)d MB નુ છે)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "નવાં ઉપકરણને ઉમેરવામાં નિષ્ફળતા. વિગતો માટે ક્લિક કરો."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "તમે બુટ કરી શકાય તેવા પાર્ટીશન બનાવતા નથી."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"તમે સ્વેપ પાર્ટીશનને સ્પષ્ટ કર્યુ નથી. %(requiredMem)s MB મેમરી સ્વેપ પાર્ટીશન વગર સ્થાપનને "
+"ચાલુ રાખવા માટે જરૂરી છે, પરંતુ તમારી પાસે ફક્ત %(installedMem)s MB છે."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"તમે સ્વેપ પાર્ટીશન સ્પષ્ટ કરેલ નથી. પરંતુ બધા કિસ્સાઓમાં તે જરુરી નથી, તે સાંકેતિક રીતે મોટા "
+"ભાગના સ્થાપનોનું પરિણામ સુધારે છે."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"તમારા સ્વેપ ઉપકરણોની ઓછામાં ઓછા એક પાસે UUID નથી, કે જે mkswap ની જૂની આવૃત્તિઓની "
+"મદદથી બનાવેલ સ્વેપ જગ્યામાં સામાન્ય છે. આ ઉપકરણોનો /etc/fstab માં ઉપકરણ પાથ દ્દારા "
+"સંદર્ભ લીધેલ છે, કે જે નિષ્ક્રિય નથી જ્યાં સુધી ઉપકરણ પાથ વિવિધ પરિસ્થિતિઓ હેઠળ બદલી શકાય."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "આ માઉન્ટ બિંદુ અયોગ્ય છે.  %s ડિરેક્ટરી / file સિસ્ટમ પર હોવી જ જોઇએ."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "માઉન્ટ બિંદુ %s એ linux ફાઇલ સિસ્ટમ પર હોવુ જ જોઇએ."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "પાસફ્રેઝ:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -580,84 +1322,234 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "ફેડોરા (_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરતી વખતે નિષ્ફળતા"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "પેકેજ મેટાડેટાને ડાઉનલોડ કરી રહ્યા હોય ત્યારે ભૂલ..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "સ્થાપન સ્ત્રોત ઉપલબ્ધ નથી"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "સોફ્ટવેરને સ્થાપિત કરી રહ્યા છે"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "પેકેજ સ્થાપન પ્રક્રિયાને શરૂ કરી રહ્યા છે"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "નીચેની ફાઈલ સિસ્ટમો પર તમારે વધુ જગ્યાની જરૂર છે:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "સ્થાપન સ્રોતમાંથી પરિવહન તૈયાર કરી રહ્યા છીએ"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "સ્થાપિત કરી રહ્યા છે"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "પેકેજ મેટાડેટાને ડાઉનલોડ કરી રહ્યા છે..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "સ્થાપિત કરી રહ્યા છે"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "સ્થાપિત કરવા માટે તૈયાર કરી રહ્યા છે"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "સંગ્રહ રૂપરેખાંકનને ચકાસી રહ્યા છે..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "DEFAULT TITLE"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOCALIZATION"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOCALIZATION"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "સિસ્ટમ"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "સ્થાપન હબ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "આપમેળે સ્થાપન શરૂ કરી રહ્યા છે"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "આદેશ વાક્ય સ્થિતિમાં કોઈ પ્રશ્ન નથી!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "મૂળભૂત HUB શીર્ષક"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ભૂલ"
 
@@ -681,31 +1573,34 @@ msgstr "હાં"
 msgid "no"
 msgstr "ના"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "શું તમે ખરેખર બહાર નીકળવા માંગો છો?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -720,219 +1615,258 @@ msgstr ""
 "માટે VNC શરુ કરવા માંગો છો અને ગ્રાફિકવાળું સ્થાપન શરુ કરવા માંગો છો અથવા લખાણવાળી "
 "સ્થિતિ સાથે સ્થાપન ચાલુ રાખવા માંગો છો?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC પાસવર્ડ"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "મહેરબાની કરીને VNC પાસવર્ડ દાખલ કરો. તમે તેને બે વાર લખવુ પડશે. \n"
 "પાસવર્ડ માટે ખાલી જગ્યા છોડો નહિં"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "પાસવર્ડ:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "પાસવર્ડ (ખાતરી): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "પાસવર્ડ બંધબેસતો નથી!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "પાસવર્ડ ઓછામાં ઓછો ૬ અક્ષરોની લંબાઈનો હોવો જ જોઈએ."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "પાસવર્ડ ઓછામાં ઓછો ૬ અક્ષરોની લંબાઈનો હોવો જ જોઈએ."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "ટાઇમઝોન સુયોજનો"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "ટાઇમઝોન સુયોજિત નથી."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "ઉપલબ્ધ વિસ્તારો"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "ઉપલબ્ધ વિસ્તારો"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "સંગ્રહ રૂપરેખાંકનને ચકાસી રહ્યા છે..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "યજમાનનામ"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "યજમાનનામ"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "યજમાનનામ"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "રૂપરેખાંકનને સમાપ્ત કરો (_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "ગેટવે"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ફાઇલસિસ્ટમ રૂપરેખાંકન ગુમ થયેલ પ્રકાર"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "રુટ પાસવર્ડ:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "પાસવર્ડ સુયોજિત છે."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "રુટ ખાતુ નિષ્ક્રિય થયેલ છે."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "પાસવર્ડ સુયોજિત નથી."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "મહેરબાની કરીને નવાં રુટ પાસવર્ડને પસંદ કરો. તમે તેને બે વાર લખવો જ પડશે."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "પાસવર્ડ:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "બધી જગ્યાને વાપરો"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "હાલની Linux સિસ્ટમ (ઓ) ને બદલો"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "ખાલી જગ્યાને વાપરો"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "સ્થાપન લક્ષ્ય"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "ડિસ્કો પસંદ થયેલ નથી"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "સંગ્રહ રૂપરેખાંકને ચકાસી રહ્યા હોય ત્યારે ભૂલ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "સંગ્રહ રૂપરેખાંકને ચકાસી રહ્યા હોય ત્યારે ભૂલ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "આપમેળે પાર્ટીશનીંગ પસંદ થયેલ છે"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "વૈવિધ્ય પાર્ટીશનીંગ પસંદ થયેલ છે"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -940,256 +1874,295 @@ msgstr ""
 "ડિસ્ક શોધાયેલ નથી. મહેરબાની કરીને કમ્પ્યૂટરને બંધ કરો, ઓછામાં ઓછુ એક ડિસ્કને જોડો. અને "
 "સ્થાપનને સમાપ્ત કરવા માટે પુન:શરૂ કરો."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "ડિસ્ક પસંદ થયેલ નથી; મહેરબાની કરીને તેમાં સ્થાપિત કરવા માટે ઓછામાં ઓછુ એક પસંદ કરો."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "સુધારેલ સંગ્રહ રૂપરેખાંકનને ઉત્પન્ન કરી રહ્યા છે"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "સંગ્રહ રૂપરેખાંકન નિષ્ફળ: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "સંગ્રહ રૂપરેખાંકનને ચકાસી રહ્યા છે..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "પાર્ટીશન યોજના રૂપરેખાંકન"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "પાર્ટીશન યોજના રૂપરેખાંકન"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "ટાઇમઝોન સુયોજનો"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s ટાઇમઝોન"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "ટાઇમઝોન સુયોજિત નથી."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "ઉપલબ્ધ વિસ્તારો"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC શરુ કરો"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "સ્થાપન પ્રગતિ"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "નજીકનું મિરર"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS સર્વર %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "સોફ્ટવેર સ્ત્રોતને સુયોજિત કરી રહ્યા હોય ત્યારે ભૂલ"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "કંઇ જ પસંદ થયેલ નથી"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "જોડાઇ રહ્યા છે..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD ડ્રાઇવ"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO file (_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "નેટવર્ક સમય"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "સ્થાપન સ્ત્રોત ઉપલબ્ધ નથી"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરતી વખતે નિષ્ફળતા"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "પેકેજ મેટાડેટાને ડાઉનલોડ કરી રહ્યા હોય ત્યારે ભૂલ..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "સ્થાપન સ્ત્રોત ઉપલબ્ધ નથી"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS સર્વર %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS માઉન્ટ વિકલ્પો:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરવામાં નિષ્ફળતા, repo url ને ચકાસો"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "ઉપકરણ /boot ને સમાવી રહ્યુ છે"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરતી વખતે નિષ્ફળતા"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "સોફ્ટવેર પસંદગીને બદલો (_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "સોફ્ટવેર પસંદગીને ચકાસી રહ્યા હોય ત્યારે ભૂલ"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "સ્થાપન સ્ત્રોત સુયોજિત નથી"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "વૈવિધ્ય સોફ્ટવેર પસંદ થયેલ છે"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "સ્થાપન સ્ત્રોત સુયોજિત નથી"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "તમારા પર્યાવરણને પસંદ કરો"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "સત્તાધિકરણ વાપરો (_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "આ વપરાશકર્તા માટે પાસવર્ડની ખાતરી અને દાખલ કરવો જ જોઇએ."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ચેતવણી"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1205,593 +2178,419 @@ msgstr "પ્રગતિમાં છે"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "પરિસ્થિતિને ચકાસી રહ્યા છે..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "નવું ઉપકરણ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "પાસવર્ડ (ખાતરી): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "તમને નબળો પાસવર્ડ પૂરો પાડેલ છે: %s. "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "તમને નબળો પાસવર્ડ પૂરો પાડેલ છે: %s. "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "પાસવર્ડ સુયોજિત છે."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "સ્થાપકમાંથી બહાર નીકળો (_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "બહાર નીકળો (_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "ના (_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "હાં (_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "DEFAULT TITLE"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOCALIZATION"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOCALIZATION"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "સિસ્ટમ"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "પૂર્ણ!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "પૂર્ણ!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "નવું %s %s સ્થાપન"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "સ્તંભ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr "ઉપકરણ પુન:રૂપરેખાંકન નિષ્ફળ. વિગતો માટે ક્લિક કરો."
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "મહેરબાની કરીને માન્ય માઉન્ટબિંદુને દાખલ કરો."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "તે માઉન્ટ બિંદુ અયોગ્ય છે. બીજુ કંઇક પ્રયતન કરો?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "મહેરબાની કરીને માન્ય માઉન્ટબિંદુને દાખલ કરો."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "તે માઉન્ટ બિંદુ અયોગ્ય છે. બીજુ કંઇક પ્રયતન કરો?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "મૂળભૂત પાર્ટીશન"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "ડિસ્ક"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "કંઈ નહિં"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "તમારે રુટ ઉપકરણ પર નવી ફાઇલસિસ્ટમને બનાવવી જ જોઇએ."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "MANUAL PARTITIONING"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d સંગ્રહ ઉપકરણ પસંદ થયેલ છે"
 msgstr[1] "%d સંગ્રહ ઉપકરણો પસંદ થયેલ છે"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi એ ઉપકરણ પ્રકાર %s પર હોવુ જ જોઇએ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s એ ઉપકરણનાં પ્રકાર %s પર હોવુ જ જોઇએ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s ને એનક્રિપ્ટ કરી શકાતુ નથી"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "તમારે રુટ ઉપકરણ પર નવી ફાઇલસિસ્ટમને બનાવવી જ જોઇએ."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "ઉપકરણનો પ્રકાર %s ને યોગ્ય RAID સ્તર પસંદગીની જરૂર છે."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "ઉપકરણ પુન:માપ બદલવાની સૂચના નિષ્ફળ. વિગતો માટે ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "ઉપકરણ પુન:બંધારણ સૂચના નિષ્ફળ. વિગતો માટે ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "આ ફાઇલ સિસ્ટમ લેબલોને આધાર આપતુ નથી."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "ડિસ્કો પસંદ થયેલ નથી"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "આ ફાઇલ સિસ્ટમનું માપ બદલી શકાતુ નથી."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "સંગ્રહ રૂપરેખાંકને ચકાસી રહ્યા હોય ત્યારે ભૂલ. વિગતો માટે ક્લિક કરો."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "સંગ્રહ રૂપરેખાંકને ચકાસી રહ્યા હોય ત્યારે ભૂલ. વિગતો માટે ક્લિક કરો."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "નવાં ઉપકરણને ઉમેરવામાં નિષ્ફળતા. વિગતો માટે ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs મુક્ત"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "ડિસ્કો પસંદ થયેલ નથી."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "પસંદ થયેલ ડિસ્કો પર મુક્ત જગ્યા નથી."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "આપમેળે પાર્ટીશન કરવાનું નિષ્ફળ. વિગતો માટે ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "સોફ્ટવેર પસંદગીને બદલો (_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATE & TIME"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "અયોગ્ય ટાઇમઝોન"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "તમારી પાસે રૂપરેખાંકિત થયેલ કામ કરતુ NTP સર્વર નથી"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "INSTALLATION DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d સંગ્રહ ઉપકરણ પસંદ થયેલ છે"
+msgstr[1] "%d સંગ્રહ ઉપકરણો પસંદ થયેલ છે"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KEYBOARD"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "લેઆઉટ રૂપરેખાંકન ચકાસણી ઉપલબ્ધ નથી."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "પરિસ્થિતિને ચકાસી રહ્યા છે..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "લેઆઉટ બદલવાનું રૂપરેખાંકિત થયેલ નથી."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "ભાષા"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "અજ્ઞાત સ્થિતિ (ગેરહાજર)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "અજ્ઞાત સ્થિતિ"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "અસંચાલિત"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "બિનઉપલબ્ધ"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "ફર્મવેર ગેરહાજર"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "કૅબલ પ્લગ થયેલ નથી"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "બિનઉપલબ્ધ"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "જોડાણ તૂટી ગયું"
@@ -1816,289 +2615,318 @@ msgstr "જોડાણ તૂટી રહ્યુ છે"
 msgid "Connection failed"
 msgstr "જોડાણ નિષ્ફળ"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "પ્લગ થયેલ નથી"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "ઇથરનેટ"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "વાયરલેસ"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "પ્લગ થયેલ નથી"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 સરનામું"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 સરનામું"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP સરનામું"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "એન્ટરપ્રાઇઝ"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "કંઈ નહિં"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "સત્તાધિકારની જરુરિયાત છે"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "પાસવર્ડ:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT PASSWORD"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "પાસવર્ડ સુયોજિત છે."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "રુટ પાસવર્ડ સુયોજિત છે"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "રુટ ખાતુ નિષ્ક્રિય થયેલ છે"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "રુટ પાસવર્ડ સુયોજિત નથી"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "સોફ્ટવેર પસંદગી"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "સોફ્ટવેર નિર્ભરતાને ચકાસી રહ્યા છે..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "સોફ્ટવેર નિર્ભરતાને ચકાસી રહ્યા હોય ત્યારે ભૂલ"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "પેકેજ મેટાડેટાને ડાઉનલોડ કરી રહ્યા છે..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "જૂથ મેટાડેટાને ડાઉનલોડ કરી રહ્યા છે..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "સોફ્ટવેર નિર્ભરતાને ચકાસી રહ્યા છે..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "સોફ્ટવેર નિર્ભરતાને ચકાસી રહ્યા હોય ત્યારે ભૂલ"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "સોફ્ટવેર નિર્ભરતાને ચકાસી રહ્યા હોય ત્યારે ભૂલ, વિગતો માટે ક્લિક કરો"
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "રદ કરો (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "સોફ્ટવેર સ્ત્રોતને બદલો (_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "સોફ્ટવેર પસંદગીને બદલો (_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરી રહ્યા છે..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "પેકેજ મેટાડેટાને ડાઉનલોડ કરી રહ્યા હોય ત્યારે ભૂલ..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "સત્તાધિકારની જરુરિયાત છે"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "આ મીડિયાને તેમાંથી સ્થાપિત કરવાનુ સારુ નથી."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "આ મીડિયાને તેમાંથી સ્થાપિત કરવાનુ સારુ નથી."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "સ્થાપન સ્ત્રોત"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરવામાં નિષ્ફળતા, repo url ને ચકાસો"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "રીપોઝીટરી ઉપર સુયોજિત કરવા દરમિયાન ભૂલ"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "સોફ્ટવેર સ્ત્રોતને સુયોજિત કરી રહ્યા હોય ત્યારે ભૂલ"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "સ્થાપન સ્ત્રોતને સુયોજિત કરતી વખતે નિષ્ફળતા, repo url અને પ્રોક્સી સુયોજનોને ચકાસો"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "રીપોઝીટરી ઉપર સુયોજિત કરવા દરમિયાન ભૂલ"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "સોફ્ટવેર સ્ત્રોતને સુયોજિત કરી રહ્યા હોય ત્યારે ભૂલ"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "ઉપકરણ:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS સર્વર %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "અયોગ્ય ટાઇમઝોન"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "અયોગ્ય ટાઇમઝોન"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "અયોગ્ય ટાઇમઝોન"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2106,14 +2934,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2122,132 +2950,156 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "INSTALLATION DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "સંગ્રહ રૂપરેખાંકનને સંગ્રહી રહ્યા છે..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "સંગ્રહ રૂપરેખાંકનને સંગ્રહ કરવામાં નિષ્ફળતા..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ઉપકરણનું બંધારણ કરી રહ્યા છે"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "સંગ્રહ રૂપરેખાંકને ચકાસી રહ્યા હોય ત્યારે ભૂલ. વિગતો માટે ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "સંગ્રહ રૂપરેખાંકને ચકાસી રહ્યા હોય ત્યારે ભૂલ. વિગતો માટે ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs મુક્ત"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "સંગ્રહ લેઆઉટને બદલો (_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "બરાબર"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "NETWORK CONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "અયોગ્ય ટાઇમઝોન"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s માં સ્વાગત છે."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "માહિતી"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "આપમેળે થીમને બનાવવા અહિંયા ક્લિક કરો."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2258,69 +3110,171 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "બુટ ઉપકરણ તરીકે સુયોજિત કરો (_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "સ્તંભ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "માઉન્ટ બિંદુ %s એ linux ફાઇલ સિસ્ટમ પર હોવુ જ જોઇએ."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "મહેરબાની કરીને માન્ય માઉન્ટબિંદુને દાખલ કરો."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "તે માઉન્ટ બિંદુ અયોગ્ય છે. બીજુ કંઇક પ્રયતન કરો?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "તમારે રુટ ઉપકરણ પર નવી ફાઇલસિસ્ટમને બનાવવી જ જોઇએ."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "અયોગ્ય ટાઇમઝોન"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "તમે નબળો પાસફ્રેજને પૂરો પાડેલ છે: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "પાસફ્રેજ બંધબેસતા નથી."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "સાચવો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "સંકોચો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "કાઢી નાંખો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s પર %(type)s ને બનાવી રહ્યા છે"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "તૈયાર નથી"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "ખાલી જગ્યાને વાપરો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2328,989 +3282,1445 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "કાઢી નાંખો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "સાચવો"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "વિતરણ સ્થાપન"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "નવું ઉપકરણ"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "નવું પસંદકર્તા"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "ચાલુ રાખો (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "ફેરફારો લાગુ કરો (_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NETWORK CONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "જૂથ નામ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "બરાબર"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATE & TIME"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "વેબ સર્વર"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "કામ કરવું"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "વપરાશમાં"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "રૂપરેખાંકિત કરો (_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATE & TIME"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "વિસ્તાર:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "વિસ્તાર:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "શહેર:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "શહેર:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "નેટવર્ક નામ (_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "નેટવર્ક નામ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-કલાક"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "INSTALLATION DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ક્ષમતા"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "જોડાયેલ નથી"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "પસંદ થયેલ ઉપકરણ"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "કંઇ જ પસંદ થયેલ નથી"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>લેબલ:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "ફર્મવેર ગેરહાજર"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "ના (_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN પ્રકાર"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "પસંદ થયેલ ઉપકરણ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "સારાંશ"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ઉપકરણ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "ઉમેરો (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "મૂળભૂત માર્ગ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "સબનેટ માસ્ક"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "ઝડપ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "હાર્ડવેર સરનામું"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "રૂપરેખાંકિત કરો (_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "સુરક્ષા"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "નેટવર્ક નામ (_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "નેટવર્ક નામ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "સુરક્ષા કી"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "હૉટસ્પોટ તરીકે વાપરો (_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "હૉટસ્પોટ બંધ કરો (_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "રૂપરેખાંકિત કરો (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "પોષણકર્તા"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "રૂપરેખાંકિત કરો (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN પ્રકાર"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "ગેટવે"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "જૂથ નામ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "જૂથ પાસવર્ડ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "વપરાશકર્તાનામ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "રૂપરેખાંકિત કરો (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "પદ્દતિ (_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "રૂપરેખાંકન URL (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP પ્રોક્સી (_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS પ્રોક્સી (_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP પ્રોક્સી (_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Socks યજમાન (_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "સંગ્રહ રૂપરેખાંકનને ચકાસી રહ્યા છે..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "તાળું ખોલો"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "ઍરપ્લેન સ્થિતિ (_p)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "સંગ્રહ રૂપરેખાંકનને ચકાસી રહ્યા છે..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "યજમાનનામ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NETWORK CONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "મૂળભૂત માર્ગ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "સબનેટ માસ્ક"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "ઝડપ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "હાર્ડવેર સરનામું"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "રૂપરેખાંકિત કરો (_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "સુરક્ષા"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "નેટવર્ક નામ (_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "નેટવર્ક નામ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "સુરક્ષા કી"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "હૉટસ્પોટ તરીકે વાપરો (_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "હૉટસ્પોટ બંધ કરો (_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "રૂપરેખાંકિત કરો (_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "પોષણકર્તા"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN પ્રકાર"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "ગેટવે"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "જૂથ નામ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "જૂથ પાસવર્ડ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "વપરાશકર્તાનામ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "પદ્દતિ (_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "રૂપરેખાંકન URL (_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP પ્રોક્સી (_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS પ્રોક્સી (_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP પ્રોક્સી (_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Socks યજમાન (_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "તાળું ખોલો"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "ઍરપ્લેન સ્થિતિ (_p)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "યજમાનનામ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "સત્તાધિકરણ વાપરો (_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "સત્તાધિકારની જરુરિયાત છે"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "જોડાયેલ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "સોફ્ટવેર પસંદગી"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "તમારા પર્યાવરણને પસંદ કરો"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "સ્તંભ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "વધારે ડિસ્કો રદ કરો અને ઉમેરો (_a)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "સ્થાપન વિકલ્પો"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-#, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>પાર્ટીશન પ્રકાર:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "વૈવિધ્ય પાર્ટીશનીંગ પસંદ થયેલ છે"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "સ્થાપન વિકલ્પો"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "ડિસ્ક મુક્ત"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "વપરાશ માટે મુક્ત જગ્યા ઉપલબ્ધ છે."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs મુક્ત"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "ખાલી જગ્યાને વાપરો"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "સ્થાપકમાંથી બહાર નીકળો (_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "ઉપકરણ વર્ણન"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "સ્થાનિક મૂળભૂત ડિસ્ક"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "પાર્ટીશનીંગને સમાપ્ત કરો (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "એનક્રિપ્ટ (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "આપમેળે પાર્ટીશનીંગ પસંદ થયેલ છે"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "પાર્ટીશનીંગને સમાપ્ત કરો (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "એનક્રિપ્ટ (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "વિકલ્પો (_O)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "સારાંશ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "સંપૂર્ણ ડિસ્ક સારાં અને વિકલ્પો..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "કિબોર્ડ લેઆઉટને ઉમેરો"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "નામ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "કિબોર્ડ લેઆઉટ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "નામ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "લેઆઉટને ઉમેરો"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "લેઆઇટ દૂર કરો"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "પસંદ થયેલ લેઆઉટને ઉપર ખસેડો"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "લેઆઉટને ઉમેરો"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "લેઆઇટ દૂર કરો"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "પસંદ થયેલ લેઆઉટને ઉપર ખસેડો"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "પસંદ થયેલ લેઆઉટને નીચે ખસેડો"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "લેઆઉટ પૂર્વદર્શન"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "લેઆઉટ રૂપરેખાંકન ચકાસણી ઉપલબ્ધ નથી."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "વિકલ્પો (_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "ઉમેરો (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "કિબોર્ડ લેઆઉટને ઉમેરો"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "નામ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "ઉપલબ્ધ વિસ્તારો"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "લેઆઉટને ઉમેરો"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "બરાબર"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "વપરાશ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "વર્ણન"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS માઉન્ટ વિકલ્પો:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "ભાષા"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "મૂળ નામ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "અંગ્રેજી નામ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "કંઇ જ પસંદ થયેલ નથી"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT PASSWORD"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "રુટ પાસવર્ડ:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "ખાતરી:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC પાસવર્ડ"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "રુટ પાસવર્ડ  સુયોજિત કરો"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr "રુટ ખાતુ એ સિસ્ટમના સંચાલન માટે વપરાય છે.  રુટ વપરાશકર્તા માટે પાસવર્ડ દાખલ કરો."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "મીડિયા ચકાસણી"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "મીડિયાને ચકાસી રહ્યા છે, મહેરબાની કરીને રાહ જુઓ..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "ઉમેરો (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "બરાબર"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP પ્રોક્સી ને સક્રિય કરો (_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>પ્રોક્સી URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>ઉદાહરણ:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "સત્તાધિકરણ વાપરો (_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>વપરાશકર્તાનામ</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "વપરાશકર્તાનામ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>પાસવર્ડ</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "પાસવર્ડ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "સ્થાપન સ્ત્રોત"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "ઉપકરણ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>લેબલ:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "ખાતરી કરો (_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO file (_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "ઉપકરણ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO પસંદ કરો (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "નેટવર્ક પર (_n):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "પ્રોક્સી સુયોજન (_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS માઉન્ટ વિકલ્પો:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "આ ક્ષેત્ર વૈકલ્પિક છે."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora લોકો રિપોઝીટરીઓ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "નવું માઉન્ટબિંદુને ઉમેરો."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "ઉમેરો (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "પસંદ થયેલ માઉન્ટબિંદુ (ઓ) ને દૂર કરો."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "લેઆઇટ દૂર કરો"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ઑપરેશનલ ભૂલ."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "રુટ પાસવર્ડ  સુયોજિત કરો"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "નામ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>પ્રોક્સી URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "વપરાશકર્તાનામ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "પાસવર્ડ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "તે માઉન્ટ બિંદુ અયોગ્ય છે. બીજુ કંઇક પ્રયતન કરો?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3318,672 +4728,1081 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s માં સ્વાગત છે."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "સ્થાપનની પ્રક્રિયા દરમ્યાન તમે કઈ ભાષા પસંદ કરવા માંગો છો?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "ચાલુ રાખો (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "વપરાશકર્તાનામ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "જૂથ નામ"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "પાસવર્ડ:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC પાસવર્ડ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "માઉન્ટ બિંદુ ઉમેરો (_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>ઇચ્છિત ક્ષમતા:</b>"
+msgid "Add a new mount point."
+msgstr "નવું માઉન્ટબિંદુને ઉમેરો."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>માઉન્ટ બિંદુ:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "ઉમેરો (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "નવું માઉન્ટ બિંદુને ઉમેરો"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "તેને કાઢી નાંખો (_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "માઉન્ટ બિંદુને રૂપરેખાંકિત કરો"
+msgid "Remove the selected mount point(s)."
+msgstr "પસંદ થયેલ માઉન્ટબિંદુ (ઓ) ને દૂર કરો."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "મુક્ત"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ઉપકરણ"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "લેઆઇટ દૂર કરો"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "Encrypt"
-msgstr "એનક્રિપ્ટ (_E)"
+msgid "Reload storage configuration from disk."
+msgstr "સંગ્રહ રૂપરેખાંકન નિષ્ફળ: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "પસંદ થયેલ ઉપકરણ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "ઉપકરણ વર્ણન"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>માઉન્ટ બિંદુ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>ઇચ્છિત ક્ષમતા:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>લેબલ:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>ઉપકરણ પ્રકાર:</b>"
+msgid "Device(s):"
+msgstr "ઉપકરણ:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>ફાઇલ સિસ્ટમ:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "એનક્રિપ્ટ (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "પુન:બંધારિત કરો"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "નામ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>ઉપકરણ પ્રકાર:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "એનક્રિપ્ટ (_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "ફાઇલસિસ્ટમ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "પુન:બંધારિત કરો"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "સ્તંભ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID ઉપકરણ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "પાસફ્રેઝ:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "તાળુ ખોલો (_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "નવું માઉન્ટબિંદુને ઉમેરો."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "પસંદ થયેલ માઉન્ટબિંદુ (ઓ) ને દૂર કરો."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "પસંદ તયેલ માઉન્ટબિંદુને રૂપરેખાંકિત કરો."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "રૂપરેખાંકિત કરો (_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "સંગ્રહ રૂપરેખાંકન નિષ્ફળ: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ઉપલબ્ધ જગ્યા</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">કુલ જગ્યા</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "માઉન્ટ બિંદુને રૂપરેખાંકિત કરો"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "બરાબર"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP સરનામું"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI પ્રારંભક નામને પૂરુ પાડવુ જ જોઇએ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "સત્તાધિકરણ વાપરો (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>ઉદાહરણ:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "વપરાશકર્તાનામ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC પાસવર્ડ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "વપરાશકર્તાનામ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC પાસવર્ડ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "વપરાશકર્તાનામ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC પાસવર્ડ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "નેટવર્ક નામ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "સત્તાધિકરણ વાપરો (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "વપરાશકર્તાનામ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC પાસવર્ડ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "વપરાશકર્તાનામ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC પાસવર્ડ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "વપરાશકર્તાનામ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC પાસવર્ડ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "જોડાણ નિષ્ફળ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "બરાબર"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "ઉપકરણ:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "પસંદ થયેલ ડિસ્કો"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "બંધ કરો"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "બુટ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "વર્ણન"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "મુક્ત"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "લેઆઇટ દૂર કરો"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "તેને કાઢી નાંખો (_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "કંઇ જ પસંદ થયેલ નથી"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "માઉન્ટ બિંદુને રૂપરેખાંકિત કરો"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "માઉન્ટ બિંદુ ઉમેરો (_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>ઇચ્છિત ક્ષમતા:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>માઉન્ટ બિંદુ:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "નવું માઉન્ટ બિંદુને ઉમેરો"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "માઉન્ટ બિંદુને રૂપરેખાંકિત કરો"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "નામ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ઉપકરણ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "એનક્રિપ્ટ (_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "મહેરબાની કરીને માન્ય માઉન્ટબિંદુને દાખલ કરો."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "બરાબર"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ઉપકરણનું બંધારણ કરી રહ્યા છે"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ડિસ્ક એનક્રિપ્શન પાસફ્રેજ"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "પાસફ્રેજને સંગ્રહો"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ડિસ્ક એનક્રિપ્શન પાસફ્રેજ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "પાસફ્રેઝ:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "ખાતરી:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "પસંદ થયેલ ડિસ્કો"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "બરાબર"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "વર્ણન અહિંયા જાય છે."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "ફાઇલસિસ્ટમ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "ક્રિયા"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "સાચવો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "કાઢી નાંખો"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "સંકોચો"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "વૈવિધ્ય પાર્ટીશનીંગ પસંદ થયેલ છે"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "ફેરફારો લાગુ કરો (_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "ઉપકરણ:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "માઉન્ટ બિંદુ ઉમેરો (_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "સ્થાપકમાંથી બહાર નીકળો (_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "ના (_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "હાં (_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "સ્થાપન સારાંશ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "સ્થાપન શરૂ કરો (_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "રૂપરેખાંકન"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "સ્થાપિત કરવા માટે તૈયાર કરી રહ્યા છે"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "રૂપરેખાંકનને સમાપ્ત કરો (_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "રીબુટ (_R)"
 
@@ -3999,16 +5818,16 @@ msgstr "સ્થાપન"
 msgid "Install the live CD to your hard disk"
 msgstr "live CD નું તમારી હાર્ડ ડિસ્કમાં સ્થાપન કરો"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "હાર્ડ ડ્રાઈવમાં સ્થાપનને શરૂ કરી રહ્યા છે"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Fedora માં સ્વાગત છે"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4017,24 +5836,25 @@ msgstr ""
 "%s ને સ્થાપિત કરવા માટે %s MB મેમરીની જરૂર છે, પરંતુ તમારી પાસે ફક્ત આ મશીન પર %s MB "
 "છે.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s ગ્રાફિકલ સ્થાપકને %s MB મેમરીની જરૂર છે, પરંતુ તમારી પાસે ફક્ત %s MB છે."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "પૂરતી જગ્યા નથી"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4048,24 +5868,24 @@ msgstr ""
 "\n"
 "રુટ ટર્મિનલમાંથી."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " લખાણ સ્થિતિને શરૂ કરી રહ્યા છે."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ભૂલ"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ચલ સુયોજિત નથી. લખાણ સ્થિતિ શરૂ કરી રહ્યા છીએ."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ગ્રાફિકવાળુ સ્થાપન ઉપ્લબ્ધ નથી. લખાણ સ્થિતિ શરૂ કરી રહ્યા છીએ."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4076,36 +5896,112 @@ msgstr ""
 "લેઆઉટ અથવા પેકેજ પસંદગીઓને સ્પષ્ટ કરવા માટે તમને પરવાનગી આપતુ નથી. શું તમને તેને બદલે VNC "
 "સ્થિતિને વાપરવાનું ગમે છે?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora નો પ્રયત્ન કરો"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "બંધ કરો"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "યજમાનનું નામ યોગ્ય અક્ષરો કે જે a-z', 'A-Z' અથવા '૦-૯' ના વિસ્તારમાં હોય તેનાથી શરુ "
+#~ "થવું જોઈએ"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "નીચેની ફાઈલ સિસ્ટમો પર તમારે વધુ જગ્યાની જરૂર છે:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "આદેશ વાક્ય સ્થિતિમાં કોઈ પ્રશ્ન નથી!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "તે માઉન્ટ બિંદુ અયોગ્ય છે. બીજુ કંઇક પ્રયતન કરો?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "પેકેજ મેટાડેટાને ડાઉનલોડ કરી રહ્યા હોય ત્યારે ભૂલ..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "કંઇ જ પસંદ થયેલ નથી"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "ફર્મવેર ગેરહાજર"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "સત્તાધિકારની જરુરિયાત છે"
+
+#~ msgid "column"
+#~ msgstr "સ્તંભ"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>પાર્ટીશન પ્રકાર:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>પ્રોક્સી URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>વપરાશકર્તાનામ</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>પાસવર્ડ</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "તે માઉન્ટ બિંદુ અયોગ્ય છે. બીજુ કંઇક પ્રયતન કરો?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>લેબલ:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>ફાઇલ સિસ્ટમ:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ઉપકરણ"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "પસંદ તયેલ માઉન્ટબિંદુને રૂપરેખાંકિત કરો."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ઉપલબ્ધ જગ્યા</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">કુલ જગ્યા</span>"
+
 #~ msgid "Completed"
 #~ msgstr "સમાપ્ત"
 
@@ -4142,40 +6038,9 @@ msgstr "બંધ કરો"
 #~ msgid "Install on System"
 #~ msgstr "સિસ્ટમ પર સ્થાપિત કરો"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "નીચેની ભૂલ ઉદ્ભવી જ્યારે સ્થાપન રિપોઝીટરીને સુયોજિત કરી રહ્યા હોય:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "સ્થાપનને ચાલુ રાખી શકાતુ નથી."
-
 #~ msgid "Exit installer"
 #~ msgstr "સ્થાપકમાંથી બહાર નીકળો"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "તમારાં હાર્ડવેર સાથે કંઇક સમસ્યાને કારણે સ્થાપન બંધ થઇ ગયુ હતુ. ચોક્કસ ભૂલ સંદેશો આ છે:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " સ્થાપકનો હવે અંત આવી જશે."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "હાર્ડવેર ભૂલ શોધાઇ"
-
 #~ msgid "_Exit installer"
 #~ msgstr "સ્થાપકમાંથી બહાર નીકળો (_E)"
 
@@ -4447,9 +6312,6 @@ msgstr "બંધ કરો"
 #~ msgid "Software Development"
 #~ msgstr "સોફ્ટવેર વિકાસ"
 
-#~ msgid "Web Server"
-#~ msgstr "વેબ સર્વર"
-
 #~ msgid "Minimal"
 #~ msgstr "ન્યૂનત્તમ"
 
@@ -4493,48 +6355,6 @@ msgstr "બંધ કરો"
 #~ "નથી:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "તમે રુટ પાર્ટીશન (/) વ્યાખ્યાયિત નથી કર્યું, કે જે %s નું સ્થાપન ચાલુ રાખવા માટે જરુરી છે."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "તમારુ રુટ પાર્ટીશન એ ૨૫૦ મેગાબાઈટ કરતાં ઓછું છે કે જે %s સ્થાપિત કરવા માટે ખૂબ નાનું છે."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "આ પ્લેટફોર્મને સમર્પિત પાર્ટીશન અથવા લોજિકલ વોલ્યુમ પર /boot ની જરૂર છે. જો તમે /"
-#~ "boot વોલ્યુમને ઇચ્છતા ન હોય તો, તમારે સમર્પિત બિન-LVM પાર્ટીશન પર  / ને સ્થિત કરવુ "
-#~ "જ જોઇએ."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "તમારુ %(mount)s પાર્ટીશન એ %(size)s મેગાબાઈટ કે જે સામાન્ય %(productName)s ના "
-#~ "સ્થાપન માટે જરુરી છે તેના કરતાં નાનું છે."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "તમારુ %(mount)s પાર્ટીશન %(format)s બંધારણ માટે ઘણુ નાનું છે (પરવાનગી મળેલ મારે એ "
-#~ "%(minSize)d MB થી %(maxSize)d MB નુ છે)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "તમારુ %(mount)s પાર્ટીશન %(format)s બંધારણ માટે ઘણુ મોટુ છે (પરવાનગી મળેલ માપ એ "
-#~ "%(minSize)d MB થી %(maxSize)d MB નુ છે)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4551,44 +6371,6 @@ msgstr "બંધ કરો"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "તમે બુટલોડર પગલુ1 લક્ષ્ય ઉપકરણને બનાવેલ નથી"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "તમે બુટ કરી શકાય તેવા પાર્ટીશન બનાવતા નથી."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "તમે સ્વેપ પાર્ટીશનને સ્પષ્ટ કર્યુ નથી. %(requiredMem)s MB મેમરી સ્વેપ પાર્ટીશન વગર "
-#~ "સ્થાપનને ચાલુ રાખવા માટે જરૂરી છે, પરંતુ તમારી પાસે ફક્ત %(installedMem)s MB છે."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "તમે સ્વેપ પાર્ટીશન સ્પષ્ટ કરેલ નથી. પરંતુ બધા કિસ્સાઓમાં તે જરુરી નથી, તે સાંકેતિક રીતે "
-#~ "મોટા ભાગના સ્થાપનોનું પરિણામ સુધારે છે."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "તમારા સ્વેપ ઉપકરણોની ઓછામાં ઓછા એક પાસે UUID નથી, કે જે mkswap ની જૂની આવૃત્તિઓની "
-#~ "મદદથી બનાવેલ સ્વેપ જગ્યામાં સામાન્ય છે. આ ઉપકરણોનો /etc/fstab માં ઉપકરણ પાથ દ્દારા "
-#~ "સંદર્ભ લીધેલ છે, કે જે નિષ્ક્રિય નથી જ્યાં સુધી ઉપકરણ પાથ વિવિધ પરિસ્થિતિઓ હેઠળ બદલી "
-#~ "શકાય."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "આ માઉન્ટ બિંદુ અયોગ્ય છે.  %s ડિરેક્ટરી / file સિસ્ટમ પર હોવી જ જોઇએ."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "માઉન્ટ બિંદુ %s એ linux ફાઇલ સિસ્ટમ પર હોવુ જ જોઇએ."
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s પર Linux"
 
@@ -4598,11 +6380,6 @@ msgstr "બંધ કરો"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(arch)s માટે %(product)s Linux %(version)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ઉપકરણનું બંધારણ કરી રહ્યા છે"
-#~ msgstr[1] "DASD ઉપકરણનું બંધારણ કરી રહ્યા છે"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux સાથે વાપરવા માટે %d DASD ઉપકરણને તૈયાર કરી રહ્યા છે..."
@@ -4779,9 +6556,6 @@ msgstr "બંધ કરો"
 #~ msgid "Error setting root password"
 #~ msgstr "રુટ પાસવર્ડને સુયોજિત કરી રહ્યા હોય ત્યારે ભૂલ"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "આ વપરાશકર્તા માટે પાસવર્ડની ખાતરી અને દાખલ કરવો જ જોઇએ."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "પેકેજોને દૂર કરો (_R)"
 
@@ -4794,24 +6568,12 @@ msgstr "બંધ કરો"
 #~ msgid "%s of %s"
 #~ msgstr "%s નું %s"
 
-#~ msgid "Region:"
-#~ msgstr "વિસ્તાર:"
-
-#~ msgid "City:"
-#~ msgstr "શહેર:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-કલાક"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "તમારાં ઍડ-ઓનને પસંદ કરો"
 
@@ -4851,9 +6613,6 @@ msgstr "બંધ કરો"
 #~ msgid "configureButton"
 #~ msgstr "બટન રૂપરેખાંકિત કરો"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "પાર્ટીશનીંગને સમાપ્ત કરો (_F)"
-
 #~ msgid "Id"
 #~ msgstr "Id"
 
diff --git a/anaconda/po/hi.po b/anaconda/po/hi.po
index 9a5fd07..dba83eb 100644
--- a/anaconda/po/hi.po
+++ b/anaconda/po/hi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -24,18 +24,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot फ़ाइलसिस्टम"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "RAID सेट जो '%s' समाहित करता है में इनमें से एक लेवल रहना चाहिए: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -43,199 +43,466 @@ msgid ""
 msgstr ""
 "RAID सेट जो '%s' को समाहित करता है में कम से कम एक मेटाडेटा संस्करण रहना चाहिए: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "RAID सेट जो '%s' समाहित करता है में इनमें से एक युक्ति प्रकार रहना चाहिए: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s में निम्नलिखित में एक एक डिस्कलेबल प्रकार होना चाहिए: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s %s के प्रकार का नहीं हो सकता है."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s को जरूर %s पर आरोहित करना चाहिए."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s का आकार  और  %d और %d MB के बीच जरूर होना चाहिए"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s को %dMB से छोटा नहीं होना चाहिए."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s को %dMB से बड़ा नहीं होना चाहिए."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s को पहले %dMB डिस्क में होना चाहिए."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s जरूर किसी प्राथमिक विभाजन होना चाहिए."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s किसी गोपित खंड युक्ति पर नहीं हो सकता है."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s %s के प्रकार का नहीं हो सकता है"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s के पास grub2 के लिए पर्याप्त स्थान नहीं रह सकता है core.img को अंतःस्थापित करने के "
 "लिए जब %s फ़ाइलतंत्र को %s पर उपयोग करना हो"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC प्रारंभ कीजिए"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "पाठ मोड का प्रयोग करें"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "कूटशब्द सेट है."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "कूटशब्द मेल नहीं खाता है!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "आपने एक कमजोर कूटशब्द दिया है: %s. कृपया संपन्न को किसी तरह उपयोग के लिए दबाएँ."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "आपने एक कमजोर कूटशब्द दिया है: %s. कृपया संपन्न को किसी तरह उपयोग के लिए दबाएँ."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "कमजोर"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "साफ"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "अच्छा"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "मजबूत"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ठीक"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "हाँ (_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "नहीं (_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"निम्नलिखित त्रुटि आई जब संस्थापन रिपॉजिटरी सेटअप कर रहा था:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"संस्थापन जारी नहीं रह सकता है."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"निम्नलिखित त्रुटि आई जब संस्थापन रिपॉजिटरी सेटअप कर रहा था:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"संस्थापन जारी नहीं रह सकता है."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"संस्थापन के लिए चिह्नित निम्नलिखित सॉफ़्टवेयर में त्रुटि है.  यह आपके संस्थापन स्रोत में\n"
+"त्रुटि के कारण हो सकता है.  आप अपने संस्थापन में इन संकुल को हटाने का प्रयास कर सकते हैं.\n"
+"अपना संस्थापन स्रोत बदलें या संस्थापन छोड़ें."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"संस्थापन रुक गया था क्योंकि आपके हार्डवेयर में समस्या दिख रही थी. सटीक त्रुटि संदेश है:\n"
+"\n"
+"%s.\n"
+"\n"
+"संस्थापन समाप्त हो जाएगा."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"संस्थापन रुक गया था क्योंकि आपके हार्डवेयर में समस्या दिख रही थी. सटीक त्रुटि संदेश है:\n"
+"\n"
+"%s.\n"
+"\n"
+"संस्थापन समाप्त हो जाएगा."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "हार्डवेयर त्रुटि आयी"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"संस्थापन रुक गया था क्योंकि आपके हार्डवेयर में समस्या दिख रही थी. सटीक त्रुटि संदेश है:\n"
+"\n"
+"%s.\n"
+"\n"
+"संस्थापन समाप्त हो जाएगा."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "विन्यास यूआरएल (_C)"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "संस्थापन पूर्व स्क्रिप्ट चला रहा है"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "संस्थापन स्रोत सेटअप कर रहा है..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "उत्तर संस्थापन सेटअप कार्य कर रहा है"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "एस्क्रॉ प्रमाणपत्र %s को संजाल चाहिए."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -247,87 +514,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s अनुपस्थित है. फ़ायरवॉल सेटअप नहीं कर सकता है."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s अनुपस्थित है. फ़ायरवॉल सेटअप नहीं कर सकता है."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "फ़ाइल तंत्र लेबल का समर्थन नहीं करता है."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "संस्थापन पूर्व स्क्रिप्ट चला रहा है"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "मेजबाननाम 255 या इससे कम वर्ण लंबाई का होना चाहिए."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"मेजबाननाम को 'a-z' या 'A-Z' या '0-9' सीमा में एक उचित वर्ण से अवश्य प्रारंभ होना "
-"चाहिए"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "जुड़ रहा है..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "डिसकनेक्ट कर रहा है..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "बेतार (%s) कनेक्टेड"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "बेतार %s से कनेक्टेड"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "संबंधित नहीं"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "कोई संजाल युक्तियां उपलब्ध नहीं"
 
@@ -336,7 +893,12 @@ msgstr "कोई संजाल युक्तियां उपलब्ध
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "नया %s %s संस्थापन"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "%s सिस्टम को अनारोहित करने के लिए जब आप समाप्त होते हैं."
@@ -349,8 +911,8 @@ msgstr "जब समाप्त हो, कृपया शैल से ब
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "/bin/sh को चलाने के लिए पाने में असमर्थ!  शेल आरंभ करने में असमर्थ"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "बचाव"
 
@@ -396,23 +958,17 @@ msgstr "बचाव के लिये तंत्र"
 msgid "Which device holds the root partition of your installation?"
 msgstr "कौन सा विभाजन आपके संस्थापन के रूट विभाजन को पकड़े हुए है?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ठीक"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "बाहर"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "आपके पास कोई Linux विभाजन नहीं हैं. एक शैल प्राप्त करने के लिए रिटर्न दबाएँ. शैल से बाहर "
 "निकलते ही तंत्र स्वतः रिबूट हो जाएगा."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -421,7 +977,7 @@ msgstr ""
 "आपके तंत्र में गंदी फ़ाइल तंत्र हैं, जिन्हें आप आरोहित करना नहीं चाहते हैं. शैल प्राप्त करने के लिए "
 "रिटर्न दबाएँ जिससे आप fsck और अपने विभाजनों को आरोहित कर सकते हैं. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -442,7 +998,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -455,28 +1011,236 @@ msgstr ""
 "\n"
 "<return> को शेल पाने के लिए दबाएँ."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "आपके पास कोई लिनक्स विभाजन नहीं है. फिर बूट कर रहा है\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " शैल से बाहर निकलते ही तंत्र स्वतः रिबूट हो जाएगा."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "बचाव विधि"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "आपके पास कोई लिनक्स विभाजन नहीं है. कोई शेल पाने के लिए रिटर्न दबाएँ. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "%s निर्देशिका के अंतर्गत आपका तंत्र आरोहित है."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "मानक विभाजन"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "डिस्क"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"आपके कंप्यूटर पर 'स्वैप' क्षेत्र ऑपरेटिंग तंत्र\n"
+"के द्वारा उपयोग में है जब स्मृति कम होता है."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"आपके कंप्यूटर पर 'बूट' क्षेत्र वहाँ है जहाँ\n"
+"फ़ाइल को ऑपरेटिंग तंत्र को आरंभ करने के लिए जरूरी है."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"आपके कंप्यूटर पर 'रूट' क्षेत्र वहाँ है जहाँ कोर तंत्र\n"
+"फ़ाइलें और अनुप्रयोग जमा हैं."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"आपके कंप्यूटर पर 'घर' क्षेत्र वहाँ है जहाँ आपके\n"
+"निजी आँकड़े जमा हैं."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS बूट विभाजन बूटिंग को GPT-विभाजन डिस्क को \n"
+"BIOS हार्डवेयर पर सक्रिय करने के लिए जरूरी है."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PReP बूट विभाजन कुछ PPC प्लेटफॉर्म पर\n"
+"बतौर बूटलोडर विन्यास जरूरी हैं."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"आपका रूट विभाजन 250 मेगाबाइट से भी कम हैं जो कि %s के संस्थापन के लिए इतना छोटा है कि "
+"संस्थापन नहीं हो सकता."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"आपने एक रूट विभाजन (/) को परिभाषित नहीं किया है, जो कि %s के अधिषठान के जारी करने के "
+"लिए आवश्यक है."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"इस प्लेटफॉर्म को /boot एक नियत विभाजन या लॉजिकल वॉल्यूम पर चाहिए.  यदि आप एक /"
+"boot वॉल्यूम नहीं चाहते हैं, आपको / किसी प्रतिबद्ध गैर-LVM विभाजन पर रखना होगा."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"आपका %(mount)s विभाजन %(size)s मेगाबाइट से कम है जो कि साधारण %(productName)s "
+"संस्थापन के लिए अनुशंसित से कम है."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"आपका %(mount)s विभाजन %(format)s प्रारूपण के लिए काफी छोटा है (अनुमति प्राप्त आकार "
+"है %(minSize)d MB से %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"आपका %(mount)s विभाजन %(format)s प्रारूपण के लिए काफी बड़ा है (अनुमति प्राप्त आकार है "
+"%(minSize)d MB से %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "नयी युक्ति जोड़ने में विफल. विवरण के लिए क्लिक करें."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "आपने एक बूट योग्य विभाजन नहीं बनाया है."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"आपका BIOS-आधारित तंत्र %s के नए डिस्क लेबल प्रारूप (GPT) के साथ विशेष विभाजन की जरूरत "
+"है. जारी रखने के लिए, कृपया 1MB 'BIOS Boot' विभाजन बनाएँ."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"आपने कोई स्वैप विभाजन निर्दिष्ट नहीं किया है. %(requiredMem)s MB स्मृति बिना स्वैप "
+"विभाजन संस्थापन को जारी रखने के लिए जरूरी है, लेकिन आपके पास केवल %(installedMem)s MB "
+"है."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"आपने एक स्वैप विभाजन निर्दिष्ट नहीं किया है. यद्यपि सभी स्थितियों में जरूरी नहीं हैं, अधिक "
+"संस्थापन के लिए यह उत्पादकता बढ़ा देता है."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"कम से कम आपके स्वैप युक्ति में से एक में UUID नहीं है, जो कि mkswap के पुराने संस्करण के उपयोग "
+"से बनाए स्वैप स्थान में सामान्य है. इन युक्तियों को /etc/fstab पथ से संदर्भित किया जाएगा, "
+"जो कि आदर्श नहीं है क्योंकि युक्ति पथ कई स्थितियों में बदल सकता है. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "यह आरोह बिंदु अवैध है.  %s निर्देशिका को जरूर / फ़ाइल तंत्र पर होना चाहिए."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s आरोह बिंदु को जरूर लिनक्स फ़ाइल तंत्र पर होना चाहिए."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "पासफ्रेज़:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -587,87 +1351,239 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "दिया गया VNC कूटशब्द कम से कम 6 वर्ण लंबा नहीं था.\n"
 "कृपया कोई नया दर्ज करें.  बिना कूटशब्द के लिए खाली छोड़ें."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "संस्थापन स्रोत सेटअप में विफल"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "संकुल मेटाडेटा डाउनलोड करने में त्रुटि..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "कोई संस्थापन स्रोत उपलब्ध नहीं"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "सॉफ्टवेयर संस्थापित कर रहा है"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "संकुल संस्थापन प्रगति आरंभ कर रहा है"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "निम्न फ़ाइल तंत्र पर आपको ज्यादा स्थान की जरूरत है:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "संस्थापन स्रोत से लेनदेन के तैयारी कर रहा है"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "संस्थापित किया जा रहा है"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "संकुल मेटाडेटा डाउनलोडिंग..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "संस्थापित किया जा रहा है"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "संस्थापित करने के लिए तैयार कर रहा है"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "भंडारण विन्यास जाँच रहा है..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "तयशुदा टाइटल"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "स्थानीयकरण"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "स्थानीयकरण"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "सॉफ्टवेयर"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "तंत्र"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "संस्थापन हब"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "स्वचालित संस्थापित कर रहा है"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "कमांड लाइन विधि में कोई प्रश्न नहीं रख सकता है!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  ऊपर से अपने पसंद करें ['q' to quit | 'c' to continue]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "कृपया जारी करने के पहले सभी स्पोक को पूरा करें"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "तयशुदा हब टाइटल"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "कृपया जारी करने के पहले सभी स्पोक को पूरा करें"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -691,32 +1607,35 @@ msgstr "हाँ"
 msgid "no"
 msgstr "नहीं"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "क्या आप सचमुच बाहर होना चाहते हैं?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  ऊपर से अपने पसंद करें ['q' to quit | 'c' to continue]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -731,219 +1650,258 @@ msgstr ""
 "आरंभ करना चाहेंगे और आरेखीय संस्थापन से कार्य निष्पादन करेंगे या पाठ मोड संस्थापन को जारी "
 "रखेंगे?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC कूटशब्द"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "कृपया VNC कूटशब्द दें. आपको इसे दो बार टाइप करना होगा. \n"
 "बिना कूटशब्द के लिए खाली छोड़ें"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "कूटशब्द:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "कूटशब्द (पुष्टि करें):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "कूटशब्द मेल नहीं खाता है!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "कूटशब्द कम से कम छह वर्ण का जरूर होना चाहिए."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "कूटशब्द कम से कम छह वर्ण का जरूर होना चाहिए."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "समयक्षेत्र सेटिंग्स"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "समयक्षेत्र सेट नहीं है."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "उपलब्ध क्षेत्र"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "उपलब्ध क्षेत्र"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "भंडारण विन्यास जाँच रहा है..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "बेतार (%s) कनेक्टेड"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "बेतार (%s) कनेक्टेड"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "मेजबाननाम"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "मेजबाननाम"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "मेजबाननाम"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "विन्यास संपन्न करें (_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "गेटवे"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "फ़ाइल तंत्र विन्यास का एक प्रकार अनुपस्थित है"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "रूट कूटशब्द:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "कूटशब्द सेट है."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "रूट खाता अक्षम है."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "कूटशब्द सेट नहीं है."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "कृपया नया रूट कूटशब्द चुनें. आपको इसे दो बार टाइप करना होगा."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "कूटशब्द:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "सभी स्थान का उपयोग करें"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "मौजूदा लिनक्स तंत्र बदलें"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "मुक्त स्थान का प्रयोग करें"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "गंतव्य संस्थापित करें"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "कोई डिस्क चुना नहीं गया"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "भंडारण विन्यास जाँचने में त्रुटि"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "भंडारण विन्यास जाँचने में त्रुटि"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "स्वचालित विभाजन चयनित"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "मनपसंद विभाजन चयनित"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -951,38 +1909,59 @@ msgstr ""
 "किसी डिस्क का पता नहीं चला.  कृपया कंप्यूटर बंद करें, कम से कम एक डिस्क कनेक्ट करें, संस्थापन "
 "पूरा करने के लिए फिर आरंभ करें."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "कोई डिस्क नहीं चुना गया; कृपया कम से कम एक डिस्क चुनें जिसमें संस्थापित करना है."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "भंडारण की जाँच कर रहा है..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "अद्यतन भंडार विन्यास उत्पन्न कर रहा है"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "भंडार विन्यास विफल: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "भंडारण विन्यास जाँच रहा है..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "स्वचालित विभाजन विकल्प"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -991,41 +1970,41 @@ msgstr ""
 "संस्थापन के लिये आपके हार्ड ड्राइव के पोजिसनिंग की जरूरत है.  चुनें कि कौन सा स्थान का "
 "प्रयोग करना है और संस्थापन लक्ष्य के तौर पर कौन सा ड्राइव का प्रयोग करना है."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "विभाजन योग्य विन्यास"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "विभाजन योग्य विन्यास"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "समयक्षेत्र सेटिंग्स"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s समयक्षेत्र"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "समयक्षेत्र सेट नहीं है."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "%s क्षेत्र में उपलब्ध समयक्षेत्र"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "उपलब्ध क्षेत्र"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1033,178 +2012,196 @@ msgstr ""
 "कृपया समयक्षेत्र चुनें.\n"
 "संख्या का उपयोग करें या सीधे नाम टाइप करें [b to region list, q to quit]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC प्रारंभ कीजिए"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "संस्थापन प्रगति"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "निकटतम मिरर"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS सर्वर %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "सॉफ्टवेयर स्रोत सेटअप करने में त्रुटि"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "कुछ नहीं चयनित किया जा रहा है"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "जुड़ रहा है..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "सीडी/डीवीडी ड्राइव"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO फ़ाइल (_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "संजाल समय"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "कोई संस्थापन स्रोत उपलब्ध नहीं"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "संस्थापन स्रोत सेटअप में विफल"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "संकुल मेटाडेटा डाउनलोड करने में त्रुटि..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "कोई संस्थापन स्रोत उपलब्ध नहीं"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS सर्वर %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS आरोह विकल्प:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "संस्थापन स्रोत सेटअप में विफल, रेपो यूआरएल जाँचें"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot को समाहित करने वाली युक्ति"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "संस्थापन स्रोत सेटअप में विफल"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "सॉफ्टवेयर चुनाव बदलें (_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "सॉफ्टवेयर चुनाव जाँचने में त्रुटि"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "संस्थापन स्रोत सेटअप नहीं"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "पसंदीदा सॉफ्टवेयर चुना गया"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "संस्थापन स्रोत सेटअप नहीं"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "अपना वातावरण चुनें"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "प्रमाणीकरण प्रयोग करें (_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "आप कोई कूटशब्द जरूर दें और पुष्टि करें."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "चेतावनी"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1220,112 +2217,99 @@ msgstr "प्रगति में"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tसंस्थापन संपन्न.  बाहर निकलने के लिए रिटर्न दबाएँ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "तयशुदा स्पोक टाइटल"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "स्थिति जाँच रहा है..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "नई युक्ति"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "कूटशब्द (पुष्टि करें):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "आपने एक कमजोर कूटशब्द दिया है: %s. कृपया संपन्न को किसी तरह उपयोग के लिए दबाएँ."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "आपने एक कमजोर कूटशब्द दिया है: %s. कृपया संपन्न को किसी तरह उपयोग के लिए दबाएँ."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "कूटशब्द सेट है."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "संस्थापक छोड़ें (_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "बाहर (_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "नहीं (_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "हाँ (_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "तयशुदा टाइटल"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "स्थानीयकरण"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "स्थानीयकरण"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "सॉफ्टवेयर"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "तंत्र"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "अगले चरण में जाने से पहले कृपया इस प्रतीक से चिह्नित मद पूरा करें."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "पूर्ण!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1334,164 +2318,65 @@ msgstr ""
 "%s आपके तंत्र पर सफलतापूर्वक संस्थापित है और आपके\n"
 "उपयोग के लिए तैयार है!  आगे बढ़ें!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "पूर्ण!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "बाहर (_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "नया %s %s संस्थापन"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s आपके तंत्र पर सफलतापूर्वक संस्थापित है, लेकिन कुछ विन्यास अभी भी किया जाना है. \n"
+"इसे संपन्न करें और समाप्त विन्या बटन को क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s आपके तंत्र पर सफलतापूर्वक संस्थापित है और आपके\n"
+"उपयोग के लिए तैयार है!  आगे बढ़ें!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "युक्ति पुनर्विन्यास विफल. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "स्तंभ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "नहीं पाने योग्य त्रुटि के कारण भंडारण विन्या रिसेट किया गया. विवरण के लिए क्लिक करेें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "युक्ति पुनर्विन्यास विफल. विवरण के लिए क्लिक करें."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "किसी वैध आरोह बिंदु दर्ज करें."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "वह आरोह बिंदु अवैध है. कोई अन्य आजमाएँ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "वह आरोह बिंदु पहले से उपयोग में है. कोई अन्य आजमाएँ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "आपके द्वारा चुना गया RAID स्तर के लिए एक से अधिक डिस्क चाहिए जितना आपने चुना है."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "किसी वैध आरोह बिंदु दर्ज करें."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "वह आरोह बिंदु अवैध है. कोई अन्य आजमाएँ?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "मानक विभाजन"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "डिस्क"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "कुछ नहीं"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s रूट में सभी अन्य फ़ाइलतंत्र को साथ ही मिटाएँ."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "क्या आप %s पर सभी आँकड़ा को सचमुच मिटाना चाहते हैं?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "क्या आप %s पर सभी आँकड़ा को सचमुच मिटाना चाहते हैं?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "दस्ती विभाजन"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d भंडारण युक्ति चुना गया"
 msgstr[1] "%d भंडारण युक्ति चुने गए"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1500,129 +2385,110 @@ msgstr ""
 "जब आप अपने %s %s संस्थापन के लिए आरोह बिंदु बनाते हैं,\n"
 "आप यहाँ उनके विवरण को देखने में समर्थ होंगे."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"आपके कंप्यूटर पर 'स्वैप' क्षेत्र ऑपरेटिंग तंत्र\n"
-"के द्वारा उपयोग में है जब स्मृति कम होता है."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"आपके कंप्यूटर पर 'बूट' क्षेत्र वहाँ है जहाँ\n"
-"फ़ाइल को ऑपरेटिंग तंत्र को आरंभ करने के लिए जरूरी है."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"आपके कंप्यूटर पर 'रूट' क्षेत्र वहाँ है जहाँ कोर तंत्र\n"
-"फ़ाइलें और अनुप्रयोग जमा हैं."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"आपके कंप्यूटर पर 'घर' क्षेत्र वहाँ है जहाँ आपके\n"
-"निजी आँकड़े जमा हैं."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS बूट विभाजन बूटिंग को GPT-विभाजन डिस्क को \n"
-"BIOS हार्डवेयर पर सक्रिय करने के लिए जरूरी है."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PReP बूट विभाजन कुछ PPC प्लेटफॉर्म पर\n"
-"बतौर बूटलोडर विन्यास जरूरी हैं."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi को %s पर युक्ति के प्रकार के रूप में होना चाहिए"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s को %s प्रकार की युक्ति पर होना चाहिए"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s गोपित नहीं हो सकता है"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "आप रूट युक्ति पर कोई नया फ़ाइलसिस्टम जरूर बनाएँ."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "%s प्रकार की युक्ति के लिए एक वैध RAID स्तर चयन चाहिए."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "युक्ति फिर आकार किया जाना विफल. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "युक्ति पुनर्प्रारूप आग्रह विफल. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "फ़ाइल तंत्र लेबल का समर्थन नहीं करता है."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "कोई डिस्क चुना नहीं गया"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "फ़ाइल तंत्र का फिर आकार नहीं किया जा सकता है."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "भंडारण विन्यास जाँचने में त्रुटि. विवरण के लिए क्लिक करें."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "भंडारण विन्यास जाँचने में त्रुटि. विवरण के लिए क्लिक करें."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "नयी युक्ति जोड़ने में विफल. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "अवैध विभाजन आकार सेट. मान्य पूर्णांक का उपयोग करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "युक्ति हटाने का आग्रह विफल. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs free"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1631,7 +2497,7 @@ msgstr ""
 "इस युक्ति को सीधे यहाँ संपादित नहीं किया जा सकता है. आप इसे हटा सकते हैं या कोई भिन्न "
 "युक्ति चुन सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1640,194 +2506,143 @@ msgstr ""
 "इस युक्ति को सीधे यहाँ संपादित नहीं किया जा सकता है. आप इसे हटा सकते हैं या कोई भिन्न "
 "युक्ति चुन सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "कोई डिस्क चुना नहीं गया."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "चयनित डिस्क पर पर्याप्त मुक्त स्थान नहीं."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "स्वचालित विभाजन विफल. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "सॉफ्टवेयर चुनाव बदलें (_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "गोपित खंड युक्ति को खोलने में विफल. विवरण के लिए क्लिक करें"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "दिनांक व समय"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "अमान्य समयक्षेत्र"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "अपराह्न"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "आपको संजालन को सेटअप की जरूरत हो सकती है यदि आप NTP का उपयोग करते हैं"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "आपके पास कोई NTP सर्वर विन्यस्त नहीं है"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "संस्थापन गंतव्य"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d भंडारण युक्ति चुना गया"
+msgstr[1] "%d भंडारण युक्ति चुने गए"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s ख़ाका स्विच करने के लिए."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "कुंजीपटल"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "जाँच ख़ाका विन्यास उपलब्ध नहीं है."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "स्थिति जाँच रहा है..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "ख़ाका स्विचिंग विन्यस्त नहीं है."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "भाषा"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "स्थिति अज्ञात (गुम)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "स्थिति अज्ञात"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "बिना प्रबंधित"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "अनुपलब्ध"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "गुम फर्मवेयर"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "केबल अनप्लग"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "अनुपलब्ध"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "डिस्कनेक्टेड"
@@ -1852,295 +2667,324 @@ msgstr "डिसकनेक्टिंग"
 msgid "Connection failed"
 msgstr "कनेक्शन असफल"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "अनप्लग"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "ईथरनेट"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "बेतार"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "अनप्लग"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 पता"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 पता"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "आईपी पता"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "उद्यम"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "कुछ नहीं"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "सत्यापन आवश्यक"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "कूटशब्द:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "संजाल विन्यास"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "रूट कूटशब्द"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "कूटशब्द सेट है."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "रूट कूटशब्द सेट है"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "रूट खाता अक्षम है"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "रूट कूटशब्द सेट नहीं है"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "सॉफ्टवेयर चुनाव"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "सॉफ्टवेयर निर्भरता जाँच रहा है..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "सॉफ्टवेयर निर्भरता जाँचने में त्रुटि"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "संकुल मेटाडेटा डाउनलोडिंग..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "समूह मेटाडेटा डाउनलोडिंग..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "सॉफ्टवेयर निर्भरता जाँच रहा है..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "सॉफ्टवेयर निर्भरता जाँचने में त्रुटि"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "सॉफ्टवेयर निर्भरता जाँचने में त्रुटि.  विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "संस्थापन के लिए चिह्नित निम्नलिखित सॉफ़्टवेयर में त्रुटि है.  यह आपके संस्थापन स्रोत में\n"
 "त्रुटि के कारण हो सकता है.  आप अपने संस्थापन में इन संकुल को हटाने का प्रयास कर सकते हैं.\n"
 "अपना संस्थापन स्रोत बदलें या संस्थापन छोड़ें."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "रद्द करें (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "बाहर (_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "सॉफ्टवेयर स्रोत बदलें (_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "सॉफ्टवेयर चुनाव बदलें (_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "संस्थापन स्रोत सेटअप कर रहा है..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "संकुल मेटाडेटा डाउनलोड करने में त्रुटि..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "सत्यापन आवश्यक"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "यह मीडिया संस्थापन के लिए अच्छा है."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "यह मीडिया संस्थापन के लिए अच्छा नहीं है."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "संस्थापन स्रोत"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "संस्थापन स्रोत सेटअप में विफल, रेपो यूआरएल जाँचें"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "रिपॉजिटरी सेट करने में त्रुटि"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "सॉफ्टवेयर स्रोत सेटअप करने में त्रुटि"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "संस्थापन स्रोत सेटअप में विफल, रेपो यूआरएल और प्रॉक्सी सेटिंग जाँचें"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "रिपॉजिटरी सेट करने में त्रुटि"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "सॉफ्टवेयर स्रोत सेटअप करने में त्रुटि"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "युक्ति:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS सर्वर %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "अमान्य समयक्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "अमान्य समयक्षेत्र"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "अमान्य समयक्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "कृपया प्रतीक्षा करें... सॉफ्टवेयर मेटाडेटा लोड हो रहा है."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "आपके द्वारा चुना गया डिस्क मुक्त स्थान की निम्नलिखित मात्रा है:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "कृपया प्रतीक्षा करें... सॉफ्टवेयर मेटाडेटा लोड हो रहा है."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2150,7 +2994,7 @@ msgstr ""
 "<b>आपके पास %s संस्थापित करने के लिए पर्याप्त स्थान नहीं है</b>, लेकिन हम आपको \n"
 "स्थान फिर दावा करने के लिए मदद कर सकते हैं ताकि आप मौजूदा विभाजन को सिकोड़ या हटा सकें."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2161,7 +3005,7 @@ msgstr ""
 "डिस्क पर सभी उपलब्ध मुक्त स्थान ही क्यों न\n"
 "उपयोग कर लिया हो."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2175,48 +3019,59 @@ msgstr ""
 "अपने सॉफ्टवेयर चयन को <b>%s</b> के छोटे संस्करण को संस्थापित करने के लिए बदल सकते हैं, "
 "संस्थापक छोड़ सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "संस्थापन गंतव्य"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "भंडारण विन्यास सहेज रहा है..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "भंडार विन्यास सहेजने में विफल..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD युक्ति का प्रारूपण"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "भंडारण विन्यास जाँचने में त्रुटि. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "भंडारण विन्यास जाँचने में त्रुटि. विवरण के लिए क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs free"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d डिस्क चयनित; %s क्षमता; %s मुक्त"
 msgstr[1] "%d डिस्क चयनित; %s क्षमता; %s मुक्त"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr "आपने बूटलोडर संस्थापन को छोड़ने के लिए चुना है. आपका तंत्र बूट योग्य नहीं हो सकता है."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2226,11 +3081,19 @@ msgstr ""
 "बदल सकते हैं\n"
 "संस्थापक को छोड़ सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "भंडारण ख़ाका बदलें (_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2241,75 +3104,80 @@ msgstr ""
 "बदल सकते हैं\n"
 "संस्थापक को छोड़ सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ठीक"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "संजाल विन्यास"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "अमान्य समयक्षेत्र"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s में आपका स्वागत है."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "डाटा"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "आपने अभी तक %s %s संस्थापन के लिए कोई आरोह बिंदु नहीं बनाया है:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "उन्हें स्वतः बनाने के लिए यहाँ क्लिक करें."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "या, '+' प्रतीक के साथ नया आरोह बिंदु बनाएँ."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2320,55 +3188,157 @@ msgid_plural ""
 msgstr[0] "<b>%d डिस्क; %s क्षमता; %s मुक्त स्थान</b> (अविभाजित और फ़ाइलतंत्र में)"
 msgstr[1] "<b>%d डिस्क; %s क्षमता; %s मुक्त स्थान</b> (अविभाजित और फ़ाइलतंत्र में)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "बतौर बूट युक्ति सेट करें (_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "आपके द्वारा चुना गया RAID स्तर के लिए एक से अधिक डिस्क चाहिए जितना आपने चुना है."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "स्तंभ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s आरोह बिंदु को जरूर लिनक्स फ़ाइल तंत्र पर होना चाहिए."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "वह आरोह बिंदु पहले से उपयोग में है. कोई अन्य आजमाएँ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "किसी वैध आरोह बिंदु दर्ज करें."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "वह आरोह बिंदु अवैध है. कोई अन्य आजमाएँ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s रूट में सभी अन्य फ़ाइलतंत्र को साथ ही मिटाएँ."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "क्या आप %s पर सभी आँकड़ा को सचमुच मिटाना चाहते हैं?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "क्या आप %s पर सभी आँकड़ा को सचमुच मिटाना चाहते हैं?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "अमान्य समयक्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "आपने एक कमजोर पासफ्रेज दिया है: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "पासफ्रेज मेल नहीं खाता है.."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "संरक्षित करें"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "सिकोड़ें"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "मिटाएँ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s को %(device)s पर बना रहा है"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "तैयार नहीं है"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "मुक्त स्थान का प्रयोग करें"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2380,14 +3350,14 @@ msgstr ""
 "आप मौजूदा फ़ाइलतंत्र को हटा सकते हैं जिसे आप इस संस्थापन के लिए स्थान खाली करने के लिए "
 "जरूरत नहीं है.  इस फ़ाइलतंत्र को हटाना इसमें शामिल सभी आँकड़े को स्थायी रूप से मिटा देगा."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2395,353 +3365,762 @@ msgid_plural ""
 msgstr[0] "<b>%s डिस्क; %s फिर दावा करने योग्य स्थान</b> (फ़ाइलतंत्र में)"
 msgstr[1] "<b>%s डिस्क; %s फिर दावा करने योग्य स्थान</b> (फ़ाइलतंत्र में)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "दावा करने के लिए कुल चुना गया स्थान: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "मिटाएँ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "संरक्षित करें"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "वितरण संस्थापन"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "स्पोक नाम"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "रिलीज पूर्व / टेस्टिंग"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "नई युक्ति"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "नया चयनक"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "संपन्न (_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "जारी रखें (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "परिवर्तन लागू करें (_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "संजाल विन्यास"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "समूह नाम"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ठीक"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "दिनांक व समय"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "अपराह्न"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "उपयोग NTP सर्वर के लिए जोड़ें और चिह्नित करें"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "वेब सर्वर"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "कार्यशील"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "उपयोग"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "विन्यस्त करें (_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "दिनांक व समय"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "क्षेत्र:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "क्षेत्र:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "शहर:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "शहर:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "संजाल नाम (_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "संजाल नाम"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "पूर्वाह्न/अपराह्न"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "पूर्वाह्न/अपराह्न"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-घंटे"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "पूर्वाह्न/अपराह्न"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "संस्थापन गंतव्य"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "क्षमता"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "संबंधित नहीं"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "चयनित युक्ति"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "कुछ नहीं चयनित किया जा रहा है"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>लेबल:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "गुम फर्मवेयर"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "नहीं (_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN प्रकार"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "चयनित युक्ति"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "सारांश"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID युक्ति"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "जोड़ें (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "डीएनएस"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "तयशुदा मार्ग"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "सबनेट मास्क"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "गति"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "हार्डवेयर पता"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "विन्यस्त करें (_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "सुरक्षा"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "संजाल नाम (_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "संजाल नाम"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "सुरक्षा कुंजी"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "हॉटस्पॉट के रूप में प्रयोग... (_U)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "हॉटस्पॉट रोकें (_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "विन्यस्त करें (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "प्रदाता"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "विन्यस्त करें (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN प्रकार"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "गेटवे"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "समूह नाम"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "समूह कूटशब्द"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "उपयोक्तानाम"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "विन्यस्त करें (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "विधि (_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "विन्यास यूआरएल (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "एचटीटीपी प्रॉक्सी (_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "एचटीटीपी प्रॉक्सी (_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "एफटीपी प्रॉक्सी (_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "सॉक्स होस्ट (_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "भंडारण विन्यास जाँच रहा है..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "खोलें"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "हवाई जहाज मोड (_p)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "भंडारण विन्यास जाँच रहा है..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "मेजबाननाम"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "संजाल विन्यास"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2750,282 +4129,204 @@ msgstr ""
 "हमें आपके स्थान के बारे में सूचना लेने और सॉफ्टवेयर अद्यतन को उपलब्ध करने के लिए\n"
 "संजाल पहुँच की जरूरत होगी."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "डीएनएस"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "तयशुदा मार्ग"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "सबनेट मास्क"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "गति"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "हार्डवेयर पता"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "विन्यस्त करें (_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "सुरक्षा"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "संजाल नाम (_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "संजाल नाम"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "सुरक्षा कुंजी"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "हॉटस्पॉट के रूप में प्रयोग... (_U)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "हॉटस्पॉट रोकें (_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "विन्यस्त करें (_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "प्रदाता"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN प्रकार"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "गेटवे"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "समूह नाम"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "समूह कूटशब्द"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "उपयोक्तानाम"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "विधि (_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "विन्यास यूआरएल (_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "एचटीटीपी प्रॉक्सी (_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "एचटीटीपी प्रॉक्सी (_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "एफटीपी प्रॉक्सी (_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "सॉक्स होस्ट (_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "खोलें"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "हवाई जहाज मोड (_p)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "मेजबाननाम"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "प्रमाणीकरण प्रयोग करें (_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "सत्यापन आवश्यक"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "कनेक्टेड"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "सॉफ्टवेयर चुनाव"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "अपना वातावरण चुनें"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "स्तंभ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "रद्द करें व अधिक डिस्क जोड़ें (_a)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "संस्थापन विकल्प"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>विभाजन प्रकार:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "मेरा आँकड़ा गोपित करें. मैं बाद में पासफ्रेज सेट करूँगा."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "मनपसंद विभाजन चयनित"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "स्थान का दावा करें (_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "संस्थापन विकल्प"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "यहाँ हम वर्णन करेंगे कि मौजूदा सॉफ्टवेयर चयन के लिए कितना स्थान जरूरी है."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "डिस्क मुक्त"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "उपयोग के लिए उपलब्ध खाली स्थान."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs free"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "मौजूदा विभाजन के लिए मुक्त स्थान अनुपलब्ध लेकिन दावा योग्य."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "यहाँ हम वर्णन करेंगे कि आपके विकल्प क्या हैं."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "मुक्त स्थान का प्रयोग करें"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "संस्थापक छोड़ें (_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "युक्ति विवरण"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "स्थानीय मानक डिस्क"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "विभाजन समाप्त करें (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "गोपित करें (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "स्वचालित विभाजन चयनित"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "विभाजन समाप्त करें (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "गोपित करें (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "मेरा आँकड़ा गोपित करें. मैं बाद में पासफ्रेज सेट करूँगा."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "स्वचालित विभाजन विकल्प"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "सारांश"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "पूर्ण डिस्क सारांश और विकल्प..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "कोई कुँजीपट ख़ाका जोड़ें"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "आप कोई कुँजीपट ख़ाका को इसे नीचे चुनकर जोड़ सकते हैं:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "नाम"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "कुंजीपट ख़ाका"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3033,358 +4334,487 @@ msgstr ""
 "किस कुँजीपट ख़ाता को आप इस तंत्र पर उपयोग करना पसंद करेंगे?  आप सूची के शीर्ष पर कोई "
 "खाक़ा को खिसका सकते हैं ताकि आप इसे तयशुदा रूप मे चुन सकें."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "नाम"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "कुँजीपट ख़ाका जोड़ें"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "ख़ाका हटाएँ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "चयनित ख़ाका को ऊपर ले जाएँ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "कुँजीपट ख़ाका जोड़ें"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "ख़ाका हटाएँ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "चयनित ख़ाका को ऊपर ले जाएँ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "चयनित ख़ाका को नीचे ले जाएँ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "पूर्वावलोकन ख़ाका"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "जाँच ख़ाका विन्यास उपलब्ध नहीं है."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift ताकि ख़ाका स्विच किया जा सके."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "विकल्प (_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "जोड़ें (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "कोई कुँजीपट ख़ाका जोड़ें"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "आप कोई कुँजीपट ख़ाका को इसे नीचे चुनकर जोड़ सकते हैं:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "नाम"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "उपलब्ध क्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "कुँजीपट ख़ाका जोड़ें"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ठीक"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ख़ाका स्विचिंग विकल्प"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "कुँजीपट ख़ाका के बीच स्विच करने के लिए किस संयोग को आप पसंद करेंगे?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "उपयोग"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "विवरण"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS आरोह विकल्प:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "भाषा"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "कुछ नहीं चयनित किया जा रहा है"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "रूट कूटशब्द"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "रूट कूटशब्द:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "संपुष्ट करें:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC कूटशब्द"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "रुट कूटशब्द निर्धारित करें"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 "रूट खाता का उपयोग तंत्र के प्रशासन के लिए होता है.  रूट उपयोक्ता के लिए कूटशब्द दाखिल करें."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "संपन्न (_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "मीडिया सत्यापन"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "मीडिया जाँच रहा है, कृपया प्रतीक्षा करें..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "जोड़ें (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ठीक"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP प्रॉक्सी सक्रिय करें (_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>प्रॉक्सी URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>उदाहरण:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "प्रमाणीकरण प्रयोग करें (_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>उपयोक्तानाम</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "उपयोक्तानाम"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>कूटशब्द</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "कूटशब्द:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "संस्थापन स्रोत"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "कौन सा संस्थापन स्रोत आप उपयोग करना चाहेंगे?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "संस्थापन मीडिया को स्वतः पता किया (_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "युक्ति:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>लेबल:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "जाँचें (_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO फ़ाइल (_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "युक्ति:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "कोई ISO चुनें (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "संजाल पर (_n):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "प्रॉक्सी सेटअप (_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS आरोह विकल्प:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "यह क्षेत्र वैकल्पिक है."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "फेडोरा पीपुल रिपॉजिटरी"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "कोई नया आरोहबिंदु जोड़ें"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "जोड़ें (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "चयनित आरोह बिंदु हटाएँ."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "ख़ाका हटाएँ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "संचालन त्रुटि."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "रुट कूटशब्द निर्धारित करें"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "नाम"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>प्रॉक्सी URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "उपयोक्तानाम"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "कूटशब्द:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "वह आरोह बिंदु अवैध है. कोई अन्य आजमाएँ?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "मुझे यहाँ से बाहर ले जाएँ (_G)!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "मुझे मेरी स्थिति स्वीकार है (_I)."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "यह अस्थायी है, रिलीज पूर्व सॉफ्टवेयर."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3395,199 +4825,262 @@ msgstr ""
 "हैं.  हर जगह बग हैं.  बग जिसके साथ आपको जीना होगा.भविष्य का यह OS स्थिर OS नहीं है "
 "जिसपर आप भरोसा कर सकते हैं.  यह केवल जाँच के उद्देश्य से नहीं है."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s में आपका स्वागत है."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "संस्थापन प्रक्रिया के समय आप कौन सी भाषा का प्रयोग करना चाहते हैं?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "जारी रखें (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "उपयोक्तानाम"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "समूह नाम"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "कूटशब्द:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC कूटशब्द"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "आरोह बिंदु जोड़ें (_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>वांछित क्षमता:</b>"
+msgid "Add a new mount point."
+msgstr "कोई नया आरोहबिंदु जोड़ें"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>आरोह बिंदु:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "जोड़ें (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "कोई नया आरोह बिंदु जोड़ें"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"और मनपसंद करने के विकल्प उपलब्ध हैं\n"
-"नीचे आरोह बिंदु बनाने के बाद."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"वह आरोह बिंदु पहले से\n"
-"उपयोग में है.  कोई दूसरा आजमाएँ?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "उदाहरण: \"20 GB\", \"500mb\" (उद्धरण चिह्न को छोड़कर)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "इसे मिटाएँ (_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "आरोह बिंदु विन्यस्त करें"
+msgid "Remove the selected mount point(s)."
+msgstr "चयनित आरोह बिंदु हटाएँ."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "मुक्त"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID युक्ति"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "ख़ाका हटाएँ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "Encrypt"
-msgstr "गोपित करें (_E)"
+msgid "Reload storage configuration from disk."
+msgstr "भंडार विन्यास विफल: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "चयनित युक्ति"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "युक्ति विवरण"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>आरोह बिंदु:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>वांछित क्षमता:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>लेबल:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>युक्ति प्रकार:</b>"
+msgid "Device(s):"
+msgstr "युक्ति:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>फ़ाइल तंत्र:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "गोपित करें (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "फिर संरूपित करें"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "नाम"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>युक्ति प्रकार:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "गोपित करें (_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "फ़ाइलतंत्र"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "फिर संरूपित करें"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "स्तंभ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID युक्ति"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3595,17 +5088,19 @@ msgstr ""
 "यह युक्ति गोपित है और बिना किसी पासफ्रेज के पढ़ा नहीं जा सकता है. आप इसे नीचे अनलॉक कर "
 "सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "पासफ्रेज़:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "अनलॉक करें (_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3613,294 +5108,568 @@ msgstr ""
 "इस युक्ति को सीधे यहाँ संपादित नहीं किया जा सकता है. आप इसे हटा सकते हैं या कोई भिन्न "
 "युक्ति चुन सकते हैं."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "कोई नया आरोहबिंदु जोड़ें"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "चयनित आरोह बिंदु हटाएँ."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "चयनित आरोह बिंदु विन्यस्त करें."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "विन्यस्त करें (_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "भंडार विन्यास विफल: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">उपलब्ध स्थान</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">कुल स्थान</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "आरोह बिंदु विन्यस्त करें"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "एक या अधिक डिस्क चुनें जिसपर यह युक्ति रह सकता है."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ठीक"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "आईपी पता"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "जरूर iSCSI आरंभकर्ता नाम देना चाहिए"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "प्रमाणीकरण प्रयोग करें (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>उदाहरण:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "उपयोक्तानाम"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC कूटशब्द"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "उपयोक्तानाम"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC कूटशब्द"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "उपयोक्तानाम"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC कूटशब्द"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "संजाल नाम"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "प्रमाणीकरण प्रयोग करें (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "उपयोक्तानाम"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC कूटशब्द"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "उपयोक्तानाम"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC कूटशब्द"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "उपयोक्तानाम"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC कूटशब्द"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "कनेक्शन असफल"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ठीक"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "युक्ति:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "चयनित डिस्क"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "बंद करें"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "बूट"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "विवरण"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "मुक्त"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "ख़ाका हटाएँ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "डिस्क सारांश यहाँ है"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "इसे मिटाएँ (_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "कुछ नहीं चयनित किया जा रहा है"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "आरोह बिंदु विन्यस्त करें"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "एक या अधिक डिस्क चुनें जिसपर यह युक्ति रह सकता है."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "आरोह बिंदु जोड़ें (_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>वांछित क्षमता:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>आरोह बिंदु:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "कोई नया आरोह बिंदु जोड़ें"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"और मनपसंद करने के विकल्प उपलब्ध हैं\n"
+"नीचे आरोह बिंदु बनाने के बाद."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"वह आरोह बिंदु पहले से\n"
+"उपयोग में है.  कोई दूसरा आजमाएँ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "उदाहरण: \"20 GB\", \"500mb\" (उद्धरण चिह्न को छोड़कर)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "आरोह बिंदु विन्यस्त करें"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "नाम"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID युक्ति"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "गोपित करें (_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "किसी वैध आरोह बिंदु दर्ज करें."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ठीक"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD युक्ति का प्रारूपण"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "संस्थापन के दौरान एक अज्ञात त्रुटि पायी गई. विवरण नीचे हैं."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "डिस्क गोपन पासफ्रेज"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "पासफ्रेज सहेजें"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "डिस्क गोपन पासफ्रेज"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3909,7 +5678,19 @@ msgstr ""
 "आपने अपने कुछ डाटा को गोपित करने के लिए चुना है. आपको कोई पासफ्रेज बनाना होगा जिसे आप "
 "अपने डाटा की पहुँच के लिए उपयोग करें जब आप अपना कंप्यूटर चालू करते हैं."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "पासफ्रेज़:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "संपुष्ट करें:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3918,117 +5699,172 @@ msgstr ""
 "चेतावनी: आपका मौजूदा कुँजीपट ख़ाका <b>%s</b> है. यदि आप अपने ख़ाका को बदलते हैं, आप "
 "संस्थापन के बाद अपने डिस्क को विगोपित नहीं कर पाएँगे."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "डिस्क स्थान का दावा करें"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ठीक"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "स्थान का दावा करें (_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "डिस्क स्थान का दावा करें"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "विवरण यहाँ है."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "फ़ाइलतंत्र"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "दावा करने योग्य स्थान"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "क्रिया"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "संरक्षित करें"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "मिटाएँ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "सिकोड़ें"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "मनपसंद विभाजन चयनित"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "परिवर्तन लागू करें (_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "युक्ति:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "आरोह बिंदु जोड़ें (_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "संस्थापक छोड़ें (_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "नहीं (_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "हाँ (_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4036,50 +5872,50 @@ msgstr ""
 "क्या आप पक्के हैं कि आप\n"
 "संस्थापन प्रक्रिया को छोड़ना चाहते हैं?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "बाहर (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "संस्थापन सारांश"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "संस्थापन प्रारंभ करें (_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "विन्यास"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "संस्थापित करने के लिए तैयार कर रहा है"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s आपके तंत्र पर सफलतापूर्वक संस्थापित है, लेकिन कुछ विन्यास अभी भी किया जाना है. \n"
-"इसे संपन्न करें और समाप्त विन्या बटन को क्लिक करें."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "विन्यास संपन्न करें (_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s आपके तंत्र पर सफलतापूर्वक संस्थापित है और आपके\n"
-"उपयोग के लिए तैयार है!  आगे बढ़ें!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "रिबूट करें (_R)"
 
@@ -4095,40 +5931,41 @@ msgstr "संस्थापित करें"
 msgid "Install the live CD to your hard disk"
 msgstr "अपने हार्ड डिस्क में लाइव सीडी संस्थापित करें"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "हार्ड ड्राइव में संस्थापित करना आरंभ कर रहा है"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "फेडोरा में स्वागत है"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr "%s को %s MB स्मृति की जरूरत है लेकिन आपके पास केवल %s MB इस मशीन पर है.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s आलेखी संस्थापक के लिए %s MB स्मृति चाहिए, लेकिन आपके पास %s MB ही है."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "पर्याप्त RAM नहीं है"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4142,24 +5979,24 @@ msgstr ""
 "\n"
 " रूट टर्मिनल से."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " पाठ मोड शुरू कर रहा है."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "त्रुटि"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "प्रदर्शक मोड चर सेट नहीं है. पाठ मोड शुरू कर रहा है."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "आलेखी संस्थापन उपलब्ध नहीं है.  पाठ प्रकार प्रारंभ कर रहा है."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4170,20 +6007,20 @@ msgstr ""
 "या संकुल चयन निर्दिष्ट करने की अनुमति नहीं देता है. क्या आप VNC विधि बदले में उपयोग करना "
 "चाहेंगे?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "संस्थापित करने के लिए कृपया ssh install@%s करें."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "संस्थापित करने के लिए कृपया ssh install@<host> करें."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "फेडोरा आजमाएँ"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4193,7 +6030,7 @@ msgstr ""
 "आप फेडोरा को अभी संस्थापित कर सकते हैं या \"हार्ड ड्राइव में संस्थापित करें\" को बाद के लिए "
 "क्रियाकलाप सारांश के लिए चुन सकते हैं."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4201,10 +6038,86 @@ msgstr ""
 "आप \"हार्ड ड्राइव में संस्थापित करें\" को कभी बाद के लिए\n"
 "क्रियाकलाप सारांश में रख सकते हैं"
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "बंद करें"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "मेजबाननाम को 'a-z' या 'A-Z' या '0-9' सीमा में एक उचित वर्ण से अवश्य प्रारंभ होना "
+#~ "चाहिए"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "निम्न फ़ाइल तंत्र पर आपको ज्यादा स्थान की जरूरत है:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "कमांड लाइन विधि में कोई प्रश्न नहीं रख सकता है!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "वह आरोह बिंदु अवैध है. कोई अन्य आजमाएँ?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "संकुल मेटाडेटा डाउनलोड करने में त्रुटि..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "कुछ नहीं चयनित किया जा रहा है"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "गुम फर्मवेयर"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "सत्यापन आवश्यक"
+
+#~ msgid "column"
+#~ msgstr "स्तंभ"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>विभाजन प्रकार:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>प्रॉक्सी URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>उपयोक्तानाम</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>कूटशब्द</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "वह आरोह बिंदु अवैध है. कोई अन्य आजमाएँ?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>लेबल:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>फ़ाइल तंत्र:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID युक्ति"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "चयनित आरोह बिंदु विन्यस्त करें."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">उपलब्ध स्थान</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">कुल स्थान</span>"
+
 #~ msgid "Completed"
 #~ msgstr "समाप्त"
 
@@ -4252,40 +6165,9 @@ msgstr "बंद करें"
 #~ msgid "Install on System"
 #~ msgstr "तंत्र पर संस्थापित करें"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "निम्नलिखित त्रुटि आई जब संस्थापन रिपॉजिटरी सेटअप कर रहा था:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "संस्थापन जारी नहीं रह सकता है."
-
 #~ msgid "Exit installer"
 #~ msgstr "संस्थापक छोड़ें"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "संस्थापन रुक गया था क्योंकि आपके हार्डवेयर में समस्या दिख रही थी. सटीक त्रुटि संदेश है:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "संस्थापन समाप्त हो जाएगा."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "हार्डवेयर त्रुटि आयी"
-
 #~ msgid "_Exit installer"
 #~ msgstr "संस्थापक छोड़ें (_E)"
 
@@ -4569,9 +6451,6 @@ msgstr "बंद करें"
 #~ msgid "Software Development"
 #~ msgstr "सॉफ़्टवेयर विकास"
 
-#~ msgid "Web Server"
-#~ msgstr "वेब सर्वर"
-
 #~ msgid "Minimal"
 #~ msgstr "न्यूनतम"
 
@@ -4615,49 +6494,6 @@ msgstr "बंद करें"
 #~ "जा सकती है:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "आपने एक रूट विभाजन (/) को परिभाषित नहीं किया है, जो कि %s के अधिषठान के जारी "
-#~ "करने के लिए आवश्यक है."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "आपका रूट विभाजन 250 मेगाबाइट से भी कम हैं जो कि %s के संस्थापन के लिए इतना छोटा है "
-#~ "कि संस्थापन नहीं हो सकता."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "इस प्लेटफॉर्म को /boot एक नियत विभाजन या लॉजिकल वॉल्यूम पर चाहिए.  यदि आप एक /"
-#~ "boot वॉल्यूम नहीं चाहते हैं, आपको / किसी प्रतिबद्ध गैर-LVM विभाजन पर रखना होगा."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "आपका %(mount)s विभाजन %(size)s मेगाबाइट से कम है जो कि साधारण "
-#~ "%(productName)s संस्थापन के लिए अनुशंसित से कम है."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "आपका %(mount)s विभाजन %(format)s प्रारूपण के लिए काफी छोटा है (अनुमति प्राप्त "
-#~ "आकार है %(minSize)d MB से %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "आपका %(mount)s विभाजन %(format)s प्रारूपण के लिए काफी बड़ा है (अनुमति प्राप्त "
-#~ "आकार है %(minSize)d MB से %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4673,52 +6509,6 @@ msgstr "बंद करें"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "आपने कोई बूटलोडर stage1 लक्ष्य युक्ति नहीं बनाया है"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "आपने एक बूट योग्य विभाजन नहीं बनाया है."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "आपका BIOS-आधारित तंत्र %s के नए डिस्क लेबल प्रारूप (GPT) के साथ विशेष विभाजन की "
-#~ "जरूरत है. जारी रखने के लिए, कृपया 1MB 'BIOS Boot' विभाजन बनाएँ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "आपने कोई स्वैप विभाजन निर्दिष्ट नहीं किया है. %(requiredMem)s MB स्मृति बिना स्वैप "
-#~ "विभाजन संस्थापन को जारी रखने के लिए जरूरी है, लेकिन आपके पास केवल %(installedMem)s "
-#~ "MB है."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "आपने एक स्वैप विभाजन निर्दिष्ट नहीं किया है. यद्यपि सभी स्थितियों में जरूरी नहीं हैं, "
-#~ "अधिक संस्थापन के लिए यह उत्पादकता बढ़ा देता है."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "कम से कम आपके स्वैप युक्ति में से एक में UUID नहीं है, जो कि mkswap के पुराने संस्करण के "
-#~ "उपयोग से बनाए स्वैप स्थान में सामान्य है. इन युक्तियों को /etc/fstab पथ से संदर्भित "
-#~ "किया जाएगा, जो कि आदर्श नहीं है क्योंकि युक्ति पथ कई स्थितियों में बदल सकता है. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "यह आरोह बिंदु अवैध है.  %s निर्देशिका को जरूर / फ़ाइल तंत्र पर होना चाहिए."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s आरोह बिंदु को जरूर लिनक्स फ़ाइल तंत्र पर होना चाहिए."
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s पर लिनक्स"
 
@@ -4728,11 +6518,6 @@ msgstr "बंद करें"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s लिनक्स %(version)s %(arch)s के लिए"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD युक्ति का प्रारूपण"
-#~ msgstr[1] "DASD युक्तियों का प्रारूपण"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD युक्ति को Linux के साथ उपयोग के लिए तैयार कर रहा है..."
@@ -4930,9 +6715,6 @@ msgstr "बंद करें"
 #~ msgid "Error setting root password"
 #~ msgstr "रूट कूटशब्द सेट करने में त्रुटि"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "आप कोई कूटशब्द जरूर दें और पुष्टि करें."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "संकुल हटाएँ (_R)"
 
@@ -4950,24 +6732,12 @@ msgstr "बंद करें"
 #~ msgid "%s of %s"
 #~ msgstr "%s, %s का"
 
-#~ msgid "Region:"
-#~ msgstr "क्षेत्र:"
-
-#~ msgid "City:"
-#~ msgstr "शहर:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-घंटे"
-
-#~ msgid "AM/PM"
-#~ msgstr "पूर्वाह्न/अपराह्न"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "अपनी सहयुक्ति चुनें"
 
@@ -5040,9 +6810,6 @@ msgstr "बंद करें"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "विभाजन समाप्त करें (_F)"
-
 #~ msgid "Id"
 #~ msgstr "आईडी"
 
diff --git a/anaconda/po/hr.po b/anaconda/po/hr.po
index 72916af..7147069 100644
--- a/anaconda/po/hr.po
+++ b/anaconda/po/hr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,208 +20,441 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Pokreni VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Upotrijebi tekstualan način"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "U redu"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -230,85 +463,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -317,7 +842,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -331,8 +861,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Spašavanje"
 
@@ -370,28 +900,22 @@ msgstr "Sustav za spašavanje"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "U redu"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Izlaz"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -404,7 +928,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -413,28 +937,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Spašavanje"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Vašem se sustavu pristupa iz mape %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Particija 'root' manja je od 250 MB, što je najčešće premalo za instalaciju "
+"%s-a."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Niste odredili korijensku particiju 'root ' (/), potrebnu za nastavak "
+"instalacije %s-a."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Particija 'root' manja je od 250 MB, što je najčešće premalo za instalaciju "
+"%s-a."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Niste odredili razmjensku particiju. Iako nije strogo zahtijevana u svim "
+"slučajevima, može značajno unaprijediti izvršavanje većine instaliranih "
+"sustava."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -526,84 +1230,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Na sljedećim datotečnim sustavima potreban je dodatan prostor:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "stariji paketi"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instaliraj"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Instaliraj"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "U naredbenom retku ne može biti pitanje!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Pogreška"
 
@@ -627,31 +1478,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -666,447 +1519,520 @@ msgstr ""
 "na ovo računalo povezali s drugog računala i izveli instalaciju pomoću "
 "grafičkog sučelja ili želite nastaviti u tekstualnom načinu?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Lozinka mora sadržavati najmanje 6 znakova."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Lozinka mora sadržavati najmanje 6 znakova."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Napredovanje instalacije"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Pokreni VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Napredovanje instalacije"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Razvoj softvera"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Upozorenje"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1121,581 +2047,408 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Razvoj softvera"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1722,277 +2475,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Razvoj softvera"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2000,14 +2777,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2016,33 +2793,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2050,95 +2833,109 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "U redu"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2150,68 +2947,163 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2220,945 +3112,1349 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Nastavi"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "U redu"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Upotrijebi tekstualan način"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Povezano!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Izlazak iz instalacijskog programa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Upozorenje"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3166,643 +4462,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Koji jezik želite upotrebljavati tijekom instalacijskog postupka?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Nastavi"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Slobodno"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID uređaj"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Dodaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Slobodno"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Instaliraj"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "_Ponovo pokreni"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3816,40 +5475,41 @@ msgstr "Instaliraj"
 msgid "Install the live CD to your hard disk"
 msgstr "Živi CD instaliraj na tvrdi disk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3858,60 +5518,70 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Pogreška"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Na sljedećim datotečnim sustavima potreban je dodatan prostor:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "U naredbenom retku ne može biti pitanje!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID uređaj"
+
 #~ msgid "Completed"
 #~ msgstr "Dovršeno"
 
@@ -3921,9 +5591,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Izlazak iz programa za instalaciju"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Izlazak iz instalacijskog programa"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Nedostaje IP adresa."
 
@@ -3960,9 +5627,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "Ovo nije ispravan %s disk."
 
-#~ msgid "Re_boot"
-#~ msgstr "_Ponovo pokreni"
-
 #~ msgid "_Retry"
 #~ msgstr "_Ponovi"
 
@@ -3972,9 +5636,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "konflikt datoteka"
 
-#~ msgid "older package(s)"
-#~ msgstr "stariji paketi"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "nedovoljan prostor na disku"
 
@@ -4028,20 +5689,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Particiju LDL oblikovanog DADS-a nije moguće izbrisati."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Niste odredili korijensku particiju 'root ' (/), potrebnu za nastavak "
-#~ "instalacije %s-a."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Particija 'root' manja je od 250 MB, što je najčešće premalo za "
-#~ "instalaciju %s-a."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4055,15 +5702,6 @@ msgstr ""
 #~ "Instaliranje na FireWire uređaj. Ovaj postupak ne mora proizvesti "
 #~ "funkcionalan sustav."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Niste odredili razmjensku particiju. Iako nije strogo zahtijevana u svim "
-#~ "slučajevima, može značajno unaprijediti izvršavanje većine instaliranih "
-#~ "sustava."
-
 #~ msgid "Back"
 #~ msgstr "Povratak"
 
diff --git a/anaconda/po/hu.po b/anaconda/po/hu.po
index 832286a..e969e45 100644
--- a/anaconda/po/hu.po
+++ b/anaconda/po/hu.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
@@ -27,11 +27,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot fájlrendszer"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -40,7 +40,7 @@ msgstr ""
 "A RAID tömbnek ami tartalmazza '%s' részt legalább a következő raid szintek "
 "közül egyre szüksége van: %s. "
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -49,7 +49,7 @@ msgstr ""
 "A '%s' RAID beállításoknak a következő metaadat verziók egyikét kell "
 "tartalmaznia: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -58,194 +58,466 @@ msgstr ""
 "A '%s' RAID beállításoknak a következő eszköztípusok egyikét kell "
 "tartalmaznia: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s a következő lemezcímkék egyikét kell tartalmaznia: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s nem lehet %s. típusú"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s csatolva kell hogy legyen a az egyikhez: %s"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s %d és %d MB között kell lennie méretben"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s nem lehet kisebb, mint %d MB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s nem lehet nagyobb, mint %d MB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "A %s a lemez első %dMB-ján belül kell legyen."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s az elsődleges partícíón kell hogy legyen."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s nem lehet titkosított blokkeszközön. "
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s nem lehet %s típusú"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "Előfordulhat, h itt: %s nincs elegendő szabad területe a grub2 számára, hogy "
 "befogadja a core.img fájlt ha %s használ %s fájlrendszeren"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC indítása"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Szöveges mód használata"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Jelszó beállítva."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Jelszavak nem egyeznek!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Gyenge jelszót adott meg: %s. Nyomjon újra elfogadást ha mégis felhasználná."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 "Gyenge jelszót adott meg: %s. Nyomjon újra elfogadást ha mégis felhasználná."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Gyenge"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Elégséges"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Jó"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Erős"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "Igen"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nem"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"A következő hiba merült fel a telepítési tároló beállítása során:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"A telepítés itt megszakad."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"A következő hiba merült fel a telepítési tároló beállítása során:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"A telepítés itt megszakad."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"A következő telepítésre jelölt szoftverekben hiba van. Ez általában egy "
+"olyan hiba okozza\n"
+"ami telepítési forrással függ össze. Ebben az esetben megpróbálhatja "
+"eltávolítani ezeket a csomagokat a telepítésből, \n"
+"megváltoztathatja a telepítési forrást, vagy kiléphet a telepítőből."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"A telepítés megállt valószínűleg hardverhiba miatt. A pontos hibaüzenet a "
+"következő:\n"
+"\n"
+"%s.\n"
+"\n"
+"A telepítő most bezárul."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"A telepítés megállt valószínűleg hardverhiba miatt. A pontos hibaüzenet a "
+"következő:\n"
+"\n"
+"%s.\n"
+"\n"
+"A telepítő most bezárul."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Hardver hiba lépett fel"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"A telepítés megállt valószínűleg hardverhiba miatt. A pontos hibaüzenet a "
+"következő:\n"
+"\n"
+"%s.\n"
+"\n"
+"A telepítő most bezárul."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Telepített rendszer beállítása"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Hálózati beállítások rögzítése"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Felhasználók hozzáadása"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Telepített rendszer beállítása"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Telepítés előkészítési szkriptek futtatása"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Telepítési források beállítása..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Rendszerbetöltő telepítése"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Telepítés utáni konfigurációs feladatok végrehajtása"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Rendszerbetöltő telepítése"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Aláírt igazolás szükséges a %s hálózat eléréséhez."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -257,32 +529,324 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s hiányzik. Így a tűzfal nem állítható be."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s hiányzik. Így a tűzfal nem állítható be."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Ez a fájlrendszer nem támogatja a cimkéket."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "A megadott %s név már használatban van."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+"A kötetcsoport %s neve már használatban van. Változtatások nem kerülnek "
+"mentésre."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Telepítés előkészítési szkriptek futtatása"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Kiszolgáló neve nem lehet None, vagy üres szöveg."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "A gazdanév legfeljebb 255 jelből állhat."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"A gazda név első betűje az „a-z”, „A-Z” vagy „0-9” intervallumban kell "
-"legyen."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -292,55 +856,55 @@ msgstr ""
 "tartalmazhatnak, és a vesszővel ellátott részek közt tartalmazniuk kell "
 "valamit, és nem kezdődhetnek vagy végződhetnek '-' jellel."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Csatlakozás..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Leválasztás..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Vezetékes (%s) kapcsolat csatlakozott"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Vezeték nélküli eszköz csatlakozott ide: %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Nincs csatlakozva"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Nincs elérhető hálózati eszköz."
 
@@ -349,7 +913,12 @@ msgstr "Nincs elérhető hálózati eszköz."
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s TELEPÍTÉS"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Új %s %s telepítés"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "A(z) %s futtatása a rendszer leválasztásához ha végzett."
@@ -364,8 +933,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Nem találom a futtatandó /bin/sh-t!  Nem indítok parancssort"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Mentés"
 
@@ -413,21 +982,15 @@ msgstr "Mentendő rendszer"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Melyik rész tartalmazza a meglévő rendszer root partícióját?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Kilépés"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "A rendszer automatikusan újraindul, amikor kilép a parancssorból."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -437,7 +1000,7 @@ msgstr ""
 "csatlakoztat.  Nyomja meg az entert, hogy a parancsértelmezőbe jusson, "
 "ahonnan fsck-t indíthat és csatolhatja a partícióit. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -458,7 +1021,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -471,30 +1034,239 @@ msgstr ""
 "\n"
 "Nyomja meg az <Enter>-t hogy a parancsértelmezőbe jusson."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nincs semmilyen Linux partíciója.  Újraindulás.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "A rendszer automatikusan újraindul, amikor kilép a parancssorból."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mentő mód"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Nem rendelkezik semmilyen Linux partícióval. Térjen vissza enterrel, hogy "
 "terminált kaphasson. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "A rendszer becsatolva %s ponton."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Szabványos partíció"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Lemez"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"A 'swap' terület az operációs rendszer által akkor\n"
+"kerül felhasználásra amikor kevés a memóriája."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"A 'boot' terület a számítógépén azokat a fájlokat tartal-\n"
+"mazzák amivel a tárolt operációs rendszert elindíthatja."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"A 'root' terület az a rész a gépén, ami rendszer \n"
+"fő részeit és az alkalmazásait tárolja."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"A 'home' terület a gépén a az terület ahol a\n"
+"személyes fájljai s adatai kerülnek tárolásra."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"A BIOS boot particiója szükséges ahhoz, hogy bootolhasson\n"
+"egy GPT-re particionált lemezről egy BIOS hardveren."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"A PReP boot partíció szükséges a rendszertöltő\n"
+"konfiguráció részeként néhány PPC platformon."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"A gyökér rész mérete kisebb 250 MB-nál, ami általában nem elég %s "
+"telepítéséhez."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "Nem adta meg a root partíciót (/), ami nélkül %s nem telepíthető."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Ez a platform egy külön /boot partíciót igényel egy erre megjelölt "
+"partíción, vagy logikai köteten.  Ha nem szeretne külön /boot kötetet, egy "
+"nem LVM partíció / könyvtárába kell telepítenie."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Az Ön %(mount)s particiója nem éri el a %(size)s MB ami kevesebb mint az "
+"ajánlott normál %(productName)s telepítéshez."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"A %(mount)s partíciód túl kicsi a %(format)s formázáshoz (megengedett méret "
+"%(minSize)d MB és %(maxSize)d MB közötti)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"A %(mount)s partíciód túl nagy a %(format)s formázáshoz (megengedett méret "
+"%(minSize)d MB és %(maxSize)d MB közötti)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Új eszköz hozzáadása sikertelen. Kattintson a részletekért."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Nem csinált rendszerindító részt."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Az Ön BIOS alapú rendszere igényli egy speciális partició kialakítását %s új "
+"lemezcimke formátumával (GPT). A folytatáshoz, kérem készítsen egy 1Mbyte "
+"'BIOS Boot' típusú particiót."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Nem adott meg egy swap partíciót.  %(requiredMem)s MB memória szükséges a "
+"telepítés folytatásához  swap nélkül, de csak %(installedMem)s MB elérhető."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Nem adott meg swap partíciót.  Erre nincs mindig szükség, de a legtöbb "
+"esetben jelentősen növelheti a teljesítményt."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Legalább egy - a swap eszközök közül nem rendelkezik UUID-vel, ami "
+"megszokott ha az régebbi verziójú mkswap programmal készült. Ezek az "
+"eszközök egyenként fognak hivatkozni az /etc/fstab fájlban, ami nem ideális "
+"amióta az eszközök elérési útjai számtalan ok miatt megváltozhatnak. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Ez a csatoló pont érvénytelen.  %s mappának a / fájlrendszerben kell lennie."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s csatoló pontnak linuxos fájlrendszerben kell lennie."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Jelszó:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -606,53 +1378,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "A megadott VNC jelszó nem volt min. 6 karakter hosszú.\n"
 "Kérem adjon meg egy újat. Vagy hagyja ütesen jelszó elhagyásához."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Telepítési forrás beállítása sikertelen"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "HIba a csomag metaadatainak letöltésekor..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Nincs elérhető telepítési forrás"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Szoftverek telepítése"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Csomagtelepítési eljárás indítása"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Több szabad helyre van szüksége az alábbi fájlrendszereken:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Tranzakció előkészítése a telepítési forrásból"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Telepítés"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Csomagok metaadatainak letöltése..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Telepítés"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Telepítés előkészítése"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Tárolóeszközök összeállításának ellenőzése..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "ALAPÉRTELMEZETT CÍMKE"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALIZÁCIÓ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALIZÁCIÓ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SZOFTVER"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "RENDSZER"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "FELHASZNÁLÓI BEÁLLÍTÁSOK"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -661,34 +1518,101 @@ msgstr ""
 "Nincs elegendő tárhely a kiválasztott jelenlegi szoftver-összeállításhoz. "
 "További %s szükséges."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Telepítési Központ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Automatizált telepítés indítása"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Nem lehet kérdezni parancssoros módban!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "Kérem válasszon fentről ['q' kilépéshez | 'c' a folytatáshoz]:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Kérem fejezzen be minden fokozatot mielőtt folytatja"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Alapértelmezett HUB cím"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Kérem fejezzen be minden fokozatot mielőtt folytatja"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Hiba"
 
@@ -712,32 +1636,35 @@ msgstr "igen"
 msgid "no"
 msgstr "nem"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Biztos hogy ki akar lépni?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "Kérem válasszon fentről ['q' kilépéshez | 'c' a folytatáshoz]:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -753,219 +1680,258 @@ msgstr ""
 "telepítés indításához, vagy inkább szöveges módban szeretné folytatni a "
 "telepítést?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC jelszó"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Kérem adja meg a VNC jelszavát. Kétszer kell begépelnie.\n"
 "Ha nem kíván jelszót, hagyja üresen."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Jelszó:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Jelszó (erősítse meg):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Jelszavak nem egyeznek!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "A jelszó legalább 6 karakter hosszú kell legyen."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "A jelszó legalább 6 karakter hosszú kell legyen."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Időzóna beállítások"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Időzóna nincs beállítva"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Elérhető régiók"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Elérhető régiók"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Hálózati beállítások rögzítése"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Vezetékes (%s) kapcsolat csatlakozott"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Vezetékes (%s) kapcsolat csatlakozott"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Kiszolgáló neve:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Kiszolgálónév"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Kiszolgálónév"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Kiszolgálónév nem érvényes: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Konfiguráció be_fejezése"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Átjáró"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "fájlrendszer beállításból hiányzik a típus"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Telepített rendszer beállítása"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root jelszó:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Jelszó beállítva."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root jelszó kikapcsolva."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Jelszó nincs beállítva."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Kérem válasszon új root jelszót. Kétszer kell majd megadnia."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Használja fel az összes tárhelyet"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Cserélje le a meglévő Linux rendszer(eke)t"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Szabad tárhelyet használja fel"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Telepítési cél"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nincsenek kiválasztott lemezek"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Hiba a tárolóeszközök összeállításának ellenőzésekor"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Hiba a tárolóeszközök összeállításának ellenőzésekor"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automata particionálás kiválasztva"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Egyéni particionálás kiválasztva"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -974,40 +1940,62 @@ msgstr ""
 "csatlakoztasson legalább egy lemezt, és indítsa újra a teljes telepítési "
 "folyamatot."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Nincs egyetlen lemez se kiválasztva; kérem legalább egy lemezt válasszon "
 "amire telepítene"
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Tárolók tesztelése..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "Kivála_sztás"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Frissített tárhely információk előállítása"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "taroló összeállítás sikertelen: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Tárolóeszközök összeállításának ellenőzése..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Automata particionálási opciók"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1016,41 +2004,41 @@ msgstr ""
 "A telepítés megkívánja a merevlemez felosztását. Válasszon területet amit "
 "telepítési célként használ majd fel."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Partíciós séma összeállítása"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Partíciós séma összeállítása"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Időzóna beállítások"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s időzóna"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Időzóna nincs beállítva"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Elérhető időzónák a régióban %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Elérhető régiók"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1059,178 +2047,196 @@ msgstr ""
 "Használjon számokat vagy gépelje be a neveket közvetlenül [b a régió "
 "listáért, q a kilépéshez]:"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC indítása"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Telepítés állapota"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Legközelebbi tükör"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS kiszolgáló %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Szoftver forrás beállítása sikertelen"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Semmi sincs kijelölve"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Csatlakozás..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD meghajtó"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO fájl:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Hálózati idő"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Nincs elérhető telepítési forrás"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Telepítési forrás beállítása sikertelen"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "HIba a csomag metaadatainak letöltésekor..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Nincs elérhető telepítési forrás"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS kiszolgáló %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS csatolási opciók:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Telepítési forrás beállítása sikertelen, ellenőrizze a megadott URL-t"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "az eszköz tartalmaz /boot könyvtárat"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Telepítési forrás beállítása sikertelen"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Kijelölt szoftverek _módosítása"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Hiba a kiválasztott szoftverek ellenőrzésekor"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Telepítési forrás nincs beállítva"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Forrás megváltozott - kérem ellenőrizze"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Egyéni szoftverek kiválasztva"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Telepítési forrás nincs beállítva"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Válasszon környezetet"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "Azonosítás használata"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Ajda meg jelszavát amit meg kell erősítenie."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Figyelmeztetés"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1246,36 +2252,36 @@ msgstr "Folyamatban"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tTelepítés befejeződött.  Nyomjon entert kilépéshez"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Alapértelmezett fokozat neve"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "Állapot tesztelése"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Új eszköz"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Jelszó (erősítse meg):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1283,7 +2289,7 @@ msgid ""
 msgstr ""
 "Gyenge jelszót adott meg: %s. Nyomjon újra elfogadást ha mégis felhasználná."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1291,63 +2297,47 @@ msgid ""
 msgstr ""
 "Gyenge jelszót adott meg: %s. Nyomjon újra elfogadást ha mégis felhasználná."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Jelszó beállítva."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Kilépés a t_elepítőből"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Súgó"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "Kilépés"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nem"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "Igen"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "ALAPÉRTELMEZETT CÍMKE"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALIZÁCIÓ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALIZÁCIÓ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SZOFTVER"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "RENDSZER"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "FELHASZNÁLÓI BEÁLLÍTÁSOK"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1355,7 +2345,11 @@ msgstr ""
 "Kérem fejezze be az ezzel az ikonnal jelölt következő elemeket mielőtt "
 "folytatná a következő lépéssel."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Kész!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1364,49 +2358,47 @@ msgstr ""
 "%s most sikeresen telepítésre került a rendszerére és kész\n"
 "arra, hogy használatba vegye. Gyerünk, indítson újra, és élvezze!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Kész!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "Kilépés"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Új %s %s telepítés"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s sikeresen települt a rendszerében, de néhány beállítást és finomhangolást "
+"még el kell végeznie.\n"
+"Kérem fejezze be és kattintson a Konfiguráció befejezésére."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s most sikeresen telepítésre került a rendszerére és kész\n"
+"arra, hogy használatba vegye. Gyerünk, indítson újra, és élvezze!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Új kötetcsoport készítése..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Az eszköz újraparaméterezése sikertelen. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Kérem adjon nevet a kötetcsoportjának és válasszon legalább egy lemezt alább."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Kötetcsoport:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "oszlop"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
@@ -1414,121 +2406,20 @@ msgstr ""
 "Kat\n"
 "tintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Az eszköz újraparaméterezése sikertelen. Kattintson a részletekért."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Kérem adjon meg egy érvényes csatolási pontot."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Ez a csatolási pont érvénytelen. Megpróbálja másképp?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Ez a csatolási pont már használatban van. Megpróbál másikat?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"A kiválasztott RAID szintje több lemezt igényel, mint amit jelenleg "
-"kiválasztott."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Kérem adjon meg egy érvényes csatolási pontot."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Ez a csatolási pont érvénytelen. Megpróbálja másképp?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Szabványos partíció"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Lemez"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Nincs"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-"Töröljön minden más fájlrendszert is innen: %s , beleértve a root részét is."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Biztos benne hogy törli az összes adatot innen: %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Biztos benne hogy törli az összes adatot innen: %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "KÉZI PARTICIONÁLÁS"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d tárolóeszköz kiválasztva"
 msgstr[1] "%d tárolóeszköz kiválasztva"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1537,131 +2428,114 @@ msgstr ""
 "Amikor csatolási pontot készít a %s %s telepítéshez,\n"
 "itt megtekintheti a részleteket."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"A 'swap' terület az operációs rendszer által akkor\n"
-"kerül felhasználásra amikor kevés a memóriája."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"A 'boot' terület a számítógépén azokat a fájlokat tartal-\n"
-"mazzák amivel a tárolt operációs rendszert elindíthatja."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"A 'root' terület az a rész a gépén, ami rendszer \n"
-"fő részeit és az alkalmazásait tárolja."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"A 'home' terület a gépén a az terület ahol a\n"
-"személyes fájljai s adatai kerülnek tárolásra."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"A BIOS boot particiója szükséges ahhoz, hogy bootolhasson\n"
-"egy GPT-re particionált lemezről egy BIOS hardveren."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"A PReP boot partíció szükséges a rendszertöltő\n"
-"konfiguráció részeként néhány PPC platformon."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi számára %s típusú eszközön kell lennie"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s számára %s típusú eszközön kell lennie"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s nem titkosítható"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Létre kell hoznia egy új fájlrendszer a root eszközön."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Az %s típusú eszközök érvényes RAID szint kiválasztását igénylik."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "Eszköz átméretezési kérése meghiúsult. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "Eszköz újraformázási kérése meghiúsult. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "A megadott %s név már használatban van."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Ez a fájlrendszer nem támogatja a cimkéket."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nincsenek kiválasztott lemezek"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Ez a fájlrendszer nem átméretezhető."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Hiba az tárolók összeállításának vizsgálatakor. Kattintson a részletekért."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Hiba az tárolók összeállításának vizsgálatakor. Kattintson a részletekért."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Egy új %s került hozzáadásra a meglévő %s gyűjtőhöz."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Új eszköz hozzáadása sikertelen. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Érvénytelen partíciós méret. Adjon meg valós egész értéket."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Eszköz eltávolitási kérése meghiúsult. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 "A kötetcsoport %s neve már használatban van. Változtatások nem kerülnek "
 "mentésre."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs szabad"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1670,7 +2544,7 @@ msgstr ""
 "Ez a szoftveres RAID kötet hiányol a %d / %d rész partíciót. Eltávolíthatja, "
 "vagy választhat egy másik eszközt."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1679,299 +2553,146 @@ msgstr ""
 "Ez a szoftveres LVM kötet hiányol a %d / %d rész partíciót. Eltávolíthatja, "
 "vagy választhat egy másik eszközt."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nincsenek lemezek kiválasztva."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Nincs elég szabad hely a kiválasztott lemezeken."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automata particionálás sikertelen. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Kijelölt szoftverek _módosítása"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "A titkosított blokk eszköz feloldása sikertelen. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Úgy döntött, hogy manuálisan állítja be a fájlrendszert az új "
-"%(productName)s telepítéséhez. Mielőtt elkezdené, érdemes egy percet, hogy "
-"tanulmányozza a felületet. Ez eléggé megváltozott a korábbiakhoz képest.\n"
-"\n"
-" A legfontosabb változás az, hogy az új fájlrendszer létrehozása "
-"modernizálásra került. Többé nem kell kézzel felépíteni bonyolult eszközöket "
-"lépésenként, mint a LVM logikai köteteket (fizikai méret, majd kötet "
-"csoport, majd a logikai kötet) -- most csak hozzon létre egy logikai kötetet "
-"és mi kezeljük a további beállításokhoz igényelt utánjárást,  ideértve a "
-"fizikai kötetméreteket és a kötetcsoportot - ami tartalmazza majd azt. "
-"Kezelni fogjuk a kötetcsoport kiigazítását, ahogy hozzáadja, az "
-"eltávolítását és átméretezését a logikai köteteknek is, így nem kell "
-"bajlódnia a különféle részletekkel.\n"
-"\n"
-"\n"
-"Felület elrendezés\n"
-"\n"
-"A bal oldali a képernyőn a különféle operációs rendszer  telepítéseket "
-"tudjuk megtalálni ezen a számítógépen. Az új %(productName)s telepítést a "
-"lista tetején találja. Kattintson a telepítés nevére, hogy lássa milyen "
-"fájlrendszert tartalmaznak azok.\n"
-"\n"
-"A különböző telepítések és csatlakoztatási pontok alatt a bal oldalon "
-"gombokat talál új fájlrendszer hozzáadásához, eltávolításához,  vagy "
-"beállításához.\n"
-"\n"
-"A jobb oldalon a képernyőn, az hely az, ahol testre szabhatja az aktuálisan "
-"kiválasztott csatolási pontokat.\n"
-"\n"
-"A bal alsó részben látni fog mindig egy összefoglalót a kiválasztott "
-"lemezekről - amikről úgy döntött, hogy használni fog a telepítéshez. Ha "
-"további részletek is érdeklik a lemezeket illetően, akkor kattintson a kék "
-"szövegre további részletes információhoz.\n"
-"\n"
-"\n"
-"Hogyan hozzunk létre egy új fájlrendszert egy új eszközön\n"
-"\n"
-"1. Kattintson a + gombra.\n"
-"2. Adja meg a csatolási pontot és a méretét. (Tipp: Vigye az egérmutatót "
-"bármelyik szövegbeviteli területre segítségért.)\n"
-"3. Válassza ki az új csatlakoztatási pont alatt az \"Új %(productName)s "
-"telepítés\", majd a bal oldalon szabja testre, hogy megfeleljen az "
-"igényeinek.\n"
-"\n"
-"\n"
-"Hogyan formázhat eszközt / fájlrendszert, amely már létezik a lemezen\n"
-"\n"
-"1. Válassza ki a fájlrendszert a képernyő bal oldalán.\n"
-"2. Kattintson a \"Testreszabás\" kibontható menün a csatolási pont "
-"beállítási területen a képernyő jobb oldalán.\n"
-"3. Aktiválja az \"Újraformázás\" jelölőmezőt, válassza ki a fájlrendszer "
-"típusát és adott esetben, adjon meg egy csatolási pontot a \"Csatolási pont"
-"\" beviteli mezőben.\n"
-"4. Kattintson a \"Módosítások alkalmazása\" gombra\n"
-"\n"
-"\n"
-"Hogyan kell beállítani egy csatolási pontot a fájlrendszerhez, amely már "
-"létezik a lemezen\n"
-"\n"
-"1. Válassza ki a fájlrendszert a képernyő bal oldalán.\n"
-"2. Írja be a csatlakoztatási pontot a \"Csatolási pont\" szövegbeviteli "
-"terület a csatolási pont testreszabási területen.\n"
-"3. Kattintson a \"Módosítások alkalmazása\" gombra \n"
-"\n"
-"\n"
-"Hogyan kell eltávolítani a fájlrendszert, amely már létezik a lemezen\n"
-"\n"
-"1. Válassza ki az eltávolítani kívánt fájlrendszert a képernyő bal "
-"oldalán. \n"
-"2. Kattintson a - gombra.\n"
-"\n"
-"Tipp: Eszköz eltávolítása, amely már létezik a lemezen az \"Új "
-"%(productName)s telepítés\"-ben nem távolítja el a lemezről. Csak "
-"visszaállítja az eszközt az eredeti állapotába. Ha el szeretne távolítani "
-"egy eszközt, amely már létezik a lemezen, akkor ki kell választania bármely "
-"egyéb felismert telepítések  (vagy \"Ismeretlen\") közül, és nyomja meg a - "
-"gombot.\n"
-"\n"
-"Tippek és tanácsok\n"
-"\n"
-"Megadhat  az új fájlrendszerekhez méreteiben olyan értéket, amely nagyobb, "
-"mint a teljes rendelkezésre álló szabad hely. A telepítő kívánthoz a lehető "
-"legközelebbi méretet igyekszik majd felajánlani. \n"
-"\n"
-"Alapértelmezés szerint az új eszközök felhasználhatnak bármely / minden "
-"kiválasztott lemezt.\n"
-"\n"
-"Megadhatja mely lemez kerüljön felosztásra, akkor ha a Beállítás gombra "
-"kattint (Az egyik az egy grafikus eszköz), addig míg az eszköz ki van "
-"választva.\n"
-"\n"
-"Ha  egy új csatolási pontot ad meg, kattintson a + gombra, majd hagyja a "
-"méret bejegyzést üresen, hogy az új eszköz felhasználhassa az összes "
-"rendelkezésre álló szabad helyet.\n"
-"\n"
-"Ha eltávolítja az utolsó eszközt egy olyan konténer eszközből, mint egy LVM "
-"kötet-csoport, akkor automatikusan eltávolítjuk a konténer eszközt, hogy "
-"legyen helye az új eszközök számára. \n"
-"\n"
-"Amikor az utolsó partíciót is eltávolítjuk a lemezről, előfordulhat, hogy a "
-"lemez alapállapotba állításakor új partíciós tábla kerül beállításra, ha úgy "
-"érezzük, ott megfelelőbb típus elérhető az adott lemez számára. \n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DÁTUM ÉS IDŐ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Rossz időzóna"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "DU"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 "Elsőként a hálózatot kell beállítania ha az NTP szolgáltatást kívánja "
 "használni."
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Nincs működő NTP kiszolgálója beállítva"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "TELEPÍTÉSI CÉL"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d tárolóeszköz kiválasztva"
+msgstr[1] "%d tárolóeszköz kiválasztva"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "Kiosztás váltásához :%s"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "BILLENTYŰZET"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Teszt kiosztás összeállítása nem elérhető."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "Állapot tesztelése"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Kiosztás váltási funkció nincs beállítva."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "NYELV"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Állapot ismeretlen (hiányzik)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Állapot ismeretlen"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Nincs beállítva"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Elérhetetlen"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware hiányzik"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kábel kihúzva"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Elérhetetlen"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Leválasztva"
@@ -1996,153 +2717,169 @@ msgstr "Leválasztás"
 msgid "Connection failed"
 msgstr "Csatlakozás sikertelen"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "kihúzva"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Vezetékes"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Vezeték nélküli"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "kihúzva"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 cím"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 cím"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP cím"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Nincs"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Azonosítás szükséges"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Jelszó:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "HÁLÓZATI BEÁLLÍTÁSOK"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "RENDSZERGAZDA JELSZÓ"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Jelszó beállítva."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root jelszó beállítva"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root felhasználó kikapcsolva"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root jelszó nincs beállítva"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SZOFTVER KIVÁLASZTÁS"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Szoftverek függőségeinek ellenőrzése..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Hiba történt a függőségek ellenőrzésekor"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Csomagok metaadatainak letöltése..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Csoport metaadatainak letöltése..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Szoftverek függőségeinek ellenőrzése..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Hiba történt a függőségek ellenőrzésekor"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Hiba történt a függőségek ellenőrzésekor. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "A következő telepítésre jelölt szoftverekben hiba van. Ez általában egy "
 "olyan hiba okozza\n"
@@ -2150,46 +2887,77 @@ msgstr ""
 "eltávolítani ezeket a csomagokat a telepítésből, \n"
 "megváltoztathatja a telepítési forrást, vagy kiléphet a telepítőből."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Mégsem"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "Kilépés"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "Szoftverforrás _módosítása"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Kijelölt szoftverek _módosítása"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Telepítési források beállítása..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "HIba a csomag metaadatainak letöltésekor..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Azonosítás szükséges"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Ez a média alkalmas a telepítésre."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Ez a média nem alkalmas a telepítésre."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "TELEPÍTÉSI FORRÁS"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Telepítési forrás beállítása sikertelen, ellenőrizze a megadott URL-t"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Hiba a tároló beállítása közben"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Szoftver forrás beállítása sikertelen"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2197,98 +2965,80 @@ msgstr ""
 "Telepítési forrás beállítása sikertelen, ellenőrizze a megadott tároló URL-"
 "t, és proxy beállításait"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Hiba a tároló beállítása közben"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Szoftver forrás beállítása sikertelen"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Eszköz:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS kiszolgáló %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Rossz időzóna"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Rossz időzóna"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Rossz időzóna"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Kérem várjon... szoftver metaadatai még töltődnek..."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "A kiválasztott lemezeken elérhető összes szabad hely:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Kérem várjon... szoftver metaadatai még töltődnek..."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2298,7 +3048,7 @@ msgstr ""
 "<b>Nincs elég szabad tárhelye %s</b> telepítéshez, de segíthetünk\n"
 "visszanyerni átméretezéssel, vagy a partíciók eltávolításával."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2309,7 +3059,7 @@ msgstr ""
 "az összes szabad tárhelyet\n"
 "a kiválasztott lemezeken."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2324,44 +3074,51 @@ msgstr ""
 "módosíthatja, leválogathatja a szoftvereit, hogy kisebb méretű verziót "
 "kapjon <b>%s</b>, vagy kiléphet a telepítőből."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "TELEPÍTÉSI CÉL"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Tároló konfiguráció mentése..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Tároló összeállítás mentése sikertelen..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD eszköz formázása"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Hiba az tárolók összeállításának vizsgálatakor. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Hiba az tárolók összeállításának vizsgálatakor. Kattintson a részletekért."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs szabad"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d lemez kiválasztva; %s kapacitással; %s szabad"
 msgstr[1] "%d lemez kiválasztva; %s kapacitással; %s szabad"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2369,7 +3126,11 @@ msgstr ""
 "Az választotta, hogy kihagyja a rendszerbetöltő telepítését. A rendszere "
 "lehetséges, hogy nem lesz indítható."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2379,11 +3140,19 @@ msgstr ""
 "az esetben módosíthatja a tárolók kiosztását,\n"
 "vagy kiléphet a telepítőből."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "Kilépés"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Módosítsa a tárhely kiosztását"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2394,76 +3163,80 @@ msgstr ""
 "az esetben módosíthatja a tárolók kiosztását,\n"
 "vagy kiléphet a telepítőből."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "FELHASZNÁLÓI BEÁLLÍTÁSOK"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Rossz időzóna"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "ÜDVÖZLI A %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "ADATOK"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Még nem készített egyetlen csatolási pontot sem a %s %s telepítéséhez:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Kattintson ide az automatikus elkészítésükhez."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Vagy,  készítsen új csatolási pontokat az alábbi '+' ikonnal."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2478,55 +3251,163 @@ msgstr[1] ""
 "<b>%d lemez; %s kapacitás; %s szabad terület</b> (partícionálatlan és a "
 "rendszeren belül)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "Ne telepítsen rendszerbetöltőt"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "Állít_sa be mint bootolható eszközt"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"A kiválasztott RAID szintje több lemezt igényel, mint amit jelenleg "
+"kiválasztott."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Kérem adjon nevet a kötetcsoportjának és válasszon legalább egy lemezt alább."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Kötetcsoport:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "oszlop"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s csatoló pontnak linuxos fájlrendszerben kell lennie."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Ez a csatolási pont már használatban van. Megpróbál másikat?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Kérem adjon meg egy érvényes csatolási pontot."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Ez a csatolási pont érvénytelen. Megpróbálja másképp?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+"Töröljön minden más fájlrendszert is innen: %s , beleértve a root részét is."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Biztos benne hogy törli az összes adatot innen: %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Biztos benne hogy törli az összes adatot innen: %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Rossz időzóna"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "Kilépés"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Gyenge jelszót adott meg: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Jelszavak nem egyeznek."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Megőriz"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Összezsugorít"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Törli"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Ez az eszköz tartalmazza a telepítési forrást."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr " A %(type)s létrehozása itt: %(device)s "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Nem kész"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Szabad tárhelyet használja fel"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2540,14 +3421,14 @@ msgstr ""
 "fájlrendszer eltávolításával véglegesen törli az összes adatot amit "
 "tartalmaz."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2555,353 +3436,762 @@ msgid_plural ""
 msgstr[0] "<b>%s lemez; %s visszanyerhető tárhely</b> (fájlrendszerben)"
 msgstr[1] "<b>%s lemezek; %s visszanyerhető tárhely</b> (fájlrendszerben)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Teljes visszanyerni kívánt tárhely:  <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Törli"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Megőriz"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "DISZTRIBÚCIÓ TELEPÍTÉS"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "MONDOTT NÉV"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "KIADÁS ELŐTTI  / TESZT VÁLTOZAT"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Új eszköz"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Új választó"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "Kész"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Tovább"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "Változások _alkalmazása"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "HÁLÓZATI BEÁLLÍTÁSOK"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Csoport neve"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Mégsem"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DÁTUM ÉS IDŐ"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "DU"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Adja meg és jelölje ki az NTP kiszolgálók használatához"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web kiszolgáló"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Működik"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Alkalmaz"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Beállítás..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DÁTUM ÉS IDŐ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Régió:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Régió:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Város:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Város:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Hálózat  _neve"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Hálózat neve"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "DE/DU"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "DE/DU"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 órás"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "DE/DU"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "TELEPÍTÉSI CÉL"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapacitás"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Nincs csatlakozva"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Kiválasztott eszköz"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Semmi sincs kijelölve"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Címke:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware hiányzik"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nem"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN típusa"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Kiválasztott eszköz"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "összesítés"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID eszköz"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Hozzáadás"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Alapértelmezett elérési út"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Alhálózati maszk"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Sebessége"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardver cím"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Beállítás..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Biztonság"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Hálózat  _neve"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Hálózat neve"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr " Biztonsági kulcs"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "Alkalmazás Hotspot-ként..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "Hot_spot leállítása..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Beállítás..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Szolgáltató"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Beállítás..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN típusa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Átjáró"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Csoport neve"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Csoport jelszava"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Felhasználónév"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Beállítás..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metódus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "Beállítási URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks Host"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Hálózati beállítások rögzítése"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Feloldás"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Re_pülő mód"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Hálózati beállítások rögzítése"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Kiszolgáló neve:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "HÁLÓZATI BEÁLLÍTÁSOK"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2910,206 +4200,61 @@ msgstr ""
 "Szükséges egy hálózati hozzáférés a helyéről, és hogy\n"
 "a szoftverfrissítések elérhetőek legyenek számára."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Alapértelmezett elérési út"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Alhálózati maszk"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Sebessége"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardver cím"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "Beállítás..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Biztonság"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "Hálózat  _neve"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Hálózat neve"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr " Biztonsági kulcs"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "Alkalmazás Hotspot-ként..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "Hot_spot leállítása..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "Beállítás..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Szolgáltató"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN típusa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Átjáró"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Csoport neve"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Csoport jelszava"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Felhasználónév"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metódus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "Beállítási URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks Host"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Feloldás"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Re_pülő mód"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Kiszolgáló neve:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "Azonosítás használata"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Azonosítás szükséges"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Csatlakozás"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SZOFTVER KIVÁLASZTÁS"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Válasszon környezetet"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "oszlop"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Mégsem & további lemezek hozzá_adása"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "TELEPÍTÉSI OPCIÓK"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Partició típusa:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Titkosítsa az adatokat. A jelszót később állítom be."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Egyéni particionálás kiválasztva"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "Lemezte_rület visszanyerése"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "TELEPÍTÉSI OPCIÓK"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3117,78 +4262,145 @@ msgstr ""
 "Itt jelenítjük meg mennyi tárhelyre lesz szüksége a jelenlegi kiválasztott "
 "szoftverekhez"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "üres"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "szabad hely felhasználható"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs szabad"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Szabad terület ami nem elérhető, de visszanyerhető a meglévő partíciókból."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Itt megjelenítjük milyen lehetőségei vannak."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Szabad tárhelyet használja fel"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "Kilépés a telepítőből"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Eszközinformációk"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Helyi szabványos lemezek"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "Partícionálás be_fejezése"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Titkosítás"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automata particionálás kiválasztva"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "Partícionálás be_fejezése"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "Titkosítás"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Titkosítsa az adatokat. A jelszót később állítom be."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Automata particionálási opciók"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "összesítés"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Teljes lemezinformáció összegzés és opciók..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "BILLENTYÚZETKIOSZTÁS HOZZÁADÁSA"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Hozzáadhatja a billentyűzet kiosztását az alábbi listából kiválasztva:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Neve"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "BILLENTYŰZET KIOSZTÁSA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3197,7 +4409,7 @@ msgstr ""
 "Bármelyik kiosztást elmozgathatja a lista elejére, hogy alapértelmezettként "
 "kiválaszthassa."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3205,117 +4417,199 @@ msgstr ""
 "A változtatások csak a telepített rendszerre lesznek érvényesek. Használja a "
 "felület eszközeit a telepítésnél a billentyűzet beállításához."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "neve"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Kiosztás hozzáadása"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Kiosztás eltávolítása"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Kiválasztott kiosztás mozgatása felfelé"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Kiosztás hozzáadása"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Kiosztás eltávolítása"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Kiválasztott kiosztás mozgatása felfelé"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Kiválasztott kiosztás mozgatása lefelé"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Kiosztás előnézete"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Teszt kiosztás összeállítása nem elérhető."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift a kiosztások átváltásához."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Opciók"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Hozzáadás"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "BILLENTYÚZETKIOSZTÁS HOZZÁADÁSA"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Hozzáadhatja a billentyűzet kiosztását az alábbi listából kiválasztva:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Neve"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Elérhető régiók"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Kiosztás hozzáadása"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "KIOSZTÁS VÁLTÁSI OPCIÓK"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Melyik kombináció(kat) részesíti előnyben a billentyűzet kioszás váltásához?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "Alkalmaz"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "Leírás"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS csatolási opciók:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "NYELV"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Semmi sincs kijelölve"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "RENDSZERGAZDA JELSZÓ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root jelszó:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Megerősítés:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC jelszó"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Állítsa be a root jelszavát"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3323,237 +4617,285 @@ msgstr ""
 "A root jelszó a rendszer adminisztrálására szolgál. Adja meg a jelszavát a "
 "root felhasználóhoz."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "Kész"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MÉDIA ELLENŐRZÉS"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Média ellenőrzése, kérem várjon..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Hozzáadás"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP Proxy _engedélyezése"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Például:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "Azonosítás használata"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Felhasználói név</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Felhasználónév"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Jelszó</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Jelszó:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "TELEPÍTÉSI FORRÁS"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Melyik telepítési forrást kívánja felhasználni?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Automatikusan észlelt média:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Eszköz:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Címke:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "Ellenőrzés"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO fájl:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Eszköz:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "Válasszon egy ISO lemezképet"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Hálozato_n"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxy beállítása..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Ez az URL hivatkozik a tükrök listájára."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS csatolási opciók:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Ez a mező opcionális."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People tároló"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Új csatolási pont hozzáadása"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Hozzáadás"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Távolítsa el a csatolási pontot (pontokat)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Eltávolítás"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Műveleti hiba."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Állítsa be a root jelszavát"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Ez az URL hivatkozik a tükrök listájára."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Név:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Felhasználónév"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Jelszó:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Ez a csatolási pont érvénytelen. Megpróbálja másképp?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "Tünés innen!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "Elfogadom a végzetemet."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Ez egy instabil, stabil kiadás előtti szoftver."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3564,203 +4906,264 @@ msgstr ""
 "jövőben. De vannak hibák. Hibák mindenfele. Hibák amikkel együtt kell élnie. "
 "Ez a jövő OS amire számíthat. De csak tesztelési céllal. "
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "ÜDVÖZLI A %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Melyik nyelvet szeretné használni a telepítés alatt?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "Kilépés"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Tovább"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Felhasználónév"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Csoport neve"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Jelszó:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC jelszó"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "Cs_atolási pont hozzáadása"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Kívánt kapacitás<b>"
+msgid "Add a new mount point."
+msgstr "Új csatolási pont hozzáadása"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Csatolási pont </b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Hozzáadás"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "ÚJ CSATOLÁSI PONT HOZZÁADÁSA"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"További finomhangolási opciók elérhetőek\n"
-"miután új csatolási pontot adott meg alább."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Ez a csatolási pont\n"
-"már használatban. Megpróbál egy másikat?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "pl: \"20 GB\", \"500mb\" (idézőjelek nélkül)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "Törlés"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "Menté_s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CSATOLÁSI PONT BEÁLLÍTÁSA"
+msgid "Remove the selected mount point(s)."
+msgstr "Távolítsa el a csatolási pontot (pontokat)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Kérem adjon nevet a kötetcsoportjának és válasszon legalább egy lemezt alább."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Szabad"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID eszköz"
+msgid "Reload storage configuration from disk."
+msgstr "taroló összeállítás sikertelen: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Titkosítás"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Kiválasztott eszköz"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Eszközinformációk"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Csatolási pont </b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Kívánt kapacitás<b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Címke:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Eszköztípus:</b>"
+msgid "Device(s):"
+msgstr "Eszköz:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Fájlrendszer:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "Titkosítás"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Formázza újra"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Kötetcsoport:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Módosítás..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Név:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Eszköztípus:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Titkosítás"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Fájlrendszer"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Formázza újra"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Kötetcsoport:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Módosítás..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID eszköz"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3768,17 +5171,19 @@ msgstr ""
 "Ez az eszköz titkosított és nem olvasható addig, míg meg nem ad egy érvényes "
 "jelszót. Most megpróbálhatja feloldani alább. "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Jelszó:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "Feloldás"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3786,296 +5191,572 @@ msgstr ""
 "Az eszköz közvetlenül nem szerkeszthető. Eltávolíthatja, vagy választhat egy "
 "másik eszközt."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Új csatolási pont hozzáadása"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Távolítsa el a csatolási pontot (pontokat)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Kiválasztott csatolási pontok beállítása"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Beállítás..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "taroló összeállítás sikertelen: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Kattintson a súgóért"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Súgó"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">SZABAD TERÜLET</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TELJES TERÜLET</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "Kivála_sztás"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Mégsem"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CSATOLÁSI PONT BEÁLLÍTÁSA"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-"Válasszon ki egy vagy több lemezt az eszközben amire telepíteni szeretne."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP cím"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Meg kell adnia egy iSCSI iniciátor nevet"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "Azonosítás használata"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Például:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Felhasználónév"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC jelszó"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Felhasználónév"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC jelszó"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Felhasználónév"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC jelszó"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Hálózat neve"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "Azonosítás használata"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Felhasználónév"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC jelszó"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Felhasználónév"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC jelszó"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Felhasználónév"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC jelszó"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Csatlakozás sikertelen"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Eszköz:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "KIVÁLASZTOTT LEMEZEK"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "Bezárás"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Rendszerindítás"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Leírás"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Szabad"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "Eltávolítás"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Összesített információk a lemezekről"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "Törlés"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Kivála_sztás"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CSATOLÁSI PONT BEÁLLÍTÁSA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+"Válasszon ki egy vagy több lemezt az eszközben amire telepíteni szeretne."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "Cs_atolási pont hozzáadása"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Kívánt kapacitás<b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Csatolási pont </b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "ÚJ CSATOLÁSI PONT HOZZÁADÁSA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"További finomhangolási opciók elérhetőek\n"
+"miután új csatolási pontot adott meg alább."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Ez a csatolási pont\n"
+"már használatban. Megpróbál egy másikat?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "pl: \"20 GB\", \"500mb\" (idézőjelek nélkül)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "Menté_s"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CSATOLÁSI PONT BEÁLLÍTÁSA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Kérem adjon nevet a kötetcsoportjának és válasszon legalább egy lemezt alább."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Név:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID eszköz"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Titkosítás"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Kérem adjon meg egy érvényes csatolási pontot."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD eszköz formázása"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Ismeretlen hiba történt a telepítés alatt. Részletek alább láthatóak."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "LEMEZ TITKOSÍTÁSI JELSZÓ"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Jelszó mentése"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "LEMEZ TITKOSÍTÁSI JELSZÓ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4084,7 +5765,19 @@ msgstr ""
 "Úgy döntött, hogy titkosítja néhány adatát. Készítenie kell egy jelszót, "
 "amit az adatainak elérésére használ majd amikor elindítja a számítógépét."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Jelszó:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Megerősítés:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4094,117 +5787,172 @@ msgstr ""
 "billentyűzet kiosztását, előfordulhat, hogy nem lesz képes többet feloldani "
 "a lemezei titkosítását telepítés után."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "LEMEZTERÜLET VISSZANYERÉSE"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Mégsem"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Mégsem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "Lemezte_rület visszanyerése"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "LEMEZTERÜLET VISSZANYERÉSE"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Leírás kerül ide."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Visszanyerhető terület"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Művelet"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Megőriz"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Törli"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Összezsugorít"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Egyéni particionálás kiválasztva"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "Változások _alkalmazása"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Eszköz:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "Cs_atolási pont hozzáadása"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Kilépés a t_elepítőből"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nem"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "Igen"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4212,51 +5960,50 @@ msgstr ""
 "Biztos benne, hogy kilép a\n"
 "telepítési eljárásból?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "Kilépés"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "TELEPÍTÉSI ÖSSZEGZÉS"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "Kilépés"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "Telepítés megkezdése"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURÁCIÓ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Telepítés előkészítése"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s sikeresen települt a rendszerében, de néhány beállítást és finomhangolást "
-"még el kell végeznie.\n"
-"Kérem fejezze be és kattintson a Konfiguráció befejezésére."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "Konfiguráció be_fejezése"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s most sikeresen telepítésre került a rendszerére és kész\n"
-"arra, hogy használatba vegye. Gyerünk, indítson újra, és élvezze!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "Újraindítás"
 
@@ -4272,16 +6019,16 @@ msgstr "Telepítés"
 msgid "Install the live CD to your hard disk"
 msgstr "Live CD telepítése a merevlemezre"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Telepítés megkezdése a merevlemezre"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Üdvözli a Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4290,25 +6037,26 @@ msgstr ""
 "%s szükséges %s MB memória a telepítéshez, de csak %s MB elérhető ezen a "
 "gépen.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "A %s grafikus telepítő %s MB memóriát igényel, de csak %s MB a telepített."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nincs elég RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4322,24 +6070,24 @@ msgstr ""
 "\n"
 "root terminálból."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Szöveges mód indítása."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Hiba"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY változó nincs beállítva. Szöveges mód indítása."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafikus telepítés nem érhető el. Szöveges mód indítása."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4350,22 +6098,22 @@ msgstr ""
 "lehetőség saját kezű particionálásra vagy csomagválasztásra. Szeretné inkább "
 "a VNC módot használni?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 "Kérem alkalmazza az ssh install@%s parancsot a telepítés megkezdéséhez."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 "Kérem alkalmazza az ssh install@<host> parancsot a telepítés folytatásához."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Próbálja ki a Fedora rendszerét"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4375,7 +6123,7 @@ msgstr ""
 "Telepítheti most, vagy válassza a \"Telepítés a merevlemezre\" ikont a "
 "Tevékenységek menüből bármikor a későbbiekben."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4383,10 +6131,297 @@ msgstr ""
 "Választhatja a \"Telepítés a merevlemezre\"\n"
 "ikont a Tevékenységek menüből bármikor a későbbiekben."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Bezár"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "A gazda név első betűje az „a-z”, „A-Z” vagy „0-9” intervallumban kell "
+#~ "legyen."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Több szabad helyre van szüksége az alábbi fájlrendszereken:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Nem lehet kérdezni parancssoros módban!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Ez a csatolási pont érvénytelen. Megpróbálja másképp?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Úgy döntött, hogy manuálisan állítja be a fájlrendszert az új "
+#~ "%(productName)s telepítéséhez. Mielőtt elkezdené, érdemes egy percet, "
+#~ "hogy tanulmányozza a felületet. Ez eléggé megváltozott a korábbiakhoz "
+#~ "képest.\n"
+#~ "\n"
+#~ " A legfontosabb változás az, hogy az új fájlrendszer létrehozása "
+#~ "modernizálásra került. Többé nem kell kézzel felépíteni bonyolult "
+#~ "eszközöket lépésenként, mint a LVM logikai köteteket (fizikai méret, majd "
+#~ "kötet csoport, majd a logikai kötet) -- most csak hozzon létre egy "
+#~ "logikai kötetet és mi kezeljük a további beállításokhoz igényelt "
+#~ "utánjárást,  ideértve a fizikai kötetméreteket és a kötetcsoportot - ami "
+#~ "tartalmazza majd azt. Kezelni fogjuk a kötetcsoport kiigazítását, ahogy "
+#~ "hozzáadja, az eltávolítását és átméretezését a logikai köteteknek is, így "
+#~ "nem kell bajlódnia a különféle részletekkel.\n"
+#~ "\n"
+#~ "\n"
+#~ "Felület elrendezés\n"
+#~ "\n"
+#~ "A bal oldali a képernyőn a különféle operációs rendszer  telepítéseket "
+#~ "tudjuk megtalálni ezen a számítógépen. Az új %(productName)s telepítést a "
+#~ "lista tetején találja. Kattintson a telepítés nevére, hogy lássa milyen "
+#~ "fájlrendszert tartalmaznak azok.\n"
+#~ "\n"
+#~ "A különböző telepítések és csatlakoztatási pontok alatt a bal oldalon "
+#~ "gombokat talál új fájlrendszer hozzáadásához, eltávolításához,  vagy "
+#~ "beállításához.\n"
+#~ "\n"
+#~ "A jobb oldalon a képernyőn, az hely az, ahol testre szabhatja az "
+#~ "aktuálisan kiválasztott csatolási pontokat.\n"
+#~ "\n"
+#~ "A bal alsó részben látni fog mindig egy összefoglalót a kiválasztott "
+#~ "lemezekről - amikről úgy döntött, hogy használni fog a telepítéshez. Ha "
+#~ "további részletek is érdeklik a lemezeket illetően, akkor kattintson a "
+#~ "kék szövegre további részletes információhoz.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hogyan hozzunk létre egy új fájlrendszert egy új eszközön\n"
+#~ "\n"
+#~ "1. Kattintson a + gombra.\n"
+#~ "2. Adja meg a csatolási pontot és a méretét. (Tipp: Vigye az egérmutatót "
+#~ "bármelyik szövegbeviteli területre segítségért.)\n"
+#~ "3. Válassza ki az új csatlakoztatási pont alatt az \"Új %(productName)s "
+#~ "telepítés\", majd a bal oldalon szabja testre, hogy megfeleljen az "
+#~ "igényeinek.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hogyan formázhat eszközt / fájlrendszert, amely már létezik a lemezen\n"
+#~ "\n"
+#~ "1. Válassza ki a fájlrendszert a képernyő bal oldalán.\n"
+#~ "2. Kattintson a \"Testreszabás\" kibontható menün a csatolási pont "
+#~ "beállítási területen a képernyő jobb oldalán.\n"
+#~ "3. Aktiválja az \"Újraformázás\" jelölőmezőt, válassza ki a fájlrendszer "
+#~ "típusát és adott esetben, adjon meg egy csatolási pontot a \"Csatolási "
+#~ "pont\" beviteli mezőben.\n"
+#~ "4. Kattintson a \"Módosítások alkalmazása\" gombra\n"
+#~ "\n"
+#~ "\n"
+#~ "Hogyan kell beállítani egy csatolási pontot a fájlrendszerhez, amely már "
+#~ "létezik a lemezen\n"
+#~ "\n"
+#~ "1. Válassza ki a fájlrendszert a képernyő bal oldalán.\n"
+#~ "2. Írja be a csatlakoztatási pontot a \"Csatolási pont\" szövegbeviteli "
+#~ "terület a csatolási pont testreszabási területen.\n"
+#~ "3. Kattintson a \"Módosítások alkalmazása\" gombra \n"
+#~ "\n"
+#~ "\n"
+#~ "Hogyan kell eltávolítani a fájlrendszert, amely már létezik a lemezen\n"
+#~ "\n"
+#~ "1. Válassza ki az eltávolítani kívánt fájlrendszert a képernyő bal "
+#~ "oldalán. \n"
+#~ "2. Kattintson a - gombra.\n"
+#~ "\n"
+#~ "Tipp: Eszköz eltávolítása, amely már létezik a lemezen az \"Új "
+#~ "%(productName)s telepítés\"-ben nem távolítja el a lemezről. Csak "
+#~ "visszaállítja az eszközt az eredeti állapotába. Ha el szeretne távolítani "
+#~ "egy eszközt, amely már létezik a lemezen, akkor ki kell választania "
+#~ "bármely egyéb felismert telepítések  (vagy \"Ismeretlen\") közül, és "
+#~ "nyomja meg a - gombot.\n"
+#~ "\n"
+#~ "Tippek és tanácsok\n"
+#~ "\n"
+#~ "Megadhat  az új fájlrendszerekhez méreteiben olyan értéket, amely "
+#~ "nagyobb, mint a teljes rendelkezésre álló szabad hely. A telepítő "
+#~ "kívánthoz a lehető legközelebbi méretet igyekszik majd felajánlani. \n"
+#~ "\n"
+#~ "Alapértelmezés szerint az új eszközök felhasználhatnak bármely / minden "
+#~ "kiválasztott lemezt.\n"
+#~ "\n"
+#~ "Megadhatja mely lemez kerüljön felosztásra, akkor ha a Beállítás gombra "
+#~ "kattint (Az egyik az egy grafikus eszköz), addig míg az eszköz ki van "
+#~ "választva.\n"
+#~ "\n"
+#~ "Ha  egy új csatolási pontot ad meg, kattintson a + gombra, majd hagyja a "
+#~ "méret bejegyzést üresen, hogy az új eszköz felhasználhassa az összes "
+#~ "rendelkezésre álló szabad helyet.\n"
+#~ "\n"
+#~ "Ha eltávolítja az utolsó eszközt egy olyan konténer eszközből, mint egy "
+#~ "LVM kötet-csoport, akkor automatikusan eltávolítjuk a konténer eszközt, "
+#~ "hogy legyen helye az új eszközök számára. \n"
+#~ "\n"
+#~ "Amikor az utolsó partíciót is eltávolítjuk a lemezről, előfordulhat, hogy "
+#~ "a lemez alapállapotba állításakor új partíciós tábla kerül beállításra, "
+#~ "ha úgy érezzük, ott megfelelőbb típus elérhető az adott lemez számára. \n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "HÁLÓZATI BEÁLLÍTÁSOK"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "HIba a csomag metaadatainak letöltésekor..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Semmi sincs kijelölve"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware hiányzik"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Azonosítás szükséges"
+
+#~ msgid "column"
+#~ msgstr "oszlop"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Partició típusa:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Felhasználói név</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Jelszó</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Ez a csatolási pont érvénytelen. Megpróbálja másképp?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Címke:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Fájlrendszer:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID eszköz"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Kiválasztott csatolási pontok beállítása"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Kattintson a súgóért"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">SZABAD TERÜLET</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">TELJES TERÜLET</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Kész"
 
@@ -4440,41 +6475,9 @@ msgstr "Bezár"
 #~ msgid "Install on System"
 #~ msgstr "Telepítés a rendszerre"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "A következő hiba merült fel a telepítési tároló beállítása során:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "A telepítés itt megszakad."
-
 #~ msgid "Exit installer"
 #~ msgstr "Kilépés a telepítőből"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "A telepítés megállt valószínűleg hardverhiba miatt. A pontos hibaüzenet a "
-#~ "következő:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "A telepítő most bezárul."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Hardver hiba lépett fel"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Kilépés a telepítőből"
 
@@ -4767,9 +6770,6 @@ msgstr "Bezár"
 #~ msgid "Software Development"
 #~ msgstr "Szoftver fejlesztés"
 
-#~ msgid "Web Server"
-#~ msgstr "Web kiszolgáló"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimális"
 
@@ -4813,48 +6813,6 @@ msgstr "Bezár"
 #~ "tartalmaz:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr "Nem adta meg a root partíciót (/), ami nélkül %s nem telepíthető."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "A gyökér rész mérete kisebb 250 MB-nál, ami általában nem elég %s "
-#~ "telepítéséhez."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Ez a platform egy külön /boot partíciót igényel egy erre megjelölt "
-#~ "partíción, vagy logikai köteten.  Ha nem szeretne külön /boot kötetet, "
-#~ "egy nem LVM partíció / könyvtárába kell telepítenie."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Az Ön %(mount)s particiója nem éri el a %(size)s MB ami kevesebb mint az "
-#~ "ajánlott normál %(productName)s telepítéshez."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "A %(mount)s partíciód túl kicsi a %(format)s formázáshoz (megengedett "
-#~ "méret %(minSize)d MB és %(maxSize)d MB közötti)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "A %(mount)s partíciód túl nagy a %(format)s formázáshoz (megengedett "
-#~ "méret %(minSize)d MB és %(maxSize)d MB közötti)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4871,57 +6829,6 @@ msgstr "Bezár"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "Nem készített egy rendszertöltő stage1 céleszközt"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Nem csinált rendszerindító részt."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Az Ön BIOS alapú rendszere igényli egy speciális partició kialakítását %s "
-#~ "új lemezcimke formátumával (GPT). A folytatáshoz, kérem készítsen egy "
-#~ "1Mbyte 'BIOS Boot' típusú particiót."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Nem adott meg egy swap partíciót.  %(requiredMem)s MB memória szükséges a "
-#~ "telepítés folytatásához  swap nélkül, de csak %(installedMem)s MB "
-#~ "elérhető."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Nem adott meg swap partíciót.  Erre nincs mindig szükség, de a legtöbb "
-#~ "esetben jelentősen növelheti a teljesítményt."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Legalább egy - a swap eszközök közül nem rendelkezik UUID-vel, ami "
-#~ "megszokott ha az régebbi verziójú mkswap programmal készült. Ezek az "
-#~ "eszközök egyenként fognak hivatkozni az /etc/fstab fájlban, ami nem "
-#~ "ideális amióta az eszközök elérési útjai számtalan ok miatt "
-#~ "megváltozhatnak. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Ez a csatoló pont érvénytelen.  %s mappának a / fájlrendszerben kell "
-#~ "lennie."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s csatoló pontnak linuxos fájlrendszerben kell lennie."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux %s rendszeren"
 
@@ -4931,11 +6838,6 @@ msgstr "Bezár"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s %(arch)s architektúrára"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD eszköz formázása"
-#~ msgstr[1] "DASD eszközök formázása"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Felkészülés %d DASD eszköz Linux-al való használatára..."
@@ -5216,9 +7118,6 @@ msgstr "Bezár"
 #~ msgid "Error setting root password"
 #~ msgstr "Hiba történt a root jelszó beállításakor"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Ajda meg jelszavát amit meg kell erősítenie."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Csomagok eltávolítása"
 
@@ -5252,24 +7151,12 @@ msgstr "Bezár"
 #~ msgid "%s of %s"
 #~ msgstr "%s %s"
 
-#~ msgid "Region:"
-#~ msgstr "Régió:"
-
-#~ msgid "City:"
-#~ msgstr "Város:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 órás"
-
-#~ msgid "AM/PM"
-#~ msgstr "DE/DU"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Válassza ki a kiegészítő modulokat"
 
@@ -5359,9 +7246,6 @@ msgstr "Bezár"
 #~ msgid "configureButton"
 #~ msgstr "Beállítás"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "Partícionálás be_fejezése"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "KÖTETCSOPORTOK BEÁLLÍTÁSA"
 
diff --git a/anaconda/po/id.po b/anaconda/po/id.po
index 509f7ff..a0285b7 100644
--- a/anaconda/po/id.po
+++ b/anaconda/po/id.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Indonesian <trans-id@lists.fedoraproject.org>\n"
@@ -25,11 +25,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot filesistem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -37,7 +37,7 @@ msgid ""
 msgstr ""
 "RAID set berisi '%s' harus memiliki salah satu tingkatan RAID berikut: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -46,7 +46,7 @@ msgstr ""
 "RAID set berisi '%s' harus memiliki salah satu versi metadata sebagai "
 "berikut: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -54,186 +54,450 @@ msgid ""
 msgstr ""
 "RAID set berisi '%s' harus memiliki salah satu jenis perangkat berikut: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s harus memiliki salah satu jenis disklabel berikut: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s tidak dapat dari tipe %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s harus antara %d dan %d MB"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s tidak boleh lebih kecil dari %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s tidak boleh lebih besar dari %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s harus berada dalam %dMB dari disk pertama."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s tidak dapat pada perangkat blok dienkripsi."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s tidak dapat dari tipe %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Menjalankan VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Gunakan mode teks"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "Batal"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Kesalahan berikut terjadi selama konfigurasi instalasi repositori:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Instalasi tidak dapat dilanjutkan."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Kesalahan berikut terjadi selama konfigurasi instalasi repositori:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Instalasi tidak dapat dilanjutkan."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Instalasi dihentikan karena tampaknya terjadi masalah dengan perangkat keras "
+"anda. Pesan kesalahan yang tepat adalah: ⏎ \n"
+"⏎\n"
+"%s. \n"
+"⏎\n"
+"Installer sekarang akan dihentikan."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Instalasi dihentikan karena tampaknya terjadi masalah dengan perangkat keras "
+"anda. Pesan kesalahan yang tepat adalah: ⏎ \n"
+"⏎\n"
+"%s. \n"
+"⏎\n"
+"Installer sekarang akan dihentikan."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Menemukan Kesalahan Perangkat Keras"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Instalasi dihentikan karena tampaknya terjadi masalah dengan perangkat keras "
+"anda. Pesan kesalahan yang tepat adalah: ⏎ \n"
+"⏎\n"
+"%s. \n"
+"⏎\n"
+"Installer sekarang akan dihentikan."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Menjalankan skrip pra-instalasi"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Memulai proses instalasi"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Melakukan konfigurasi pasca-instalasi"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -245,87 +509,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Menjalankan skrip pra-instalasi"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Panjang nama host harus kurang dari atau sama dengan 255 karakter."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Nama host harus dimulai dengan karakter valid dalam range 'a-z', 'A-Z', atau "
-"'0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -334,7 +888,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Instalasi %(productName)s %(productVersion)s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Jalankan %s untuk membuka kaitan sistem ketika Anda sudah selesai."
@@ -349,8 +908,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "Tidak dapat menemukan /bin/sh untuk dieksekusi! Tidak menjalankan shell"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Penyelamatan"
 
@@ -388,22 +947,16 @@ msgstr "Sistem yang akan diselamatkan"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Partisi root ada di perangkat mana dari instalasi Anda?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Keluar"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "Sistem akan diboot ulang secara otomatis ketika Anda keluar dari shell."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -413,7 +966,7 @@ msgstr ""
 "mount. Tekan return untuk mendapatkan shell dimana Anda dapat fsck dan mount "
 "partisi anda. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -434,7 +987,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -447,29 +1000,222 @@ msgstr ""
 "\n"
 "Tekan <ENTER> untuk mendapatkan shell."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Anda tidak memiliki partisi Linux.  Boot ulang.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " Sistem akan diboot ulang secara otomatis ketika Anda keluar dari shell."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mode Penyelamatan"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "Anda tidak memiliki partisi Linux. Tekan Enter untuk masuk ke shell.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Sistem anda dimounting di bawah direktori %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Partisi root anda kurang dari 250 megabytes yang mana biasanya terlalu kecil "
+"untuk menginstal %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Anda belum mendefinisikan partisi root (/), yang mana dibutuhkan untuk "
+"melanjutkan instalasi %s"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Platform ini memerlukan /boot pada partisi khusus atau volume logis. Jika "
+"Anda tidak ingin volume /boot, Anda harus menempatkan / pada sebuah partisi "
+"non-LVM berdedikasi."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Partisi %(mount)s anda kurang dari %(size)s MB yang lebih rendah dari yang "
+"disarankan untuk  instal normal %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s partisi Anda terlalu kecil untuk %(format)s format (ukuran yang "
+"diijinkan adalah %(minSize)d MB sampai %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s partisi Anda terlalu besar untuk %(format)s format (ukuran yang "
+"diijinkan adalah %(minSize)d MB sampai %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Anda belum membuat partisi yang dapat diboot."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Anda tidak menentukan partisi swap. %(requiredMem)s MB memori diperlukan "
+"untuk melanjutkan instalasi tanpa partisi swap, tapi Anda hanya memiliki "
+"%(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Anda tidak menentukan partisi swap.  Meskipun tidak secara kaku dibutuhkan "
+"di semua kasus, Swap akan meningkatkan kinerja instalasi secara signifikan."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Setidaknya salah satu perangkat swap anda tidak memiliki UUID, yang umum "
+"dalam ruang swap dibuat menggunakan versi mkswap. Perangkat ini akan disebut "
+"merujuk jalur perangkat di /etc/fstab, ini tidak ideal karena jalur "
+"perangkat dapat berubuah di berbagai keadaan."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "Mount ini tidak valid. Direktori %s harus berada di file system /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Mount point %s harus di file sistem linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -580,84 +1326,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Mempersiapkan transaksi dari sumber instalasi"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Galat Saat Memasang Paket"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Anda memerlukan ruang lebih di filesistem berikut ini:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Mempersiapkan transaksi dari sumber instalasi"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Galat Saat Memasang Paket"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Pasca-instalasi"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Bersiap-siap untuk menginstal"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Pasca-instalasi"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Tidak ada pertanyaan pada mode command line"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -681,31 +1574,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -720,452 +1615,523 @@ msgstr ""
 "ke komputer ini dari komputer lain dan menjalankan instal grafik atau "
 "melanjutkan instalasi modus teks?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Panjang kata sandi minimal enam karakter."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Panjang kata sandi minimal enam karakter."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "filesystem tipe konfigurasi hilang"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Instalasi dimulai"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Melakukan konfigurasi pasca-upgrade"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Menjalankan VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Perkembangan Instalasi"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Mempersiapkan transaksi dari sumber instalasi"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Galat Saat Memasang Paket"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "perangkat berisi /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Pengembangan Perangkat Lunak"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Peringatan"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1181,579 +2147,402 @@ msgstr "Sedang berjalan"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Instalasi %(productName)s %(productVersion)s"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Anda harus membuat filesystem baru pada perangkat root."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Anda harus membuat filesystem baru pada perangkat root."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Pengembangan Perangkat Lunak"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1780,279 +2569,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Alamat IPv4:"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 Address"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "Batal"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Pengembangan Perangkat Lunak"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Gagal menset Repositori"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Gagal menset Repositori"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2060,14 +2873,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2076,127 +2889,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Format Divais DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2206,1019 +3040,1537 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Mount point %s harus di file sistem linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Anda harus membuat filesystem baru pada perangkat root."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Membuat %(type)s pada %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Lanjutkan"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "Batal"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Server Web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Konfirmasi"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Tidak ada jaringan yang tersedia"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Gunakan mode teks"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapasitas"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Perangkat RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "T_ambah"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Konfirmasi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Tidak ada jaringan yang tersedia"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Konfirmasi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Konfirmasi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Konfirmasi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nama Pengguna"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "Batal"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Terkoneksi!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Partisi Sistem EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "Keluar dari Instaler"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Partisi Sistem EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Enkripsi"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Partisi Sistem EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "T_ambah"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Konfirmasi"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "T_ambah"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "Batal"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Perangkat RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "T_ambah"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Kesalahan operasional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Kesalahan operasional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3226,649 +4578,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "bahasa apa yang ingin anda pergunakan selama proses instalasi?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Lanjutkan"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Konfirmasi"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Bebas"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Perangkat RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "T_ambah"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Enkripsi"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Kapasitas"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Perangkat RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Perangkat RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Enkripsi"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Perangkat RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Konfirmasi"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "Batal"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Alamat IPv4:"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Harus menyediakan sebuah nama inisiator iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nama Pengguna"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Perangkat RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Bebas"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Kapasitas"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nama Pengguna"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Perangkat RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Enkripsi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Format Divais DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "Batal"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Konfirmasi"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "Batal"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Partisi Sistem EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Pasca-instalasi"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Bersiap-siap untuk menginstal"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Melakukan konfigurasi pasca-upgrade"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "_Boot Ulang"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3882,16 +5625,16 @@ msgstr "Instal"
 msgid "Install the live CD to your hard disk"
 msgstr "Instal live CD ke harddisk anda"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Memulai instalasi ke Harddisk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3900,25 +5643,26 @@ msgstr ""
 "%s membutuhkan %s MB memori untuk diinstal, tapi Anda hanya memiliki %s MB "
 "di mesin ini.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Instaler grafis %s membutuhkan %s MB memori, tapi Anda hanya memiliki %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Tidak cukup RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3932,24 +5676,24 @@ msgstr ""
 "\n"
 "dari terminal root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Memulai mode teks."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Kesalahan"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Variabel DISPLAY tidak diset. Memulai mode teks."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Instalasi grafis ini tidak tersedia. Memulai mode teks."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3960,36 +5704,57 @@ msgstr ""
 "mengizinkan Anda untuk menentukan layout partisi atau memilih paket. Alih-"
 "alih memakai mode ini apakah Anda ingin menggunakan mode VNC?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Nama host harus dimulai dengan karakter valid dalam range 'a-z', 'A-Z', "
+#~ "atau '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Anda memerlukan ruang lebih di filesistem berikut ini:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Tidak ada pertanyaan pada mode command line"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Nama Pengguna"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Perangkat RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Selesai"
 
@@ -4039,44 +5804,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "Instal pada sistem"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Kesalahan berikut terjadi selama konfigurasi instalasi repositori:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Instalasi tidak dapat dilanjutkan."
-
 #~ msgid "Exit installer"
 #~ msgstr "Keluar dari Instaler"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Instalasi dihentikan karena tampaknya terjadi masalah dengan perangkat "
-#~ "keras anda. Pesan kesalahan yang tepat adalah: ⏎ \n"
-#~ "⏎\n"
-#~ "%s. \n"
-#~ "⏎\n"
-#~ "Installer sekarang akan dihentikan."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Menemukan Kesalahan Perangkat Keras"
-
-#~ msgid "_Exit installer"
-#~ msgstr "Keluar dari Instaler"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4173,9 +5903,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Repositori %r tidak memiliki nama di konfigurasi, menggunakan id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Tidak ada jaringan yang tersedia"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4183,9 +5910,6 @@ msgstr ""
 #~ "Beberapa dari repositori perangkat lunak Anda membutuhkan jaringan, tapi "
 #~ "ada kesalahan mengaktifkan jaringan di sistem anda."
 
-#~ msgid "Re_boot"
-#~ msgstr "_Boot Ulang"
-
 #~ msgid "_Eject"
 #~ msgstr "K_eluarkan"
 
@@ -4345,9 +6069,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Desktop Grafis"
 
-#~ msgid "Web Server"
-#~ msgstr "Server Web"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4390,50 +6111,6 @@ msgstr ""
 #~ "yang tidak dapat dihapus:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Anda belum mendefinisikan partisi root (/), yang mana dibutuhkan untuk "
-#~ "melanjutkan instalasi %s"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Partisi root anda kurang dari 250 megabytes yang mana biasanya terlalu "
-#~ "kecil untuk menginstal %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Platform ini memerlukan /boot pada partisi khusus atau volume logis. Jika "
-#~ "Anda tidak ingin volume /boot, Anda harus menempatkan / pada sebuah "
-#~ "partisi non-LVM berdedikasi."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Partisi %(mount)s anda kurang dari %(size)s MB yang lebih rendah dari "
-#~ "yang disarankan untuk  instal normal %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s partisi Anda terlalu kecil untuk %(format)s format (ukuran yang "
-#~ "diijinkan adalah %(minSize)d MB sampai %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s partisi Anda terlalu besar untuk %(format)s format (ukuran yang "
-#~ "diijinkan adalah %(minSize)d MB sampai %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4450,50 +6127,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "Anda belum membuat sebuah bootloader stage1 perangkat target"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Anda belum membuat partisi yang dapat diboot."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Anda tidak menentukan partisi swap. %(requiredMem)s MB memori diperlukan "
-#~ "untuk melanjutkan instalasi tanpa partisi swap, tapi Anda hanya memiliki "
-#~ "%(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Anda tidak menentukan partisi swap.  Meskipun tidak secara kaku "
-#~ "dibutuhkan di semua kasus, Swap akan meningkatkan kinerja instalasi "
-#~ "secara signifikan."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Setidaknya salah satu perangkat swap anda tidak memiliki UUID, yang umum "
-#~ "dalam ruang swap dibuat menggunakan versi mkswap. Perangkat ini akan "
-#~ "disebut merujuk jalur perangkat di /etc/fstab, ini tidak ideal karena "
-#~ "jalur perangkat dapat berubuah di berbagai keadaan."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "Mount ini tidak valid. Direktori %s harus berada di file system /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Mount point %s harus di file sistem linux."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Format Divais DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Menyiapkan perangkat DASD %d untuk digunakan dengan Linux..."
diff --git a/anaconda/po/ilo.po b/anaconda/po/ilo.po
index 2e6895c..5e086fe 100644
--- a/anaconda/po/ilo.po
+++ b/anaconda/po/ilo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,208 +19,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Iparugi ti VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Aramaten ti wagas a text"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Mayat"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -229,85 +462,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -316,7 +841,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -329,8 +859,8 @@ msgstr "No nalpasen, leppasenyo ti shell santo marugian manen ti sistema."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Isalakan"
 
@@ -368,28 +898,22 @@ msgstr "Ti Sistema a Maisalakan"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Mayat"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Ileppas"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -402,7 +926,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -411,28 +935,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Wagas ti Pannakaisalakan"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Nakaisagpat ti sistema babaen ti direktorio a %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Ti espasio ti benneg a 'root' ket basbassit ngem 250 a megabyte; "
+"nakabasbassit tapno mainstala ti %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Saan a naituding ti masapol a benneg a root (/) tapno makapagpatuloy ti "
+"panaginstala ti %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Ti espasio ti benneg a 'root' ket basbassit ngem 250 a megabyte; "
+"nakabasbassit tapno mainstala ti %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Awan ti naituding a pangsinnukat a benneg. Uray no masapol iti amin a "
+"pasamak, naisangayan a mapasayaatna ti panagtaray maipaay ti kaadduan a "
+"panaginstala."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -525,84 +1229,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Masapol ti adu pay nga espasio kadagiti sumaruno a sistema ti intar:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "daddaan a pakete"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Kasasaad ti panaginstala"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Kasasaad ti panaginstala"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Saan a maisurat ti salusod it wagas a pammilin!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Biddut"
 
@@ -626,31 +1476,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -665,448 +1517,522 @@ msgstr ""
 "makasilpokayo nga aggapu ti sabali a kompiuter kadaytoy a kompiuter, sayonto "
 "sigragrapikal nga instala, wenno ipatuloy ti panaginstala ti wagas ti text?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr ""
 "Naksen a saan a nakurkurang ngem innem a kurdit ti kaatiddog ti kontrasenias."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr ""
+"Naksen a saan a nakurkurang ngem innem a kurdit ti kaatiddog ti kontrasenias."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Kasasaad ti panaginstala"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Iparugi ti VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Kasasaad ti panaginstala"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Pannakabukel ti Software"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Patigmaan"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1121,580 +2047,405 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Pannakabukel ti Software"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1721,277 +2472,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Pannakabukel ti Software"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1999,14 +2774,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2015,128 +2790,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Mayat"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2147,68 +2942,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2216,945 +3106,1348 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "Ipatul_oy"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Mayat"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Aramaten ti wagas a text"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Aparato a RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "I_nayon"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Ipatul_oy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Ipatul_oy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Ipatul_oy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Nakasilpuan!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Patigmaan"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "I_nayon"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Mayat"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "I_nayon"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Mayat"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Aparato a RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "I_nayon"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3162,643 +4455,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Ania a pagsasao a kayatyo nga aramaten iti panaginstala?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "Ipatul_oy"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Nawaya"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Aparato a RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "I_nayon"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Aparato a RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Aparato a RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Aparato a RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Mayat"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Mayat"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Aparato a RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Nawaya"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Aparato a RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Mayat"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Mayat"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Kasasaad ti panaginstala"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Uliten ti panagrugi"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3812,40 +5468,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3854,60 +5511,71 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Biddut"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr ""
+#~ "Masapol ti adu pay nga espasio kadagiti sumaruno a sistema ti intar:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Saan a maisurat ti salusod it wagas a pammilin!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Aparato a RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Nalpas"
 
@@ -3931,9 +5599,6 @@ msgstr ""
 #~ msgstr[0] "%s a Byte"
 #~ msgstr[1] "%s a Byte"
 
-#~ msgid "Re_boot"
-#~ msgstr "Uliten ti panagrugi"
-
 #~ msgid "_Retry"
 #~ msgstr "_Padasen manen"
 
@@ -3943,9 +5608,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "masuppiat ti intar"
 
-#~ msgid "older package(s)"
-#~ msgstr "daddaan a pakete"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "kurang nga espasio ti disk"
 
@@ -3984,20 +5646,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Saan a mabura ti benneg ti DASD a naipormato babaen ti LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Saan a naituding ti masapol a benneg a root (/) tapno makapagpatuloy ti "
-#~ "panaginstala ti %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Ti espasio ti benneg a 'root' ket basbassit ngem 250 a megabyte; "
-#~ "nakabasbassit tapno mainstala ti %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4011,15 +5659,6 @@ msgstr ""
 #~ "Agsimsimpa iti aparato a FireWire. Makapagtungpal iti makaandar a sistema "
 #~ "wenno saan."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Awan ti naituding a pangsinnukat a benneg. Uray no masapol iti amin a "
-#~ "pasamak, naisangayan a mapasayaatna ti panagtaray maipaay ti kaadduan a "
-#~ "panaginstala."
-
 #~ msgid "Back"
 #~ msgstr "Agatras"
 
diff --git a/anaconda/po/is.po b/anaconda/po/is.po
index bf6edb2..b9e6738 100644
--- a/anaconda/po/is.po
+++ b/anaconda/po/is.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/fedora/"
@@ -21,211 +21,444 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Ræsa VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Nota textaham"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Í lagi"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Keyri skeljaforrit fyrir uppsetningu"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Byrja uppsetningarferli"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Breyti stillingum eftir uppsetningu"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -237,86 +470,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Keyri skeljaforrit fyrir uppsetningu"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Vélarheitið má ekki vera lengra en 255 stafir."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Heiti vélar verður að byrja á gildum staf á bilinu 'a-z', 'A-Z', eða '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -325,7 +849,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -340,8 +869,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Bjarga"
 
@@ -379,28 +908,22 @@ msgstr "Kerfi sem á að bjarga"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Í lagi"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Hætta"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -413,7 +936,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -422,28 +945,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Björgunarhamur"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Diskurinn þinn er tengdur undir %s möppunni."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Rótarsneiðin þín er minni en 250 megabæti sem er yfirleitt of lítið fyrir %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Þú hefur ekki skilgreint rótarsneið (/) sem er nauðsynleg svo uppsetning %s "
+"geti haldið áfram."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s disksneiðin er minni en %(size)s megabæti sem er minna en mælt er "
+"með fyrir venjulega %(productName)s uppsetningu."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Þú hefur ekki skilgreint diskminnissneið. Þó það sé ekki algerlega "
+"nauðsynlegt mun það bæta afköst til muna í flestum tilfellum."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Þessi tengipunktur er ógildur.  %s mappan verður að vera á / skráakerfinu."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Tengipunkturinn %s verður að vera á linux skráakerfi."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -534,84 +1236,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Þig vantar meira pláss á eftirfarandi skráarkerfum:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "eldri pakki/pakkar"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Eftir uppsetningu"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Eftir uppsetningu"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Það má ekki vera spurningamerki í skipanalínuham!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Villa"
 
@@ -635,31 +1483,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -674,449 +1524,522 @@ msgstr ""
 "þessari vél frá annari og framkvæma myndræna uppsetningu eða halda áfram í "
 "textaham?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Lykilorðið verður að vera minnst 6 stafir að lengd."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Lykilorðið verður að vera minnst 6 stafir að lengd."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "vantar gerð í uppsetningu skráakerfis"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Uppsetning að hefjast"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Breyti stillingum eftir uppfærslu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Ræsa VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Framvinda uppsetningar"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Hugbúnaðarþróun"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Aðvörun"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1132,580 +2055,405 @@ msgstr "Í gangi"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Hugbúnaðarþróun"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1732,277 +2480,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Hugbúnaðarþróun"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2010,14 +2782,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2026,128 +2798,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Forsníð DASD tæki"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Í lagi"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2158,68 +2951,164 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Tengipunkturinn %s verður að vera á linux skráakerfi."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2227,948 +3116,1359 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Halda áfram"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Í lagi"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Vefþjónn"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Staðfesta"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Ekkert net í boði"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nota textaham"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID tæki"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Bæta við"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Staðfesta"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Ekkert net í boði"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Staðfesta"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Staðfesta"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Staðfesta"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Notandanafn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Tengt!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Loka uppsetningarforritinu"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Aðvörun"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Bæta við"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Í lagi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Staðfesta"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Bæta við"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Í lagi"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID tæki"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Bæta við"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3176,646 +4476,1022 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Hvaða tungumál viltu nota meðan á uppsetningu stendur?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Halda áfram"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Staðfesta"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Laust"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID tæki"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Bæta við"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID tæki"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID tæki"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID tæki"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Staðfesta"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Í lagi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Notandanafn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Í lagi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID tæki"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Laust"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Notandanafn"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID tæki"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Í lagi"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Forsníð DASD tæki"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Staðfesta"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Í lagi"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Eftir uppsetningu"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Breyti stillingum eftir uppfærslu"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "En_durræsa"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3829,40 +5505,41 @@ msgstr "Setja upp"
 msgid "Install the live CD to your hard disk"
 msgstr "Setja upp innihald keyrslugeisladisksins (live-CD) á harða diskinn"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Hef uppsetningu á harðan disk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Ekki nægt minni"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3871,60 +5548,80 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Ræsi textaham"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Villa"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY breytan er ekki sett. Ræsi í textaham."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Myndræn uppsetning er ekki tiltæk. Fer í textaham."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Heiti vélar verður að byrja á gildum staf á bilinu 'a-z', 'A-Z', eða '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Þig vantar meira pláss á eftirfarandi skráarkerfum:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Það má ekki vera spurningamerki í skipanalínuham!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Notandanafn"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID tæki"
+
 #~ msgid "Completed"
 #~ msgstr "Lokið"
 
@@ -3957,9 +5654,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Loka uppsetningarforritinu"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Loka uppsetningarforritinu"
-
 #~ msgid "IP address is missing."
 #~ msgstr "IP vistfang vantar."
 
@@ -3991,12 +5685,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "Þetta er ekki rétti %s diskurinn."
 
-#~ msgid "No Network Available"
-#~ msgstr "Ekkert net í boði"
-
-#~ msgid "Re_boot"
-#~ msgstr "En_durræsa"
-
 #~ msgid "_Eject"
 #~ msgstr "_Spýta út"
 
@@ -4037,9 +5725,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "árekstrar milli skráa"
 
-#~ msgid "older package(s)"
-#~ msgstr "eldri pakki/pakkar"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "ekki nóg diskpláss"
 
@@ -4114,9 +5799,6 @@ msgstr ""
 #~ msgid "Retrieving installation information for %s."
 #~ msgstr "Sæki upplýsingar um uppsetningu %s."
 
-#~ msgid "Web Server"
-#~ msgstr "Vefþjónn"
-
 #~ msgid "This partition is holding the data for the hard drive install."
 #~ msgstr ""
 #~ "Þessi disksneið inniheldur gögnin fyrir uppsetningu frá hörðum disk."
@@ -4136,27 +5818,6 @@ msgstr ""
 #~ msgid "This device is part of a LVM volume group."
 #~ msgstr "Þetta tæki er hluti af LVM sýndardiskhóp."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Þú hefur ekki skilgreint rótarsneið (/) sem er nauðsynleg svo uppsetning "
-#~ "%s geti haldið áfram."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Rótarsneiðin þín er minni en 250 megabæti sem er yfirleitt of lítið fyrir "
-#~ "%s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s disksneiðin er minni en %(size)s megabæti sem er minna en mælt "
-#~ "er með fyrir venjulega %(productName)s uppsetningu."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "Uppsetning á USB tæki.  Ekki er víst að út komi kerfi sem virkar."
@@ -4167,28 +5828,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Uppsetning á FireWire tæki.  Ekki er víst að út komi kerfi sem virkar."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Þú hefur ekki skilgreint diskminnissneið. Þó það sé ekki algerlega "
-#~ "nauðsynlegt mun það bæta afköst til muna í flestum tilfellum."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Þessi tengipunktur er ógildur.  %s mappan verður að vera á / skráakerfinu."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Tengipunkturinn %s verður að vera á linux skráakerfi."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Forsníð DASD tæki"
-#~ msgstr[1] "Forsníð DASD tæki"
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo brást fyrir %s"
 
diff --git a/anaconda/po/it.po b/anaconda/po/it.po
index d3006f8..263db40 100644
--- a/anaconda/po/it.po
+++ b/anaconda/po/it.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-05 09:59+0000\n"
 "Last-Translator: Gianluca Sforna <giallu@gmail.com>\n"
 "Language-Team: Italian <trans-it@lists.fedoraproject.org>\n"
@@ -36,11 +36,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "filesystem /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 "I gruppi RAID contenenti '%s' devono avere uno dei seguenti livelli RAID: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -57,7 +57,7 @@ msgstr ""
 "I gruppi RAID contenenti '%s' devono avere una delle seguenti versioni di "
 "metadati: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -66,108 +66,129 @@ msgstr ""
 "I gruppi RAID contenenti '%s' devono avere uno dei seguenti tipi di "
 "dispositivo: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s deve avere uno dei seguenti tipi di etichetta disco: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s non può essere di tipo %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s deve essere montato su uno di %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "la dimensione di %s deve essere compresa tra %d e %d MB"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s non deve essere inferiore a %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s non deve essere superiore a %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s deve essere nei primi %dMB del disco."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s deve essere su una partizione primaria."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s non può trovarsi su un dispositivo a blocchi cifrato."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s non può essere di tipo %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s potrebbe non avere abbastanza spazio per consentire a grub2 di inserire "
 "core.img durante l'utilizzo del filesystem %s su %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Avvia VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Usa la modalità testo"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "La password è stata impostata."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Le password non corrispondono!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "La password fornita è debole: %s.  Premere Fatto di nuovo per usarla "
 "comunque."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -175,87 +196,342 @@ msgstr ""
 "comunque."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Debole"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Decente"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Buona"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Forte"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Si"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_No"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Il seguente errore è occorso mentre veniva impostato il repository di "
+"installazione:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"L'installazione non può continuare. "
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Il seguente errore è occorso mentre veniva impostato il repository di "
+"installazione:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"L'installazione non può continuare. "
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Il seguente software contrassegnato per l'installazione contiene errori.  La "
+"causa è probabilmente\n"
+"riconducibile ad un errore nella sorgente di installazione.  E' possibile "
+"provare a rimuovere\n"
+"questi pacchetti dall'installazione. Cambiare sorgente di installazione, o "
+"abbandonare il \n"
+"programma di installazione."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"L'installazione è stata interrotta da quello che sembra essere un problema "
+"hardware. Il messaggio d'errore è:\n"
+"\n"
+"%s.\n"
+"\n"
+"Il programma di installazione verrà ora terminato."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"L'installazione è stata interrotta da quello che sembra essere un problema "
+"hardware. Il messaggio d'errore è:\n"
+"\n"
+"%s.\n"
+"\n"
+"Il programma di installazione verrà ora terminato."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Riscontrato errore hardware"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"L'installazione è stata interrotta da quello che sembra essere un problema "
+"hardware. Il messaggio d'errore è:\n"
+"\n"
+"%s.\n"
+"\n"
+"Il programma di installazione verrà ora terminato."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Configurazione del sistema installato"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Scrittura della configurazione di rete"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Creazione utenti"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Configurazione del sistema installato"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Esecuzione degli script pre-installazione"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Impostazione sorgente di installazione..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Installazione bootloader"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Applicazione delle impostazioni post-installazione"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Installazione bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Il certificato di garanzia %s richiede la rete."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -268,32 +544,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s è mancante. Impossibile configurare il firewall."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s è mancante. Impossibile configurare il firewall."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Questo file system non supporta le etichette."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Il nome specificato %s è già in uso."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Il nome del gruppo di volumi %s è già in uso. Modifiche non salvate."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Esecuzione degli script pre-installazione"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Il nome host non può essere None oppure una stringa vuota."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Il nome host può avere un massimo di 255 caratteri."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Il nome host deve iniziare con un carattere valido compreso tra 'a-z', 'A-"
-"Z', oppure '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -303,55 +869,55 @@ msgstr ""
 "'.', le parti tra i punti devono contenere qualcosa e non possono iniziare o "
 "finire per '-'."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Disconnessione..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Interfaccia wired (%s) connessa"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Connessione wireless a %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Non connesso"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Nessun dispositivo di rete disponibile"
 
@@ -360,7 +926,12 @@ msgstr "Nessun dispositivo di rete disponibile"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "INSTALLAZIONE %(productName)s %(productVersion)s"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nuova installazione %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Eseguire %s per smontare il sistema una volta terminato."
@@ -373,8 +944,8 @@ msgstr "Una volta terminato, uscire dalla shell ed il sistema si riavvierà."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Impossibile trovare /bin/sh da eseguire!  La shell non sarà avviata"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Ripristino"
 
@@ -422,21 +993,15 @@ msgstr "Sistema da ripristinare"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Quale dispositivo contiene la partizione di root della installazione?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Esci"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Il sistema verrà riavviato automaticamente una volta chiusa la shell."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -446,7 +1011,7 @@ msgstr ""
 "Premere invio per ottenere una shell dalla quale eseguire fsck e montare le "
 "partizioni. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -467,7 +1032,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -480,29 +1045,243 @@ msgstr ""
 "\n"
 "Premere <invio> per ottenere una shell."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Non esistono partizioni Linux. Riavvio in corso.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Il sistema verrà riavviato automaticamente una volta chiusa la shell."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Modalità di ripristino"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Nessuna partizione linux presente. Premere invio per ottenere una shell. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Il sistema è stato montato sotto la directory %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Partizione standard"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disco"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"L'area di 'swap' del computer è utilizzata dal sistema\n"
+"operativo quando la memoria scarseggia."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"L'area di 'boot' del computer è il luogo in cui risiedono\n"
+"i programmi necessari all'avvio del sistema operativo."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"L'area di 'root' del computer è il luogo in cui risiedono\n"
+"i file e le applicazioni del sistema."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"L'area 'home' del computer è il luogo in cui risiedono\n"
+"i dati personali degli utenti."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"La partizione di boot BIOS è necessaria per abilitare l'avvio\n"
+"da dischi partizionati GPT su hardware con BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"La partizione di boot PReP è necessaria come parte della\n"
+"configurazione del bootloader su alcune piattaforme PPC."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"La capacità della partizione root è inferiore a 250 megabyte che solitamente "
+"è troppo piccola per installare %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Non è stata definita alcuna partizione root (/), che è necessaria per "
+"continuare l'installazione di %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Questa piattaforma richiede /boot su una partizione dedicata o un volume "
+"logico.  Se non si desidera un volume /boot, è possibile posizionare / su "
+"una partizione non-LVM dedicata."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"La partizione %(mount)s è meno di %(size)s megabyte che è più bassa del "
+"valore consigliato per una normale installazione di %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"La partizione %(mount)s è troppo piccola per formattare %(format)s (la "
+"dimensione permessa è da %(minSize)d MB a %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"La partizione %(mount)s è troppo grande per formattare %(format)s (la "
+"dimensione permessa è da %(minSize)d MB a %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Aggiunta nuovo dispositivo fallita. Cliccare per i dettagli."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Non è stata creata una partizione avviabile."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Questo sistema basato su BIOS necessita di una speciale partizione per "
+"avviarsi con il nuovo formato di etichettatura del disco %s (GPT) . Per "
+"continuare, creare una partizione di tipo 'BIOS Boot' da 1MB."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Non è stata definita una partizione di swap.  %(requiredMem)s MB di memoria "
+"sono richiesti per proseguire l'installazione senza una partizione di swap, "
+"ma sono disponibili solo %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Non è stata specificata alcuna partizione swap. Benché non strettamente "
+"necessaria in tutti i casi, la partizione migliora significativamente le "
+"prestazioni della maggior parte delle installazioni."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Almeno uno dei dispositivi di swap non ha un UUID, cosa comune negli spazi "
+"swap creati usando vecchie versioni di mkswap. Questi dispositivi saranno "
+"indicati con il loro percorso in /etc/fstab, cosa non ideale visto che tali "
+"percorsi possono variare in diverse circostanze."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Questo mount point non è valido. La directory %s deve trovarsi sul "
+"filesystem / ."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Il mount point %s deve trovarsi su di un filesystem linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Passphrase:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -617,53 +1396,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "La password per VNC ha meno di 6 caratteri.\n"
 "Inserire una nuova password. Lasciare vuoto per non usare una password"
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Impostazione sorgente di installazione fallita"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Errore durante lo scaricamento dei metadati dei pacchetti..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Nessuna sorgente di installazione disponibile"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Installazione del software"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Avvio del processo di installazione dei pacchetti"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "E' necessario più spazio sui seguenti file system:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Preparazione della transazione dalla sorgente d'installazione in corso"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Installazione in corso"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Scaricamento metadati pacchetti..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installazione in corso"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Preparazione all'installazione"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Controllo della configurazione dello storage..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "TITOLO PREDEFINITO"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOCALIZZAZIONE"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOCALIZZAZIONE"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "IMPOSTAZIONI UTENTE"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -672,34 +1536,101 @@ msgstr ""
 "Spazio nei filesystem insufficiente con la selezione di software corrente. "
 "Servono ancora %s."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Hub installazione"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Avvio installazione automatica"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Impossibile avere una domanda nella modalità linea di comando!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  Scegliere da sopra ['q' per abbandonare | 'c' per continuare]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Completare tutte le operazioni prima di continuare"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Titolo HUB predefinito"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Completare tutte le operazioni prima di continuare"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Errore"
 
@@ -723,32 +1654,35 @@ msgstr "si"
 msgid "no"
 msgstr "no"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Si desidera abbandonare?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  Scegliere da sopra ['q' per abbandonare | 'c' per continuare]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -763,224 +1697,263 @@ msgstr ""
 "questo computer da un altro computer ed eseguire una installazione grafica, "
 "oppure continuare con l'installazione in modalità testo?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Password VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Inserire una password per VNC. Sarà necessario scriverla due volte.\n"
 "Lasciare vuoto per non usare una password"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Password: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Password (conferma): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Le password non corrispondono!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "La password deve contenere almeno 6 caratteri."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "La password deve contenere almeno 6 caratteri."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Impostazioni fuso orario"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Il fuso orario non è stato impostato"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Regioni disponibili"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Regioni disponibili"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Scrittura della configurazione di rete"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Interfaccia wired (%s) connessa"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Interfaccia wired (%s) connessa"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Nome host:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Nome host"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Nome host"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Il nome host non è valido: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Termina configurazione"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "la configurazione del filesystem non ha un tipo"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Configurazione del sistema installato"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Password di root:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "La password è stata impostata."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "L'account root è disabilitato."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "La password non è impostata."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Selezionare una nuova password di root. Dovrà essere digitata due volte."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Password: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Usa tutto lo spazio"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Sostituisci il sistema linux esistente"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Usa lo spazio libero"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Destinazione di installazione"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nessun disco selezionato"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 "Si è verificato un errore durante il controllo della configurazione dello "
 "storage"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr ""
 "Si è verificato un errore durante il controllo della configurazione dello "
 "storage"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Partizionamento automatico "
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Partizionamento personalizzato"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -988,39 +1961,61 @@ msgstr ""
 "Nessun disco trovato.  Spegnere il computer, collegare almeno un disco e "
 "riavviare per completare l'installazione."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Nessun disco selezionato; selezionare almeno un disco per l'installazione."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Verifica dello storage..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Seleziona"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Generazione configurazione storage aggiornata"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "configurazione dello storage fallita: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Controllo della configurazione dello storage..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Opzioni partizionamento automatico"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1029,41 +2024,41 @@ msgstr ""
 "L'installazione richiede il partizionamento del disco fisso.  Selezionare "
 "quale spazio utilizzare come destinazione dell'installazione."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Configurazione dello schema di partizionamento"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Configurazione dello schema di partizionamento"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Impostazioni fuso orario"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Fuso orario %s "
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Il fuso orario non è stato impostato"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Fusi orari disponibili nella regione %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Regioni disponibili"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1072,181 +2067,199 @@ msgstr ""
 "Utilizzare i numeri o scrivere direttamente i nomi [b per elencare le "
 "regioni, q per abbandonare]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Avvia VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progresso installazione"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Mirror più vicino"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Server NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Errore nell'impostazione della sorgente del software"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Selezione nulla"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Connessione..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Drive CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "File _ISO:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Tempo sulla rete"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Nessuna sorgente di installazione disponibile"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Impostazione sorgente di installazione fallita"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Errore durante lo scaricamento dei metadati dei pacchetti..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Nessuna sorgente di installazione disponibile"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Server NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Opzioni montaggio NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Impostazione sorgente di installazione fallita, controllare l'url del "
 "repository"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "il dispositivo che contiene /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Impostazione sorgente di installazione fallita"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Modifica selezione del software"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 "Si è verificato un errore durante il controllo della selezione del software"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Sorgente di installazione non impostata"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Sorgente modificata - verificare"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Software personalizzato selezionato"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Sorgente di installazione non impostata"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Scelta dell'ambiente"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Usa autenticazione"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "E' necessario fornire e confermare una password."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Avviso"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1262,36 +2275,36 @@ msgstr "In corso"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstallazione completa.  Premere invio per abbandonare"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Titolo sezione predefinito"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "verifica stato..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Nuovo dispositivo"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Password (conferma): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1300,7 +2313,7 @@ msgstr ""
 "La password fornita è debole: %s.  Premere Fatto di nuovo per usarla "
 "comunque."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1309,63 +2322,47 @@ msgstr ""
 "La password fornita è debole: %s.  Premere Fatto di nuovo per usarla "
 "comunque."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "La password è stata impostata."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Esci dal programma di installazione"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Aiuto"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Abbandona"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_No"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Si"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "TITOLO PREDEFINITO"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOCALIZZAZIONE"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOCALIZZAZIONE"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SISTEMA"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "IMPOSTAZIONI UTENTE"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1373,7 +2370,11 @@ msgstr ""
 "Completare le cose contassegnate con questa icona prima di procedere con il "
 "prossimo passo."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Completata!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1382,170 +2383,67 @@ msgstr ""
 "%s è ora installata con successo sul sistema e pronta\n"
 "all'uso!  Riavviare per iniziare ad usarla!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Completata!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Abbandona"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nuova installazione %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s è ora installata con successo sul sistema, ma alcune configurazioni "
+"debbono ancora essere ultimate. \n"
+"Concludetele e premete il bottone Termina configurazione."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s è ora installata con successo sul sistema e pronta\n"
+"all'uso!  Riavviare per iniziare ad usarla!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Crea un nuovo gruppo di volumi ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Riconfigurazione dispositivo fallita. Cliccare per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Definire un nome per il gruppo di volumi e selezionare almeno un disco qua "
-"sotto."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Gruppo di volumi:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "colonna"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Configurazione dello storage reimpostata per errore irrecuperabile. Clicca "
 "per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Riconfigurazione dispositivo fallita. Cliccare per i dettagli."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Inserire un mountpoint valido."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Il mount point non è valido. Provare qualcos'altro?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Questo mount point è già utilizzato. Provare qualcos'altro?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Il livello RAID selezionato richiede più dischi di quelli attualmente "
-"selezionati."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Inserire un mountpoint valido."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Il mount point non è valido. Provare qualcos'altro?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Partizione standard"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disco"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Nessuna"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Cancella anche tutti gli altri filesystem sulla root di %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Si è sicuri di voler cancellare tutti i dati su %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Si è sicuri di voler cancellare tutti i dati su %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "PARTIZIONAMENTO MANUALE"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d dispositivo di storage selezionato"
 msgstr[1] "%d dispositivi di storage selezionati"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1554,132 +2452,117 @@ msgstr ""
 "Durante la creazione dei mount point per l'installazione di %s %s,\n"
 "sarà possibile vedere i dettagli qui."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"L'area di 'swap' del computer è utilizzata dal sistema\n"
-"operativo quando la memoria scarseggia."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"L'area di 'boot' del computer è il luogo in cui risiedono\n"
-"i programmi necessari all'avvio del sistema operativo."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"L'area di 'root' del computer è il luogo in cui risiedono\n"
-"i file e le applicazioni del sistema."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"L'area 'home' del computer è il luogo in cui risiedono\n"
-"i dati personali degli utenti."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"La partizione di boot BIOS è necessaria per abilitare l'avvio\n"
-"da dischi partizionati GPT su hardware con BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"La partizione di boot PReP è necessaria come parte della\n"
-"configurazione del bootloader su alcune piattaforme PPC."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi deve trovarsi sul dispositivo di tipo %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s deve essere un dispositivo di tipo %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s non può essere cifrato"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "E necessario creare un nuovo filesystem sul dispositivo root."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 "Dispositivi di tipo %s richiedono la selezione di un livello RAID valido."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Richiesta ridimensionamento dispositivo fallita. Cliccare per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Richiesta riformattazione dispositivo fallita. Cliccare per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Il nome specificato %s è già in uso."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Questo file system non supporta le etichette."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nessun disco selezionato"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Questo file system potrebbe non essere ridimensionabile."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Errore nel controllo della configurazione dello storage.  Cliccare per i "
+"dettagli."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Errore nel controllo della configurazione dello storage.  Cliccare per i "
+"dettagli."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Aggiunto nuovo %s al container esistente %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Aggiunta nuovo dispositivo fallita. Cliccare per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Dimensione partizione non valida. Usare un intero valido."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Richiesta rimozione dispositivo fallita. Cliccare per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Il nome del gruppo di volumi %s è già in uso. Modifiche non salvate."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs libero"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1688,7 +2571,7 @@ msgstr ""
 "A questo array RAID software mancano %d su %d partizioni membro. E' "
 "possibile rimuoverlo oppure selezionare un diverso device."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1697,297 +2580,145 @@ msgstr ""
 "A questo gruppo di volumi LVM mancano %d di %d volumi fisici. E' possibile "
 "rimuoverlo oppure selezionare un diverso device."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nessun disco selezionato."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Spazio insufficiente sui dischi selezionati."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Partizionamento automatico fallito. Cliccare per i dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Modifica selezione del software"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Impossibile sbloccare il dispositivo a blocchi cifrato. Cliccare per i "
 "dettagli."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Si è scelto di configurare manualmente i filesystem per questa "
-"nuovainstallazione di %(productName)s. Prima di iniziare, può essere utile "
-"spendere un minuto per orientarsi nella nuova interfaccia. Molto è "
-"cambiato.\n"
-"\n"
-"Il cambiamento più importante riguarda una più snella creazione di nuovi "
-"filesystem. Non è più necessario costruire device complessi, come i volumi "
-"logici LVM, in diversi stadi (volume fisico, poi gruppo di volumi, quindi "
-"volume logico); ora è sufficiente creare un volume logico e l'installer si "
-"occuperà di creare i volumi fisici e il gruppo di volumi per contenerlo. "
-"Inoltre, in caso di aggiunta, rimozione e ridimensionamento dei volumi "
-"logici, saranno eseguiti automaticamente gli aggiustamenti necessari al "
-"gruppo di volumi, così che non ci si debba preoccupare di questi dettagli.\n"
-"\n"
-"\n"
-"\n"
-"Disposizione dello schermo\n"
-"\n"
-"La parte sinistra dello schermo mostra i sistemi operativi già installati su "
-"questo computer. La nuova installazione di %(productName)s è in cima a "
-"questa lista. E' possibile cliccare sui nomi delle installazioni per vedere "
-"quali filesystem contengono.\n"
-"\n"
-"Sul lato sinistro, sotto le varie installazioni e punti di mount ci sono i "
-"tasti per aggiungere un nuovo filesystem, rimuovere oppure configurare il "
-"filesystem selezionato.\n"
-"\n"
-"Nella parte destra dello schermo è possibile personalizzare il punto di "
-"mount selezionato.\n"
-"\n"
-"In basso a sinistra è possibile vedere un sommario dei dischi che sono stati "
-"selezionati per la installazione. Si può cliccare sul testo in blu per avere "
-"informazioni più dettagliate sui dischi selezionati.\n"
-"\n"
-"\n"
-"Come creare un nuovo filesystem su un nuovo device\n"
-"\n"
-"1. Cliccare sul bottone +\n"
-"2. Inserire il punto di mount e la dimensione (suggerimento: portare il "
-"mouse sopra le aree di testo per aiuto)\n"
-"3. Selezionare il nuovo punto di mount sotto \"Nuova installazione "
-"%(productName)s\" sulla parte sinistra dello schermo e personalizzare "
-"secondo necessità.\n"
-"\n"
-"\n"
-"Come riformattare un device/filesystem già esistente sul disco\n"
-"\n"
-"1. Selezionare il filesystem dalla parte sinistra dello schermo.\n"
-"2. Cliccare su \"Personalizza...\" nella area di personalizzazione del punto "
-"di mount, sulla parte destra dello schermo.\n"
-"3. Attivare la casella \"Riformatta\", selezionare un tipo di filesystem e, "
-"se necessario, inserire un punto di mount nella casella di testo \"Punto di "
-"mount\" sopra.\n"
-"4. Cliccare su \"Applica modifiche\"\n"
-"\n"
-"\n"
-"Come impostare un punto di mount per un filesystem già esistente su disco\n"
-"\n"
-"1. Selezionare il filesystem dalla parte sinistra dello schermo.\n"
-"2. Inserire un punto di mount nella casella di testo \"Punto di mount\" "
-"nella area di personalizzazione.\n"
-"3. Cliccare su \"Applica modifiche\"\n"
-"\n"
-"\n"
-"Come rimuovere un filesystem già esistente su disco\n"
-"\n"
-"1. Selezionare il filesystem da rimuovere nella parte sinistra dello "
-"schermo.\n"
-"2. Cliccare sul bottone -\n"
-"\n"
-"Suggerimento: Rimuovere una periferica esistente sul disco da \"Nuova "
-"installazione%(productName)s\" non significa rimuoverla anche dal disco. La "
-"periferica viene riportata al suo stato originale. Per rimuovere una "
-"periferica già esistente sul disco, bisogna selezionarla da una delle "
-"installazioni esistenti (oppure \"Sconosciuto\") e poi premere il tasto -\n"
-"\n"
-"\n"
-"Consigli e suggerimenti\n"
-"\n"
-"E' possibile scegliere dimensioni per i nuovi filesystem più grandi dello "
-"spazio complessivo disponibile. Il programma di installazione si avvicinerà "
-"il più possibile alla dimensione richiesta.\n"
-"\n"
-"Per impostazione predefinita, i nuovi device useranno tutti i dischi "
-"selezionati.\n"
-"\n"
-"Si può cambiare da quali dischi sarà allocato il nuovo device cliccando sul "
-"bottone configura (la icona con gli attrezzi) dopo aver selezionato il "
-"device.\n"
-"\n"
-"Quando si aggiunge un nuovo punto di mount cliccando sul bottone +, "
-"lasciando vuota la casella della dimensione, il nuovo device userà tutto lo "
-"spazio libero disponibile.\n"
-"\n"
-"Quando si rimuove l'ultimo device da un contenitore come un gruppo di volumi "
-"LVM, lo stesso contenitore sarà automaticamente rimosso per lasciare spazio "
-"ai nuovi device.\n"
-"\n"
-"Quando si rimuove l'ultima partizione da un disco, il disco potrebbe essere "
-"inizializzato con una nuova tabella delle partizioni se questa è di un tipo "
-"più appropriato per quel disco.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATA & ORA"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Fuso orario non valido"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "E' necessario impostare la rete se si desidera utilizzare NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Non è stato configurato alcun server NTP funzionante"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "DESTINAZIONE DI INSTALLAZIONE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d dispositivo di storage selezionato"
+msgstr[1] "%d dispositivi di storage selezionati"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s per cambiare disposizione"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TASTIERA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "La prova delle disposizioni configurate non è disponibile."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "verifica stato..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Cambio disposizione non configurato."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "LINGUA"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Stato sconosciuto (mancante)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Stato sconosciuto"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Non gestito"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Non disponibile"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware mancante"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Cavo non collegato"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Non disponibile"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Disconnesso"
@@ -2012,156 +2743,172 @@ msgstr "Disconnesso"
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "non collegato"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Wireless"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "non collegato"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Indirizzo IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Indirizzo IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Nessuna"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Autenticazione necessaria"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Password: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "CONFIGURAZIONE DI RETE"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "PASSWORD DI ROOT "
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "La password è stata impostata."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "La password di root è stata impostata"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "L'account root è disabilitato"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "La password di root non è impostata"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SELEZIONE DEL SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
+msgid "Downloading package metadata..."
+msgstr "Scaricamento metadati pacchetti..."
+
+#: pyanaconda/ui/gui/spokes/software.py:95
+msgid "Downloading group metadata..."
+msgstr "Scaricamento metadati gruppi..."
+
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
 msgid "Checking software dependencies..."
 msgstr "Controllo delle dipendenze del software..."
 
-#: pyanaconda/ui/gui/spokes/software.py:127
+#: pyanaconda/ui/gui/spokes/software.py:140
 msgid "Error checking software dependencies"
 msgstr ""
 "Si è verificato un errore durante il controllo delle dipendenze del software"
 
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
-msgid "Downloading package metadata..."
-msgstr "Scaricamento metadati pacchetti..."
-
-#: pyanaconda/ui/gui/spokes/software.py:214
-msgid "Downloading group metadata..."
-msgstr "Scaricamento metadati gruppi..."
-
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Errore durante il controllo delle dipendenze software.  Cliccare per i "
 "dettagli."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Il seguente software contrassegnato per l'installazione contiene errori.  La "
 "causa è probabilmente\n"
@@ -2171,48 +2918,79 @@ msgstr ""
 "abbandonare il \n"
 "programma di installazione."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Annulla"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Abbandona"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Modifica sorgente software"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Modifica selezione del software"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Impostazione sorgente di installazione..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Errore durante lo scaricamento dei metadati dei pacchetti..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Autenticazione necessaria"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Questo media consente l'installazione."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Questo media non consente l'installazione."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "SORGENTE DI INSTALLAZIONE"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Impostazione sorgente di installazione fallita, controllare l'url del "
 "repository"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Errore di impostazione del repository"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Errore nell'impostazione della sorgente del software"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2220,98 +2998,80 @@ msgstr ""
 "Impostazione sorgente di installazione fallita, controllare le impostazioni "
 "dell'url del repository e del proxy"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Errore di impostazione del repository"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Errore nell'impostazione della sorgente del software"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Server NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Fuso orario non valido"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Fuso orario non valido"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Fuso orario non valido"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Attendere... caricamento metadati del software."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "I dischi selezionati hanno la seguente quantità di spazio libero:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Attendere... caricamento metadati del software."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2321,7 +3081,7 @@ msgstr ""
 "<b>Lo spazio per l'installazione di %s</b> è insufficiente, ma è possibile\n"
 "recuperare spazio riducendo o rimuovendo le partizioni esistenti."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2332,7 +3092,7 @@ msgstr ""
 "utilizzato tutto lo\n"
 "spazio disponibile dei dischi selezionati."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2347,46 +3107,53 @@ msgstr ""
 "modificare la selezione del software per installare una versione più piccola "
 "di <b>%s</b>, o abbandonare il programma di installazione."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "DESTINAZIONE DI INSTALLAZIONE"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Salvataggio configurazione dello storage..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Salvataggio della configurazione dello storage fallita..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formattazione dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Errore nel controllo della configurazione dello storage.  Cliccare per i "
 "dettagli."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Errore nel controllo della configurazione dello storage.  Cliccare per i "
 "dettagli."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs libero"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d disco selezionato; %s capacità; %s disponibili"
 msgstr[1] "%d dischi selezionati; %s capacità; %s disponibili"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2394,7 +3161,11 @@ msgstr ""
 "Si è scelto di saltare l'installazione del boot loader.  Il sistema potrebbe "
 "non essere avviabile."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2404,11 +3175,19 @@ msgstr ""
 "configurazione dello storage. E' possibile modificare\n"
 "lo schema dello storage o abbandonare il programma di installazione."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Abbandona"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Modifica lo schema dello storage"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2419,53 +3198,53 @@ msgstr ""
 "configurazione dello storage. E' possibile modificare\n"
 "lo schema dello storage o abbandonare il programma di installazione."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "IMPOSTAZIONI UTENTE"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Fuso orario non valido"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "BENVENUTI IN %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2473,23 +3252,27 @@ msgid ""
 msgstr ""
 "Non è stato creato ancora alcun mount point per l'installazione di %s %s :"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Cliccare qui per crearli automaticamente."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Oppure, creare nuovi mount point qui sotto con l'icona '+'."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2504,55 +3287,163 @@ msgstr[1] ""
 "<b>%d dischi; %s capacità; %s spazio libero</b> (non partizionato e nei "
 "filesystem)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Non installare il bootloader"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Imposta come dispositivo di boot"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Il livello RAID selezionato richiede più dischi di quelli attualmente "
+"selezionati."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Definire un nome per il gruppo di volumi e selezionare almeno un disco qua "
+"sotto."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Gruppo di volumi:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "colonna"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Il mount point %s deve trovarsi su di un filesystem linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Questo mount point è già utilizzato. Provare qualcos'altro?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Inserire un mountpoint valido."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Il mount point non è valido. Provare qualcos'altro?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Cancella anche tutti gli altri filesystem sulla root di %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Si è sicuri di voler cancellare tutti i dati su %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Si è sicuri di voler cancellare tutti i dati su %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Fuso orario non valido"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Abbandona"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "La passphrase inserita è debole: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Le passphrase non corrispondono."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Preserva"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Riduci"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Cancella"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Questo dispositivo contiene la sorgente della installazione"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Creazione %(type)s su %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Non  pronta"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Usa lo spazio libero"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2565,14 +3456,14 @@ msgstr ""
 "liberare lo spazio necessario a questa installazione.  La rimozione di un "
 "filesystem cancellerà permanentemente tutti i dati contenuti."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2580,353 +3471,762 @@ msgid_plural ""
 msgstr[0] "<b>%s disco; %s di spazio recuperabile</b> (nei filesystem)"
 msgstr[1] "<b>%s dischi; %s di spazio recuperabile</b> (nei filesystem)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Totale spazio selezionato per il recupero: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Cancella"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Preserva"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALLAZIONE DISTRIBUZIONE"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "NOME SEZIONE"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PRE-RELEASE / TESTING"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Nuovo dispositivo"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Nuovo selettore"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Fatto"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continua"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Applica modifiche"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "CONFIGURAZIONE DI RETE"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Nome gruppo"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Annulla"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATA & ORA"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Aggiungere e contrassegnare per l'uso i server NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Funzionante"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Usa"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Configura..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATA & ORA"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Regione:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Regione:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Città:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Città:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Nome della rete"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nome della rete"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-ore"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "DESTINAZIONE DI INSTALLAZIONE"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacità"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Non connesso"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Dispositivo selezionato"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Selezione nulla"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etichetta:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware mancante"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_No"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Tipo VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Dispositivo selezionato"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "sommario"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Aggiungi"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Route predefinita"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Maschera di sottorete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Velocità"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Indirizzo hardware"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "C_onfigura..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Sicurezza"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Nome della rete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Nome della rete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Chiave di sicurezza"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Utilizza come hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "Arre_sta hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Configura..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Fornitore"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Configura..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Tipo VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Nome gruppo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Password gruppo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nome utente"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Configura..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metodo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "URL di _configurazione"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "Proxy _HTTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "Proxy H_TTPS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "Proxy _FTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Host _socks"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Scrittura della configurazione di rete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Sblocca"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Modalità aero_plano"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Scrittura della configurazione di rete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nome host:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "CONFIGURAZIONE DI RETE"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2935,286 +4235,206 @@ msgstr ""
 "Sarà necessario l'accesso alla rete per recuperare informazioni sulla\n"
 "posizione e rendere disponibili gli aggiornamenti software."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Route predefinita"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Maschera di sottorete"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Velocità"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Indirizzo hardware"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "C_onfigura..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Sicurezza"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Nome della rete"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Nome della rete"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Chiave di sicurezza"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Utilizza come hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "Arre_sta hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Configura..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Fornitore"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Tipo VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Nome gruppo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Password gruppo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nome utente"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metodo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "URL di _configurazione"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "Proxy _HTTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "Proxy H_TTPS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "Proxy _FTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Host _socks"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Sblocca"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Modalità aero_plano"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Nome host:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Usa autenticazione"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Autenticazione necessaria"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Connesso"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SELEZIONE DEL SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Scelta dell'ambiente"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "colonna"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Annulla & _aggiungi più dischi"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "OPZIONI DI INSTALLAZIONE"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Tipo di partizione:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Cifrare i dati. La passphrase sarà scelta in seguito."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Partizionamento personalizzato"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Recupera spazio"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "OPZIONI DI INSTALLAZIONE"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 "Descrizione dello spazio necessario per la selezione del software corrente."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disco libero"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Spazio libero disponibile all'uso"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs libero"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Spazio libero non disponibile ma recuperabile dalle partizioni esistenti."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Descrizione delle opzioni di installazione."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Usa lo spazio libero"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Abbandona il programma di installazione"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Descrizione del dispositivo"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Dischi locali standard"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Termina partizionamento"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Cifrare"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Partizionamento automatico "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Termina partizionamento"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Cifrare"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Cifrare i dati. La passphrase sarà scelta in seguito."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Opzioni partizionamento automatico"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "sommario"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Sommario completo dei dischi ed opzioni"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "AGGIUNGI DISPOSIZIONE DI TASTIERA"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-"E' possibile aggiungere una disposizione di tastiera selezionandola qui "
-"sotto:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nome"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "DISPOSIZIONE DELLA TASTIERA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3223,7 +4443,7 @@ msgstr ""
 "possibile spostare una disposizione in cima alla lista per selezionarla come "
 "predefinita."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3232,118 +4452,202 @@ msgstr ""
 "strumenti del desktop per configurare la tastiera per il processo di "
 "installazione."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nome"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Aggiungi disposizione"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Rimuovi disposizione"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Sposta in su la disposizione selezionata"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Aggiungi disposizione"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Rimuovi disposizione"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Sposta in su la disposizione selezionata"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Sposta in giù la disposizione selezionata"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Anteprima disposizione"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "La prova delle disposizioni configurate non è disponibile."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift per cambiare disposizione."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Aggiungi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "AGGIUNGI DISPOSIZIONE DI TASTIERA"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+"E' possibile aggiungere una disposizione di tastiera selezionandola qui "
+"sotto:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nome"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Regioni disponibili"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Aggiungi disposizione"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "OPZIONI DI CAMBIO DISPOSIZIONE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Quale combinazione/i si vuole utililizzare per cambiare le disposizioni di "
 "tastiera?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "usa"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "descrizione"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Opzioni montaggio NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "LINGUA"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nomeNativo"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "nomeInglese"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Selezione nulla"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "PASSWORD DI ROOT "
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Password di root:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Conferma:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Password VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Impostazione password di root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3351,237 +4655,285 @@ msgstr ""
 "L'account root è usato per amministrare il sistema.  Inserire una password "
 "per l'utente root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Fatto"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "VERIFICA MEDIA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Attendere, verifica media..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Aggiungi"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Abilita proxy HTTP"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Esempio:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Usa autenticazione"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Nome utente</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Nome utente"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Password</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Password: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "SORGENTE DI INSTALLAZIONE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Quale sorgente si vuole usare per la installazione?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Determinazione automatica media installazione:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etichetta:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verifica"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "File _ISO:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "S_cegli un ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Sulla _rete:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Impostazioni _proxy..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Questa URL corrisponde a una lista di _mirror."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Opzioni montaggio NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Questo campo è opzionale."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Repository Fedora People"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Aggiungi un nuovo punto di mount."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Aggiungi"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Rimuovi i punti di mount selezionati"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Errore operativo."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Impostazione password di root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Questa URL corrisponde a una lista di _mirror."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nome:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nome utente"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Password: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Il mount point non è valido. Provare qualcos'altro?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Fammi uscire di qui!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Accetto il mio destino."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Questo software è una pre-release instabile."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3593,204 +4945,264 @@ msgstr ""
 "convivere.  Questo SO del futuro non è un SO stabile su cui potete contare.  "
 "E' solo a scopo di test."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "BENVENUTI IN %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Quale lingua si desidera usare durante il processo d'installazione?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Abbandona"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continua"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nome utente"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Nome gruppo"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Password: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Password VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Aggiungi mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Capacità desiderata:</b>"
+msgid "Add a new mount point."
+msgstr "Aggiungi un nuovo punto di mount."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Mount Point:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Aggiungi"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "AGGIUNGI UN NUOVO MOUNT POINT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Più opzioni di personalizzazione saranno disponibili\n"
-"dopo aver creato il mount point sottostante."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Il mount point è già in uso\n"
-"Provare qualcos'altro?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "es: \"20 GB\", \"500mb\" (meno le virgolette)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Eliminala"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Salva"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CONFIGURA PUNTO DI MOUNT"
+msgid "Remove the selected mount point(s)."
+msgstr "Rimuovi i punti di mount selezionati"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Definire un nome per il gruppo di volumi e selezionare almeno un disco qua "
-"sotto."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "_Rimuovi"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Libero"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dispositivo RAID"
+msgid "Reload storage configuration from disk."
+msgstr "configurazione dello storage fallita: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Cifrare"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Dispositivo selezionato"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Descrizione del dispositivo"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Mount Point:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Capacità desiderata:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etichetta:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Tipo dispositivo:</b>"
+msgid "Device(s):"
+msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>File System:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Cifrare"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Riformatta"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Gruppo di volumi:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Modifica..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nome:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Tipo dispositivo:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Cifrare"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Filesystem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Riformatta"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Gruppo di volumi:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Modifica..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3798,17 +5210,19 @@ msgstr ""
 "Questo dispositivo è cifrato e non può essere letto senza una passphrase "
 "valida. E' possibile sbloccarlo qua sotto."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Passphrase:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Sblocca"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3816,297 +5230,574 @@ msgstr ""
 "Questo dispositivo non può essere modificato direttamente. E' possibile "
 "rimuoverlo o selezionarne uno diverso."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Aggiungi un nuovo punto di mount."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Rimuovi i punti di mount selezionati"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Configura il punto di mount selezionato."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Configura..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "configurazione dello storage fallita: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Cliccare per ottenere aiuto"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Aiuto"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">SPAZIO DISPONIBILE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">SPAZIO COMPLESSIVO</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Seleziona"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Annulla"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGURA PUNTO DI MOUNT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Selezionare uno o più dischi per questo dispositvo."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Indirizzo IP"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "E' necessario fornire il nome di un inizializzatore iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Usa autenticazione"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Esempio:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nome utente"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Password VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome utente"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Password VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nome utente"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Password VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Nome della rete"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Usa autenticazione"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome utente"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Password VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome utente"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Password VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Nome utente"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Password VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Connessione fallita"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispositivo:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "DISCHI SELEZIONATI"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Boot"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Descrizione"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Libero"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Sommario disco"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Eliminala"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Seleziona"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGURA PUNTO DI MOUNT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Selezionare uno o più dischi per questo dispositvo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Aggiungi mount point"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Capacità desiderata:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Mount Point:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "AGGIUNGI UN NUOVO MOUNT POINT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Più opzioni di personalizzazione saranno disponibili\n"
+"dopo aver creato il mount point sottostante."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Il mount point è già in uso\n"
+"Provare qualcos'altro?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "es: \"20 GB\", \"500mb\" (meno le virgolette)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Salva"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CONFIGURA PUNTO DI MOUNT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Definire un nome per il gruppo di volumi e selezionare almeno un disco qua "
+"sotto."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nome:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Cifrare"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Inserire un mountpoint valido."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formattazione dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Si è verificato un errore sconosciuto durante l'installazione. Maggiori "
 "dettagli qui sotto."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "PASSPHRASE CIFRATURA DISCO"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Salva passphrase"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "PASSPHRASE CIFRATURA DISCO"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4115,7 +5806,19 @@ msgstr ""
 "Si è scelto di cifrare parte dei dati. Sarà necessario creare una passphrase "
 "da usare per accedere ai dati all'avvio del computer."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Passphrase:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Conferma:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4125,117 +5828,172 @@ msgstr ""
 "disposizione della tastiera potrebbe essere impossibile decifrare i dischi "
 "dopo l'installazione."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "RECUPERA SPAZIO DISCO"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Annulla"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Recupera spazio"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "RECUPERA SPAZIO DISCO"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Inserire una decrizione."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Spazio recuperabile"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Azione"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Preserva"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Cancella"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Riduci"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Partizionamento personalizzato"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Applica modifiche"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Aggiungi mount point"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Esci dal programma di installazione"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_No"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Si"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4243,51 +6001,50 @@ msgstr ""
 "Si è sicuri di voler abbandonare il\n"
 "processo di installazione?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Abbandona"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "SOMMARIO INSTALLAZIONE"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Abbandona"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Avvia installazione"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "CONFIGURAZIONE"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Preparazione all'installazione"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s è ora installata con successo sul sistema, ma alcune configurazioni "
-"debbono ancora essere ultimate. \n"
-"Concludetele e premete il bottone Termina configurazione."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Termina configurazione"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s è ora installata con successo sul sistema e pronta\n"
-"all'uso!  Riavviare per iniziare ad usarla!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Riavvia"
 
@@ -4303,16 +6060,16 @@ msgstr "Installa"
 msgid "Install the live CD to your hard disk"
 msgstr "Installa il live CD sul disco rigido"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Inizio installazione sul disco rigido"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Benvenuti in Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4321,26 +6078,27 @@ msgstr ""
 "%s richiede %s MB di memoria per l'installazione, ma sono disponibili solo "
 "%s MB su questa macchina.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Il programma di installazione %s necessita di %s MB di memoria, ma sono "
 "disponibili solo %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "RAM non sufficiente"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4354,24 +6112,24 @@ msgstr ""
 "\n"
 "dal terminale come root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Avvio della modalità testo."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Errore"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Variabile DISPLAY non impostata. Avvio modalità testo."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Installazione grafica non disponibile. Avvio modalità testo."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4383,20 +6141,20 @@ msgstr ""
 "personalizzare la selezione dei pacchetti Si desidera utilizzare la modalità "
 "VNC in alternativa?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Eseguire ssh install@%s per cominciare l'installazione."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Eseguire ssh install@<host> per continuare l'installazione."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Prova Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4406,7 +6164,7 @@ msgstr ""
 "E' possibile installare Fedora, o scegliere di \"Installare su disco rigido"
 "\" fra le attività, successivamente."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4414,10 +6172,298 @@ msgstr ""
 "E' possibile scegliere \"Installa su disco rigido\"\n"
 "nell'Anteprima delle attività più tardi."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Chiudi"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Il nome host deve iniziare con un carattere valido compreso tra 'a-z', 'A-"
+#~ "Z', oppure '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "E' necessario più spazio sui seguenti file system:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Impossibile avere una domanda nella modalità linea di comando!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Il mount point non è valido. Provare qualcos'altro?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Si è scelto di configurare manualmente i filesystem per questa "
+#~ "nuovainstallazione di %(productName)s. Prima di iniziare, può essere "
+#~ "utile spendere un minuto per orientarsi nella nuova interfaccia. Molto è "
+#~ "cambiato.\n"
+#~ "\n"
+#~ "Il cambiamento più importante riguarda una più snella creazione di nuovi "
+#~ "filesystem. Non è più necessario costruire device complessi, come i "
+#~ "volumi logici LVM, in diversi stadi (volume fisico, poi gruppo di volumi, "
+#~ "quindi volume logico); ora è sufficiente creare un volume logico e "
+#~ "l'installer si occuperà di creare i volumi fisici e il gruppo di volumi "
+#~ "per contenerlo. Inoltre, in caso di aggiunta, rimozione e "
+#~ "ridimensionamento dei volumi logici, saranno eseguiti automaticamente gli "
+#~ "aggiustamenti necessari al gruppo di volumi, così che non ci si debba "
+#~ "preoccupare di questi dettagli.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Disposizione dello schermo\n"
+#~ "\n"
+#~ "La parte sinistra dello schermo mostra i sistemi operativi già installati "
+#~ "su questo computer. La nuova installazione di %(productName)s è in cima a "
+#~ "questa lista. E' possibile cliccare sui nomi delle installazioni per "
+#~ "vedere quali filesystem contengono.\n"
+#~ "\n"
+#~ "Sul lato sinistro, sotto le varie installazioni e punti di mount ci sono "
+#~ "i tasti per aggiungere un nuovo filesystem, rimuovere oppure configurare "
+#~ "il filesystem selezionato.\n"
+#~ "\n"
+#~ "Nella parte destra dello schermo è possibile personalizzare il punto di "
+#~ "mount selezionato.\n"
+#~ "\n"
+#~ "In basso a sinistra è possibile vedere un sommario dei dischi che sono "
+#~ "stati selezionati per la installazione. Si può cliccare sul testo in blu "
+#~ "per avere informazioni più dettagliate sui dischi selezionati.\n"
+#~ "\n"
+#~ "\n"
+#~ "Come creare un nuovo filesystem su un nuovo device\n"
+#~ "\n"
+#~ "1. Cliccare sul bottone +\n"
+#~ "2. Inserire il punto di mount e la dimensione (suggerimento: portare il "
+#~ "mouse sopra le aree di testo per aiuto)\n"
+#~ "3. Selezionare il nuovo punto di mount sotto \"Nuova installazione "
+#~ "%(productName)s\" sulla parte sinistra dello schermo e personalizzare "
+#~ "secondo necessità.\n"
+#~ "\n"
+#~ "\n"
+#~ "Come riformattare un device/filesystem già esistente sul disco\n"
+#~ "\n"
+#~ "1. Selezionare il filesystem dalla parte sinistra dello schermo.\n"
+#~ "2. Cliccare su \"Personalizza...\" nella area di personalizzazione del "
+#~ "punto di mount, sulla parte destra dello schermo.\n"
+#~ "3. Attivare la casella \"Riformatta\", selezionare un tipo di filesystem "
+#~ "e, se necessario, inserire un punto di mount nella casella di testo "
+#~ "\"Punto di mount\" sopra.\n"
+#~ "4. Cliccare su \"Applica modifiche\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Come impostare un punto di mount per un filesystem già esistente su "
+#~ "disco\n"
+#~ "\n"
+#~ "1. Selezionare il filesystem dalla parte sinistra dello schermo.\n"
+#~ "2. Inserire un punto di mount nella casella di testo \"Punto di mount\" "
+#~ "nella area di personalizzazione.\n"
+#~ "3. Cliccare su \"Applica modifiche\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Come rimuovere un filesystem già esistente su disco\n"
+#~ "\n"
+#~ "1. Selezionare il filesystem da rimuovere nella parte sinistra dello "
+#~ "schermo.\n"
+#~ "2. Cliccare sul bottone -\n"
+#~ "\n"
+#~ "Suggerimento: Rimuovere una periferica esistente sul disco da \"Nuova "
+#~ "installazione%(productName)s\" non significa rimuoverla anche dal disco. "
+#~ "La periferica viene riportata al suo stato originale. Per rimuovere una "
+#~ "periferica già esistente sul disco, bisogna selezionarla da una delle "
+#~ "installazioni esistenti (oppure \"Sconosciuto\") e poi premere il tasto "
+#~ "-\n"
+#~ "\n"
+#~ "\n"
+#~ "Consigli e suggerimenti\n"
+#~ "\n"
+#~ "E' possibile scegliere dimensioni per i nuovi filesystem più grandi dello "
+#~ "spazio complessivo disponibile. Il programma di installazione si "
+#~ "avvicinerà il più possibile alla dimensione richiesta.\n"
+#~ "\n"
+#~ "Per impostazione predefinita, i nuovi device useranno tutti i dischi "
+#~ "selezionati.\n"
+#~ "\n"
+#~ "Si può cambiare da quali dischi sarà allocato il nuovo device cliccando "
+#~ "sul bottone configura (la icona con gli attrezzi) dopo aver selezionato "
+#~ "il device.\n"
+#~ "\n"
+#~ "Quando si aggiunge un nuovo punto di mount cliccando sul bottone +, "
+#~ "lasciando vuota la casella della dimensione, il nuovo device userà tutto "
+#~ "lo spazio libero disponibile.\n"
+#~ "\n"
+#~ "Quando si rimuove l'ultimo device da un contenitore come un gruppo di "
+#~ "volumi LVM, lo stesso contenitore sarà automaticamente rimosso per "
+#~ "lasciare spazio ai nuovi device.\n"
+#~ "\n"
+#~ "Quando si rimuove l'ultima partizione da un disco, il disco potrebbe "
+#~ "essere inizializzato con una nuova tabella delle partizioni se questa è "
+#~ "di un tipo più appropriato per quel disco.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "CONFIGURAZIONE DI RETE"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Errore durante lo scaricamento dei metadati dei pacchetti..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Selezione nulla"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware mancante"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Autenticazione necessaria"
+
+#~ msgid "column"
+#~ msgstr "colonna"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Tipo di partizione:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Nome utente</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Password</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Il mount point non è valido. Provare qualcos'altro?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etichetta:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>File System:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispositivo RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Configura il punto di mount selezionato."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Cliccare per ottenere aiuto"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">SPAZIO DISPONIBILE</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">SPAZIO COMPLESSIVO</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Completato"
 
@@ -4471,42 +6517,9 @@ msgstr "Chiudi"
 #~ msgid "Install on System"
 #~ msgstr "Installazione sul sistema"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Il seguente errore è occorso mentre veniva impostato il repository di "
-#~ "installazione:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "L'installazione non può continuare. "
-
 #~ msgid "Exit installer"
 #~ msgstr "Esci dal programma di installazione"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "L'installazione è stata interrotta da quello che sembra essere un "
-#~ "problema hardware. Il messaggio d'errore è:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "Il programma di installazione verrà ora terminato."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Riscontrato errore hardware"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Esci dal programma d'installazione"
 
@@ -4811,9 +6824,6 @@ msgstr "Chiudi"
 #~ msgid "Software Development"
 #~ msgstr "Sviluppo software"
 
-#~ msgid "Web Server"
-#~ msgstr "Web server"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimale"
 
@@ -4859,50 +6869,6 @@ msgstr "Chiudi"
 #~ "logiche che non possono essere eliminate:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Non è stata definita alcuna partizione root (/), che è necessaria per "
-#~ "continuare l'installazione di %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "La capacità della partizione root è inferiore a 250 megabyte che "
-#~ "solitamente è troppo piccola per installare %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Questa piattaforma richiede /boot su una partizione dedicata o un volume "
-#~ "logico.  Se non si desidera un volume /boot, è possibile posizionare / su "
-#~ "una partizione non-LVM dedicata."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "La partizione %(mount)s è meno di %(size)s megabyte che è più bassa del "
-#~ "valore consigliato per una normale installazione di %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "La partizione %(mount)s è troppo piccola per formattare %(format)s (la "
-#~ "dimensione permessa è da %(minSize)d MB a %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "La partizione %(mount)s è troppo grande per formattare %(format)s (la "
-#~ "dimensione permessa è da %(minSize)d MB a %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4920,57 +6886,6 @@ msgstr "Chiudi"
 #~ msgstr ""
 #~ "non è stato creato un dispositivo di destinazione stage1 del bootloader"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Non è stata creata una partizione avviabile."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Questo sistema basato su BIOS necessita di una speciale partizione per "
-#~ "avviarsi con il nuovo formato di etichettatura del disco %s (GPT) . Per "
-#~ "continuare, creare una partizione di tipo 'BIOS Boot' da 1MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Non è stata definita una partizione di swap.  %(requiredMem)s MB di "
-#~ "memoria sono richiesti per proseguire l'installazione senza una "
-#~ "partizione di swap, ma sono disponibili solo %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Non è stata specificata alcuna partizione swap. Benché non strettamente "
-#~ "necessaria in tutti i casi, la partizione migliora significativamente le "
-#~ "prestazioni della maggior parte delle installazioni."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Almeno uno dei dispositivi di swap non ha un UUID, cosa comune negli "
-#~ "spazi swap creati usando vecchie versioni di mkswap. Questi dispositivi "
-#~ "saranno indicati con il loro percorso in /etc/fstab, cosa non ideale "
-#~ "visto che tali percorsi possono variare in diverse circostanze."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Questo mount point non è valido. La directory %s deve trovarsi sul "
-#~ "filesystem / ."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Il mount point %s deve trovarsi su di un filesystem linux."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux su %s"
 
@@ -4980,11 +6895,6 @@ msgstr "Chiudi"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s per %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formattazione dispositivo DASD"
-#~ msgstr[1] "Formattazione dispositivi DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Preparazione dispositivo DASD %d da usare con Linux..."
@@ -5268,9 +7178,6 @@ msgstr "Chiudi"
 #~ msgid "Error setting root password"
 #~ msgstr "Si è verificato un errore impostando la password di root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "E' necessario fornire e confermare una password."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Rimuovi pacchetti"
 
@@ -5304,24 +7211,12 @@ msgstr "Chiudi"
 #~ msgid "%s of %s"
 #~ msgstr "%s di %s"
 
-#~ msgid "Region:"
-#~ msgstr "Regione:"
-
-#~ msgid "City:"
-#~ msgstr "Città:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-ore"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Scegliere gli add-ons"
 
@@ -5410,9 +7305,6 @@ msgstr "Chiudi"
 #~ msgid "configureButton"
 #~ msgstr "configuraBottone"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Termina partizionamento"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "CONFIGURA GRUPPO DI VOLUMI"
 
diff --git a/anaconda/po/ja.po b/anaconda/po/ja.po
index b986657..a90fae0 100644
--- a/anaconda/po/ja.po
+++ b/anaconda/po/ja.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
@@ -35,18 +35,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ファイルシステム"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "'%s' を含む RAID セットは、次の RAID レベルのいずれかが必要です: %s"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -54,199 +54,470 @@ msgid ""
 msgstr ""
 "'%s' を含む RAID セットは、次のメタデータのバージョンのいずれかが必要です: %s"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "'%s' を含む RAID セットは、次のデバイスタイプのいずれかが必要です: %s"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s は次のディスクラベルのタイプのいずれかが必要です: %s"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s は %s タイプにすることはできません。"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s を %s の１つにマウントする必要があります。"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s のサイズは %d MB から %d MB の間でなければなりません。"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s のサイズは %d MB 以下でなければなりません。"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s のサイズは %d MB 以上でなければなりません。"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s はディスクの先頭から %dMB 以内の位置に配置しなければなりません。"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s はプライマリパーティション上になければなりません。"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s は暗号化ブロックデバイス上に置くことができません。"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s は %s タイプにすることはできません。"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%3s 上の %2s ファイルシステムを使用している場合、 grub2によって組み込まれる "
 "core.img 用の領域が %1s には不足している可能性があります。"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC を起動する"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "テキストモードを使用する"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "パスワードは設定されています"
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "パスワードが一致しません！"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "脆弱なパスワードです: %s　それでも使用する場合は完了を押します。"
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "脆弱なパスワードです: %s　それでも使用する場合は完了を押します。"
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "脆弱"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "普通"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "良好"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "強力"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "はい(_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "いいえ(_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"インストールリポジトリーを設定中に次のエラーが発生しました。\n"
+"\n"
+"%(e)s\n"
+"\n"
+"インストール作業を継続できません。"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"インストールリポジトリーを設定中に次のエラーが発生しました。\n"
+"\n"
+"%(e)s\n"
+"\n"
+"インストール作業を継続できません。"
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"インストール用にマークしてある以下のソフトウェアにエラーがあります。これはイ"
+"ンストールソースが持つエラーが原因であるようです。これらのパッケージをインス"
+"トールから除外するか、インストールソースを変えるか、またはインストーラーを終"
+"了することができます。"
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"インストール作業はハードウェアに問題があると思われる症状が発生したため停止さ"
+"れました。正確なエラーメッセージは次のとおりです：\n"
+"\n"
+"%s\n"
+"\n"
+" インストーラーを終了します。"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"インストール作業はハードウェアに問題があると思われる症状が発生したため停止さ"
+"れました。正確なエラーメッセージは次のとおりです：\n"
+"\n"
+"%s\n"
+"\n"
+" インストーラーを終了します。"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "ハードウェアエラーが発生しました。"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"インストール作業はハードウェアに問題があると思われる症状が発生したため停止さ"
+"れました。正確なエラーメッセージは次のとおりです：\n"
+"\n"
+"%s\n"
+"\n"
+" インストーラーを終了します。"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "インストール済みのシステムを構成"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "ネットワーク構成を書き込み中"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "ユーザーを作成中"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "インストール済みのシステムを構成"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "インストール前スクリプトを実行中"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "インストールソースをセットアップ中..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "ブートローダーをインストール中"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "インストール後設定タスクを実行中"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "ブートローダーをインストール中"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "エスクロー証明書 %s にはネットワークが必要です。"
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -258,32 +529,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s が足りません。 ファイアーウォールの設定ができません。"
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s が足りません。 ファイアーウォールの設定ができません。"
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "このファイルシステムはラベルをサポートしません。"
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "指定された名前 %s はすでに存在します。"
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "ボリュームグループ名 %s はすでに使われています。変更は保存されません。"
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "インストール前スクリプトを実行中"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "ホスト名なし、または空白の文字は設定できません。"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ホスト名は 255 文字かそれ以下の長さにする必要があります。"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"ホスト名は 「a-z」 または 「A-Z」または 「0-9」 の範囲の有効な文字で開始しな"
-"ければ なりません。"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -293,55 +854,55 @@ msgstr ""
 "ができます。ただし、ピリオドは文字列の途中に使用しなければいけません。また、"
 "ホスト名の先頭と終わりには '-' は使用できません。"
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "不明"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "接続中..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "切断中..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "有線 (%s) は接続されています"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "%s にワイヤレスで接続しています"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "接続していません"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "ネットワークデバイスは利用できません"
 
@@ -350,7 +911,12 @@ msgstr "ネットワークデバイスは利用できません"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s インストール"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "新しい %s %s のインストール"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -365,8 +931,8 @@ msgstr "完了したらシェルを終了してください。システムが再
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "実行するための /bin/sh が見付かりません。シェルを 開始していません。"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "レスキュー"
 
@@ -412,21 +978,15 @@ msgstr "レスキュー対象システム"
 msgid "Which device holds the root partition of your installation?"
 msgstr "どのデバイスにインストールの root パーティションを置きますか？"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "終了"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "シェルを終了するとシステムは自動的に再起動します。"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -436,7 +996,7 @@ msgstr ""
 "す。<enter> を押すとシェルが起動され、ファイルシステムの検証(fsck)や パーティ"
 "ションのマウント(mount)を行うことができます。 %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -457,7 +1017,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -470,29 +1030,243 @@ msgstr ""
 "\n"
 "シェルを起動するには [Enter] を押してください。"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Linux パーティションがありません。再起動します。\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " シェルを終了するとシステムは自動的に再起動します。"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "レスキューモード"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Linux パーティションがありません。<enter>キーを押すとシェルを起動します。%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "システムは %s ディレクトリー配下にマウントされます。"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "標準パーティション"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "Btrfs"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "ディスク"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"ご使用のコンピューターの 'swap' 領域は、メモリー不足の状態になると\n"
+"オペレーティングシステムで使用されます。"
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"ご使用のコンピューターの 'boot' 領域は、オペレーティング\n"
+"システムの開始に必要なファイルを収納しています。"
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"ご使用のコンピューターの 'root' 領域は、コアシステムファイルと\n"
+"アプリKションを収納しています。"
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"ご使用のコンピューターの 'home' 領域は、ユーザーの個人\n"
+"データを収納しています。"
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS ハードウェア上で GPT パーティション設定したディスク からの起動を有効にす"
+"るには、BIOS のブートパーティションが必要です。"
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"数種の PPC プラットフォーム上のブートローダー設定の一部 としてPReP ブートパー"
+"ティションが必要です。"
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"root パーティションが 250 MB 以下になっています。通常、 %s のインストールには"
+"小さすぎます。"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"%s のインストールを継続するために必要な root パーティション (/) が定義されて"
+"いません。"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"お使いのプラットフォームでは専用のパーティションまたは論理ボリューム上に /"
+"boot を配置する必要があります。あなたが /boot ボリュームを作りたくない場合"
+"は、非 LVM 上の専用パーティションに / を配置しなければなりません。"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s パーティションの容量が %(size)s MB以下であり、通常の "
+"%(productName)s のインストールでの 推奨容量には不足しています。"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"このシステムの %(mount)s パーティションは %(format)s フォーマットには小さすぎ"
+"ます。 (指定可能なサイズは %(minSize)d MB から %(maxSize)d MB となっています)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"このシステムの %(mount)s パーティションは %(format)s フォーマットには大きすぎ"
+"ます。 (指定可能なサイズは %(minSize)d MB から %(maxSize)d MB となっています)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "新規デバイスの追加に失敗しました。詳細にはクリックして下さい。"
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "ブート可能なパーティションが作成されていません。"
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"ご使用の BIOS ベースのシステムは %s の新規ディスクラベル形式 (GPT) で起動する"
+"には、特別なパーティションが必要です。継続するには、1MB の  'BIOS ブート' タ"
+"イプのパーティションを作成してください。"
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"swap パーティションが未指定です。swap パーティションなしでのインストール作業"
+"の継続には %(requiredMem)s のメモリーが必要となっています。しかし、お使いのシ"
+"ステムには %(installedMem)s MB しか搭載されていません。"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"swap パーティションが未指定です。すべての場合において必ず必要というわけではあ"
+"りませんが、ほとんどのインストールにおいて明らかに性能を向上させます。"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"swap デバイスの少なくとも1つは UUID を持っていなければなりません。これは旧"
+"バージョンの mkswap コマンドを使用して作成した swap 領域ではよくあります。こ"
+"れらのデバイスは /etc/fstab のデバイスパスによって参照されます。デバイスパス"
+"による参照はさまざまな状況により変更されてしまうため理想的な方法ではありませ"
+"ん。"
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"このマウントポイントは正しくありません。%s ディレクトリーは / ファイルシステ"
+"ム上になければなりません。"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "マウントポイント %s は linux ファイルシステム上にある必要があります。"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "パスフレーズ:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -602,53 +1376,138 @@ msgstr ""
 "不明なエラーが発生しました。作業を中断します。\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "入力された VNC パスワードは最低限の 6文字に足りません。\n"
 "新しいパスワードを入力して下さい。パスワード不要なら空白にします。"
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "Fedora(_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "インストールソースの設定に失敗しました"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "パッケージメタデータをダウンロード中にエラー..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "インストールソースは利用できません"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "ソフトウェアのインストール中…"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "パッケージインストールプロセスを開始しています"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "以下のファイルシステムは容量を増やす必要があります。\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "インストールソースからのトランザクションを準備中。"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "インストール中"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "パッケージのメタデータをダウンロード中..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "インストール中"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "インストールの準備中"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "ストレージ設定をチェック中..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "デフォルトのタイトル"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "地域設定"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "地域設定"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "ソフトウェア"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "システム"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "ユーザーの設定"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -657,34 +1516,100 @@ msgstr ""
 "現在選択しているソフトウェア選択に対してファイルシステムの空き領域が不足して"
 "います。追加で %s 必要です。"
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "インストールハブ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "自動インストールの開始"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "コマンドラインモードでは質問は置けません!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "上記の ['q' 終了 | 'c' 継続] から選択して下さい:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "すべてのスポークを完了してから継続して下さい。"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "デフォルトのハブタイトル"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "すべてのスポークを完了してから継続して下さい。"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "エラー"
 
@@ -708,32 +1633,35 @@ msgstr "はい"
 msgid "no"
 msgstr "いいえ"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "本当に終了しますか？"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "上記の ['q' 終了 | 'c' 継続] から選択して下さい:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -748,219 +1676,258 @@ msgstr ""
 "らこのコンピューターに接続しグラフィカルインストールを行ないますか、あるいは"
 "テキストモードのインストールで続行しますか?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC パスワード"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "VNC パスワードを記入してください。2度記入して下さい。\n"
 "パスワード不要なら空白にします。"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "パスワード: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "パスワード(確定): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "パスワードが一致しません！"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "パスワードは最低 6 文字以上でなければなりません。"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "パスワードは最低 6 文字以上でなければなりません。"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "タイムゾーンの設定"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "タイムゾーンは設定されていません"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "使用できる地域"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "使用できる地域"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "ネットワーク構成を書き込み中"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "有線 (%s) は接続されています"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "有線 (%s) は接続されています"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "ホスト名:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "ホスト名"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "ホスト名"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "ホスト名は無効です: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "設定完了(_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "ゲートウェイ"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ファイルシステム設定にタイプがありません。"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "インストール済みのシステムを構成"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "root パスワード:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "パスワードは設定されています"
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "root アカウントは無効になっています"
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "パスワードが設定されていません"
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "新しい root パスワードを選択して下さい。２度記入する必要があります。"
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "パスワード: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "すべての領域を使用する"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "既存の Linux システムを入れ替える"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "空き領域を使用する"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "インストール先"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "ディスクが選択されていません"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "ストレージ設定のチェック中にエラー"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "ストレージ設定のチェック中にエラー"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "自動パーティション設定が選択されました"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "カスタムパーティション設定が選択されました"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -968,40 +1935,62 @@ msgstr ""
 "ディスク検出がありません。コンピュータをシャットダウンして最低１個のディスク"
 "に接続し、再開始するとインストールが完了できます。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "ディスクが選択されていません。インストール先として少なくともディスクを１つ選"
 "択して下さい。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "ストレージを捜索中..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "選択(_S)"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "更新したストレージ設定を生成中"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "ストレージの設定に失敗しました: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "ストレージ設定をチェック中..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "自動パーティション設定のオプション"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1010,41 +1999,41 @@ msgstr ""
 "インストールにはハードドライブのパーティション設定が必要です。インストール先"
 "として使用する領域を選択して下さい。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "パーティションスキーマの設定"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "パーティションスキーマの設定"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "タイムゾーンの設定"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s タイムゾーン"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "タイムゾーンは設定されていません"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "地域 %s で使用できるタイムゾーン"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "使用できる地域"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1053,179 +2042,197 @@ msgstr ""
 "番号かタイプ名を直接選択して下さい\n"
 "[b で地域一覧、q で終了]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC を起動する"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "インストールの進捗"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "最寄りのミラー"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS サーバー %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "ソフトウェアソースの設定でエラー"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "何も選択されていません"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "接続中..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD ドライブ"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO ファイル(_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "ネットワーク時刻同期"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "インストールソースは利用できません"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "インストールソースの設定に失敗しました"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "パッケージメタデータをダウンロード中にエラー..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "インストールソースは利用できません"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS サーバー %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS マウントオプション:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "インストールソースの設定に失敗しました。レポジトリの url を確認して下さい"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot を含むデバイス"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "インストールソースの設定に失敗しました"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "ソフトウェアの選択を修正(_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "ソフトウェアの選択をチェック中にエラー"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "インストールソースはセットされていません"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "ソースが変更されました - ご確認ください"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "カスタムソフトウェアが選択されています"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "インストールソースはセットされていません"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "使用環境を選択します"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "認証の使用(_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "パスワードを入力してから確認を行ってください。"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "警告"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1241,112 +2248,100 @@ msgstr "進行中"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "» インストールは完了しました。改行ボタンを押して終了します"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "デフォルトのスポークタイトル"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "状態をテスト中..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "新しいデバイス"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "パスワード(確定): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "脆弱なパスワードです: %s　それでも使用する場合は完了を押します。"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "脆弱なパスワードです: %s　それでも使用する場合は完了を押します。"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "パスワードは設定されています"
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "インストーラーを終了する(_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "ヘルプ"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "終了する (_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "いいえ(_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "はい(_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "デフォルトのタイトル"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "地域設定"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "地域設定"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "ソフトウェア"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "システム"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "ユーザーの設定"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "このアイコンが付いた項目を完了してから、次のステップへと続けて下さい。"
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "完了しました!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1355,168 +2350,66 @@ msgstr ""
 "%s は、ここでご使用のシステムに正常にインストールされ、\n"
 "使用準備ができました。次に進むために再起動して使用を開始して下さい！"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "完了しました!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "終了する (_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "新しい %s %s のインストール"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s は今ご使用のシステムに正常にインストールされましたが、まだいくつかの設定が"
+"必要です。\n"
+"それを終了してから「設定の完了」ボタンをクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s は、ここでご使用のシステムに正常にインストールされ、\n"
+"使用準備ができました。次に進むために再起動して使用を開始して下さい！"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "新規ボリュームグループを作成中 ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "デバイスの設定が失敗しました。詳細にはクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"ボリュームグループ名を決めて作成し、以下から少なくても1つのディスクを選択して"
-"ください。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "ボリュームグループ:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "列"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "復元不可能なエラーによりストレージ設定がリセットされました。詳細にはクリック"
 "して下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "デバイスの設定が失敗しました。詳細にはクリックして下さい。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "有効なマウントポイントを記入して下さい"
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "そのマウントポイントは無効です。他を試しますか?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "そのマウントポイントはすでに使用中です。他を試しますか?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"選択した RAID レベルには現在選択している領域より大きな領域が必要になります。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "有効なマウントポイントを記入して下さい"
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "そのマウントポイントは無効です。他を試しますか?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "標準パーティション"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "Btrfs"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "ディスク"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "なし"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s root にある他のファイルシステムもすべて削除されます。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "%s にある全データを本当に削除してもよいですか?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "%s にある全データを本当に削除してもよいですか?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "手作業のパーティション設定"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d 個のストレージデバイスが選択されています"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1525,132 +2418,112 @@ msgstr ""
 "%s %s インストール用のマウントポイントを作成する際に、\n"
 "ここでその詳細を表示できます。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"ご使用のコンピューターの 'swap' 領域は、メモリー不足の状態になると\n"
-"オペレーティングシステムで使用されます。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"ご使用のコンピューターの 'boot' 領域は、オペレーティング\n"
-"システムの開始に必要なファイルを収納しています。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"ご使用のコンピューターの 'root' 領域は、コアシステムファイルと\n"
-"アプリKションを収納しています。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"ご使用のコンピューターの 'home' 領域は、ユーザーの個人\n"
-"データを収納しています。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS ハードウェア上で GPT パーティション設定したディスク からの起動を有効にす"
-"るには、BIOS のブートパーティションが必要です。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"数種の PPC プラットフォーム上のブートローダー設定の一部 としてPReP ブートパー"
-"ティションが必要です。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi は タイプ %s のデバイス上でなければなりません"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s はタイプ %s のデバイス上でなければなりません"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s は暗号化できません"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "新しいファイルシステムは root デバイス上に作成する必要があります。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "タイプ %s のデバイスには有効な RAID レベルを選択する必要があります。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "デバイスのサイズ変更要求は失敗しました。詳細にはクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "デバイスの再フォーマット要求は失敗しました。詳細にはクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "指定された名前 %s はすでに存在します。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "このファイルシステムはラベルをサポートしません。"
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "ディスクが選択されていません"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "このファイルシステムはサイズ変更できません。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "ストレージ設定のチェックでエラー発生。クリックして詳細を見ます。"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "ストレージ設定のチェックでエラー発生。クリックして詳細を見ます。"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "新しい %s をすでに存在するコンテナー %s へ追加しました。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "新規デバイスの追加に失敗しました。詳細にはクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "無効なパーティション容量が設定されました。有効な範囲の整数を使用してくださ"
 "い。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "デバイスの除去要求は失敗しました。詳細にはクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "ボリュームグループ名 %s はすでに使われています。変更は保存されません。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs free"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1659,7 +2532,7 @@ msgstr ""
 "ソフトウェアRAIDアレイの %d / %d のメンバーパーティションが見つかりません。削"
 "除するか他のデバイスを選択してください。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1668,196 +2541,144 @@ msgstr ""
 "LVM ボリュームグループの %d / %d の物理ボリュームが見つかりません。削除するか"
 "他のデバイスを選択してください。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "ディスクが選択されていません。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "選択したディスクには十分な空き領域がありません。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "自動パーティション設定は失敗しました。詳細にはクリックして下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "ソフトウェアの選択を修正(_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "暗号化されたブロックデバイスのアンロックに失敗しました。詳細にはクリックして"
 "下さい。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "日付と時刻"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "無効なタイムゾーン"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "NTP を使用する場合は、ネットワークを最初に設定する必要があります。"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "稼働できる NTP サーバーの設定がありません。"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "インストール先"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d 個のストレージデバイスが選択されています"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s レイアウトの切り替え"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "キーボード"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "レイアウト設定のテストは出来ません。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "状態をテスト中..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "レイアウトの切り替えは設定されていません。"
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "言語"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "状態は不明です (情報欠如)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "状態は不明です"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "管理されていません"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "利用できません"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "ファームウェアがありません"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "ケーブルが外れています"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "利用できません"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "切断されています"
@@ -1882,200 +2703,247 @@ msgstr "切断しています"
 msgid "Connection failed"
 msgstr "接続に失敗しました"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "外れています"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "イーサネット"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "ワイヤーレス"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "外れています"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 アドレス"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 アドレス"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP アドレス"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "企業"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "なし"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "認証が必要です"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "パスワード: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "ネットワーク設定"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "root パスワード"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "パスワードは設定されています"
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "root パスワードは設定されています"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "root アカウントは無効になっています"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "root パスワードが設定されていません"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "ソフトウェアの選択"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "ソフトウェアの依存関係をチェック中..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "ソフトウェアの依存関係をチェック中にエラー"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "パッケージのメタデータをダウンロード中..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "グループメタデータをダウンロード中"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "ソフトウェアの依存関係をチェック中..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "ソフトウェアの依存関係をチェック中にエラー"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "ソフトウェアの依存関係のチェック中にエラー。クリックして詳細をみます。"
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "インストール用にマークしてある以下のソフトウェアにエラーがあります。これはイ"
 "ンストールソースが持つエラーが原因であるようです。これらのパッケージをインス"
 "トールから除外するか、インストールソースを変えるか、またはインストーラーを終"
 "了することができます。"
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "取り消し(_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "終了する (_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "ソフトウェア提供元を修正(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "ソフトウェアの選択を修正(_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "インストールソースをセットアップ中..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "パッケージメタデータをダウンロード中にエラー..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "認証が必要です"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "このメディアは以下からのインストールに適切です。"
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "このメディアは以下からのインストールに不適切です。"
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "インストールソース"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "インストールソースの設定に失敗しました。レポジトリの url を確認して下さい"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "リポジトリーの設定中にエラー"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "ソフトウェアソースの設定でエラー"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2083,98 +2951,80 @@ msgstr ""
 "インストールソースの設定に失敗しました。レポジトリの url とプロキシの設定を確"
 "認して下さい"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "リポジトリーの設定中にエラー"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "ソフトウェアソースの設定でエラー"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "デバイス:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS サーバー %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "無効なタイムゾーン"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "無効なタイムゾーン"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "無効なタイムゾーン"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "少々お待ち下さい... ソフトウェアのメタデータがまだロード中です。"
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "選択したディスクには、以下の容量の空き領域があります:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "少々お待ち下さい... ソフトウェアのメタデータがまだロード中です。"
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2184,7 +3034,7 @@ msgstr ""
 "<b>%s をインストールするには利用可能領域が足りませんが、</b>既存パーティショ"
 "ンを縮小したり、削除したりして領域を取り戻すことができます。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2194,7 +3044,7 @@ msgstr ""
 "選択したディスクで利用できるすべての空き領域を使用しても、<b>%s</b> のインス"
 "トールには十分な領域がありません。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2207,41 +3057,48 @@ msgstr ""
 "小さいバージョンの <b>%s</b> をインストールするためにソフトウェア選択を修正す"
 "るか、またはインストーラーを終了することができます。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "インストール先"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "ストレージ設定を保存しています..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "ストレージ設定の保存に失敗しました..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD デバイスをフォーマット中..."
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "ストレージ設定のチェックでエラー発生。クリックして詳細を見ます。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "ストレージ設定のチェックでエラー発生。クリックして詳細を見ます。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs free"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "選択されたディスク数 %d; 容量 %s; 空き領域 %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2249,7 +3106,11 @@ msgstr ""
 "ブートローダーのインストールを省略するよう選択しています。 システムが起動不可"
 "になる可能性があります。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2258,11 +3119,19 @@ msgstr ""
 "ストレージ設定をチェック中に以下のエラーに遭遇しました。ストレージレイアウト"
 "を変更するか、またはインストーラーを終了することが出来ます。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "終了する (_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "ストレージの構成変更(_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2272,76 +3141,80 @@ msgstr ""
 "ストレージ設定をチェック中に以下のエラーに遭遇しました。ストレージレイアウト"
 "を変更するか、またはインストーラーを終了することが出来ます。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "ユーザーの設定"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "無効なタイムゾーン"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s へようこそ。"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "データ"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "%s %s インストール用のマウントポイントをまだ選択していません:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "ここをクリックすると自動的に作成します。"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "あるいは、'+' アイコンで以下に新規のマウントポイントを作成します。"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2353,55 +3226,162 @@ msgstr[0] ""
 "<b>ディスク数 %d; 容量%s ; 空き領域 %s</b> (パーティション未設定でファイルシ"
 "ステム内)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "ブートローダーをインストールしない(_D)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "起動デバイスとして設定(_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"選択した RAID レベルには現在選択している領域より大きな領域が必要になります。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"ボリュームグループ名を決めて作成し、以下から少なくても1つのディスクを選択して"
+"ください。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "ボリュームグループ:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "列"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "マウントポイント %s は linux ファイルシステム上にある必要があります。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "そのマウントポイントはすでに使用中です。他を試しますか?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "有効なマウントポイントを記入して下さい"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "そのマウントポイントは無効です。他を試しますか?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s root にある他のファイルシステムもすべて削除されます。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "%s にある全データを本当に削除してもよいですか?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "%s にある全データを本当に削除してもよいですか?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "無効なタイムゾーン"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "終了する (_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "脆弱なパスフレーズを記入しています: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "パスフレーズが一致しません。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "保存"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "縮小"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "削除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "インストールソースが含まれているデバイス"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s 上に %(type)s を作成"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "準備できていません"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "空き領域を使用する"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2415,367 +3395,776 @@ msgstr ""
 "ファイルシステムを削除するとそこに収納してあるすべてのデータを永久に喪失しま"
 "す。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] "<b>%s 個のディスク; %s つの獲得可能領域</b> (ファイルシステム内) "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "選択した獲得する領域合計: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "削除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "保存"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "ディストリビューションのインストール"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "スポーク名"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "プレリリース / テスト中"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "新しいデバイス"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "新しいセレクター"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "完了(_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "続行(_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "変更を適用(_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "ネットワーク設定"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "グループ名"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "日付と時刻"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "NTP サーバーの使用法を追加してマークする"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web サーバー"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "稼働中"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "使用"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "設定する(_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "日付と時刻"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "地域:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "地域:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "都市:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "都市:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ネットワーク名(_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ネットワーク名"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 時間"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "インストール先"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "容量"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "接続していません"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "選択したデバイス"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "何も選択されていません"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>ラベル:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "ファームウェアがありません"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "いいえ(_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN タイプ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "選択したデバイス"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "要約"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID デバイス"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "デフォルトルート"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "サブネットマスク"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "速度"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "ハードウェアアドレス"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "設定する(_O) ..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "セキュリティ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ネットワーク名(_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "ネットワーク名"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "セキュリティキー"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "ホットスポットとして使用する(_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "ホットスポットを停止する(_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "設定する(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "プロバイダー"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "設定する(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN タイプ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "ゲートウェイ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "グループ名"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "グループパスワード"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ユーザー名"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "設定する(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "メソッド(_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "設定の URL(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP プロキシ(_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS プロキシ(_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP プロキシ(_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Socks ホスト(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "ネットワーク構成を書き込み中"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "ロックを解除する"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "航空機内モード(_P)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "ネットワーク構成を書き込み中"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ホスト名:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "ネットワーク設定"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2784,283 +4173,205 @@ msgstr ""
 "ユーザーの位置情報の取得およびソフトウェア更新を取得可能にするためネットワー"
 "クアクセスが必要です。"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "デフォルトルート"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "サブネットマスク"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "速度"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "ハードウェアアドレス"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "設定する(_O) ..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "セキュリティ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "ネットワーク名(_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "ネットワーク名"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "セキュリティキー"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "ホットスポットとして使用する(_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "ホットスポットを停止する(_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "設定する(_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "プロバイダー"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN タイプ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "ゲートウェイ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "グループ名"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "グループパスワード"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ユーザー名"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "メソッド(_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "設定の URL(_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP プロキシ(_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS プロキシ(_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP プロキシ(_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Socks ホスト(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "ロックを解除する"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "航空機内モード(_P)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "ホスト名:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "認証の使用(_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "認証が必要です"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "接続済みです"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "ソフトウェアの選択"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "使用環境を選択します"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "列"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "取り消して、もっとディスクを追加(_A)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "インストールオプション"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>パーティションタイプ:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "データを暗号化する。パスフレーズは後で設定。"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "カスタムパーティション設定が選択されました"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "領域を確保する(_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "インストールオプション"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "ここで、現在のソフトウェア選択に必要となる領域を説明します。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disk free"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "使用できる空き領域"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs free"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "現在利用できないものの、既存のパーティションから取り戻すことができる空き領域"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "ここで、ユーザーのオプションを説明します。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "空き領域を使用する"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "インストーラーを終了(_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "デバイスの説明"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "ローカルの標準ディスク"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "パーティション設定の終了(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "暗号化する(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "自動パーティション設定が選択されました"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "パーティション設定の終了(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "暗号化する(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "データを暗号化する。パスフレーズは後で設定。"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "自動パーティション設定のオプション"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "要約"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "完全なディスク要約とオプション... "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "キーボードレイアウトを追加"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "以下の表で選択してキーボードレイアウトを追加することができます"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "名前"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "キーボードのレイアウト"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3068,7 +4379,7 @@ msgstr ""
 "このシステムで使用するキーボードのレイアウトを選択してください。 いずれのレイ"
 "アウトでも一覧の先頭に移動させデフォルトとして選択することができます。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3077,116 +4388,198 @@ msgstr ""
 "トールプロセスのためにキーボードレイアウトを設定するには、デスクトップのツー"
 "ルを使用してください。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "名前"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "レイアウトの追加"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "レイアウトの削除"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "選択したレイアウトを上に移動"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "レイアウトの追加"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "レイアウトの削除"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "選択したレイアウトを上に移動"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "選択したレイアウトを下に移動"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "レイアウトのプレビュー"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "レイアウト設定のテストは出来ません。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift を使ってレイアウトを切り替えます"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "キーボードレイアウトを追加"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "以下の表で選択してキーボードレイアウトを追加することができます"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "名前"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "使用できる地域"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "レイアウトの追加"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "レイアウト切り替えのオプション"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "切り替えを行うキーボードレイアウトの組み合わせを選択してください。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "使用"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "詳細"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS マウントオプション:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "言語"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "何も選択されていません"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "root パスワード"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "root パスワード:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "確認:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC パスワード"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "root パスワードを設定する"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3194,237 +4587,285 @@ msgstr ""
 "システムの管理には root アカウントを使用します。 root ユーザーのパスワードを"
 "入力してください。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "完了(_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "メディアの確認"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "メディアを確認しています。お待ち下さい..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "追加(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP プロキシを有効にする(_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>プロキシの URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "認証の使用(_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>ユーザー名</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "ユーザー名"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>パスワード</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "パスワード: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "インストールソース"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "使用するインストールソースを選択してください。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "自動検出したインストールメディア(_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "デバイス:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>ラベル:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "確認する(_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO ファイル(_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "デバイス:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO を1つ選択(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "ネットワーク上(_N):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "プロキシの設定(_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "この URL はミラーリストを参照します。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS マウントオプション:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "このフィールドはオプションです。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora Peopleのレポジトリ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "新しいマウントポイントを追加します。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "追加(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "選択したマウントポイントを削除します。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "削除(_R)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "操作上のエラー"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "root パスワードを設定する"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "この URL はミラーリストを参照します。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "名前:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>プロキシの URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ユーザー名"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "パスワード: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "そのマウントポイントは無効です。他を試しますか?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "ここから脱出したい! (_G)"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "運命を受け入れます(_I)"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "これは不安定なプレリリースのソフトウェアです。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3435,204 +4876,264 @@ msgstr ""
 "かし、バグがあります。バグだらけです。共存すべきバグです。未来のこの OS は信"
 "頼できるほど安定していません。これはテスト目的のみのものです。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s へようこそ。"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "インストール時に使用する言語を選択してください。"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "終了する (_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "続行(_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ユーザー名"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "グループ名"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "パスワード: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC パスワード"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "マウントポイントの追加(_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>要望する容量:</b>"
+msgid "Add a new mount point."
+msgstr "新しいマウントポイントを追加します。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>マウントポイント:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "追加(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "新規のマウントポイントの追加"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"以下にマウントポイントを作成した後に、他のカスタム化オプションが利用できるよ"
-"うになります。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"そのマウントポイントはすでに使用中です。\n"
-"　他を試しますか？"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "例: \"20 GB\"、 \"500mb\" (引用符は除く)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "それを削除します(_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "保存(_S)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "マウントポイントの設定"
+msgid "Remove the selected mount point(s)."
+msgstr "選択したマウントポイントを削除します。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"ボリュームグループ名を決めて作成し、以下から少なくても1つのディスクを選択して"
-"ください。"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "削除(_R)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "空き"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID デバイス"
+msgid "Reload storage configuration from disk."
+msgstr "ストレージの設定に失敗しました: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "暗号化する(_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "選択したデバイス"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "デバイスの説明"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>マウントポイント:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>要望する容量:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>ラベル:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>デバイスタイプ:</b>"
+msgid "Device(s):"
+msgstr "デバイス:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>ファイルシステム:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "暗号化する(_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "再フォーマット"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "ボリュームグループ:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "変更 ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "名前:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>デバイスタイプ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "暗号化する(_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "ファイルシステム"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "再フォーマット"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "ボリュームグループ:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "変更 ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID デバイス"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3640,17 +5141,19 @@ msgstr ""
 "このデバイスは暗号化されているため有効なパスフレーズがないと読み込めません。"
 "以下でアンロックできます。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "パスフレーズ:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "アンロック(_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3658,295 +5161,572 @@ msgstr ""
 "このデバイスの直接編集はできません。 デバイスを削除するか別のデバイスを選択し"
 "ます。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "新しいマウントポイントを追加します。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "選択したマウントポイントを削除します。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "選択したマウントポイントの設定を行います。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "設定する(_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "ストレージの設定に失敗しました: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "ヘルプをクリックします"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "ヘルプ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">利用可能な領域</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">合計領域</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "選択(_S)"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "マウントポイントの設定"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "このデバイスを存在させるディスクをひとつまたは複数選択してください。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP アドレス"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI イニシエーター名を入力しなければなりません"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "認証の使用(_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ユーザー名"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC パスワード"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ユーザー名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC パスワード"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ユーザー名"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC パスワード"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "ネットワーク名"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "認証の使用(_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ユーザー名"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC パスワード"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ユーザー名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC パスワード"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "ユーザー名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC パスワード"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "接続に失敗しました"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "デバイス:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "選択したディスク"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "起動"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "説明"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "空き"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "ディスクの要約はここへ"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "それを削除します(_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "選択(_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "マウントポイントの設定"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "このデバイスを存在させるディスクをひとつまたは複数選択してください。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "マウントポイントの追加(_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>要望する容量:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>マウントポイント:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "新規のマウントポイントの追加"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"以下にマウントポイントを作成した後に、他のカスタム化オプションが利用できるよ"
+"うになります。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"そのマウントポイントはすでに使用中です。\n"
+"　他を試しますか？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "例: \"20 GB\"、 \"500mb\" (引用符は除く)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "マウントポイントの設定"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"ボリュームグループ名を決めて作成し、以下から少なくても1つのディスクを選択して"
+"ください。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "名前:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID デバイス"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "暗号化する(_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "有効なマウントポイントを記入して下さい"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD デバイスをフォーマット中..."
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "インストール中に不明なエラーが発生しました。詳細は以下にあります。"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ディスク暗号化用パスフレーズ"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "パスフレーズの保存"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ディスク暗号化用パスフレーズ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3955,7 +5735,19 @@ msgstr ""
 "データの一部を暗号化する選択をしました。コンピュータの開始時にデータへのアク"
 "セスに使用するパスフレーズを作成する必要があります。"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "パスフレーズ:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "確認:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3964,117 +5756,172 @@ msgstr ""
 "警告: 現在のキーボートレイアウトは <b>%s</b> です。キーボードのレイアウトを変"
 "更すると、インストールの後にディスクの復号が出来ないかもしれません。"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ディスク領域の獲得"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "取り消し(_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "領域を確保する(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ディスク領域の獲得"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "説明"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "ファイルシステム"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "獲得可能な領域"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "アクション"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "保存"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "削除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "縮小"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "カスタムパーティション設定が選択されました"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "変更を適用(_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "デバイス:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "マウントポイントの追加(_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "インストーラーを終了する(_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "いいえ(_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "はい(_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4082,51 +5929,50 @@ msgstr ""
 "インストールプロセスを本当に\n"
 "終了したいですか？"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "終了する (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "インストール概要"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "終了する (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "インストールの開始(_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "設定"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "インストールの準備中"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s は今ご使用のシステムに正常にインストールされましたが、まだいくつかの設定が"
-"必要です。\n"
-"それを終了してから「設定の完了」ボタンをクリックして下さい。"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "設定完了(_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s は、ここでご使用のシステムに正常にインストールされ、\n"
-"使用準備ができました。次に進むために再起動して使用を開始して下さい！"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "再起動(_R)"
 
@@ -4142,16 +5988,16 @@ msgstr "インストール"
 msgid "Install the live CD to your hard disk"
 msgstr "ライブ ディスク をハードディスクにインストール"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "ハードディスクへのインストールを開始します"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Fedora へようこそ"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4160,26 +6006,27 @@ msgstr ""
 "インストールするために %s は、最低 %s MB のメモリーを必要とします。お使いのシ"
 "ステムには %s MB しか搭載されていません。\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s のグラフィカルインストーラーは、最低 %s MB のメモリーを必要とします。お使"
 "いのシステムには %s MB のメモリーしか搭載されていません。"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "メモリーが足りません。"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4193,24 +6040,24 @@ msgstr ""
 "\n"
 "なお、この操作は root でのターミナルから実行します。"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " テキストモードを開始しています。"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "エラー"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY 変数がセットされていません。テキストモードで起動します。"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "グラフィカルインストールは使用できません。テキストモードを起動します。"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4221,20 +6068,20 @@ msgstr ""
 "ず、パーティション設定やパッケージ選択の指定が行えません。代わりに VNC モード"
 "を使用しますか？"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "ssh install@%s を実行して、インストールを始めて下さい。"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "ssh install@<host> を実行して、インストールを継続して下さい。"
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora を試す"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4244,7 +6091,7 @@ msgstr ""
 "今、Fedora をインストールできます。または後でアクティビティオーバービューで"
 "「ハードドライブにインストールする」を選択することもできます。"
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4252,10 +6099,94 @@ msgstr ""
 "後にでも「アクティビティオーバービュー」内で 「ハードドライブにインストール」"
 "を選択することができます。"
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "閉じる"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "ホスト名は 「a-z」 または 「A-Z」または 「0-9」 の範囲の有効な文字で開始し"
+#~ "なければ なりません。"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "以下のファイルシステムは容量を増やす必要があります。\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "コマンドラインモードでは質問は置けません!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "そのマウントポイントは無効です。他を試しますか?"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "ネットワーク設定"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "パッケージメタデータをダウンロード中にエラー..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "何も選択されていません"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "ファームウェアがありません"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "認証が必要です"
+
+#~ msgid "column"
+#~ msgstr "列"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>パーティションタイプ:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>プロキシの URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>ユーザー名</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>パスワード</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "そのマウントポイントは無効です。他を試しますか?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>ラベル:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>ファイルシステム:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID デバイス"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "選択したマウントポイントの設定を行います。"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "ヘルプをクリックします"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">利用可能な領域</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">合計領域</span>"
+
 #~ msgid "Completed"
 #~ msgstr "完了"
 
@@ -4307,41 +6238,9 @@ msgstr "閉じる"
 #~ msgid "Install on System"
 #~ msgstr "システム上にインストール"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "インストールリポジトリーを設定中に次のエラーが発生しました。\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "インストール作業を継続できません。"
-
 #~ msgid "Exit installer"
 #~ msgstr "インストーラーを終了する"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "インストール作業はハードウェアに問題があると思われる症状が発生したため停止"
-#~ "されました。正確なエラーメッセージは次のとおりです：\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ " インストーラーを終了します。"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "ハードウェアエラーが発生しました。"
-
 #~ msgid "_Exit installer"
 #~ msgstr "インストーラーを終了する(_E)"
 
@@ -4635,9 +6534,6 @@ msgstr "閉じる"
 #~ msgid "Software Development"
 #~ msgstr "ソフトウェア開発"
 
-#~ msgid "Web Server"
-#~ msgstr "Web サーバー"
-
 #~ msgid "Minimal"
 #~ msgstr "最小限"
 
@@ -4682,52 +6578,6 @@ msgstr "閉じる"
 #~ "除できません:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "%s のインストールを継続するために必要な root パーティション (/) が定義され"
-#~ "ていません。"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "root パーティションが 250 MB 以下になっています。通常、 %s のインストール"
-#~ "には小さすぎます。"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "お使いのプラットフォームでは専用のパーティションまたは論理ボリューム上に /"
-#~ "boot を配置する必要があります。あなたが /boot ボリュームを作りたくない場合"
-#~ "は、非 LVM 上の専用パーティションに / を配置しなければなりません。"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s パーティションの容量が %(size)s MB以下であり、通常の "
-#~ "%(productName)s のインストールでの 推奨容量には不足しています。"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "このシステムの %(mount)s パーティションは %(format)s フォーマットには小さ"
-#~ "すぎます。 (指定可能なサイズは %(minSize)d MB から %(maxSize)d MB となって"
-#~ "います)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "このシステムの %(mount)s パーティションは %(format)s フォーマットには大き"
-#~ "すぎます。 (指定可能なサイズは %(minSize)d MB から %(maxSize)d MB となって"
-#~ "います)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4745,58 +6595,6 @@ msgstr "閉じる"
 #~ msgstr ""
 #~ "対象のデバイスでブートローダーの stage1 を作成することができませんでした。"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "ブート可能なパーティションが作成されていません。"
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "ご使用の BIOS ベースのシステムは %s の新規ディスクラベル形式 (GPT) で起動"
-#~ "するには、特別なパーティションが必要です。継続するには、1MB の  'BIOS ブー"
-#~ "ト' タイプのパーティションを作成してください。"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "swap パーティションが未指定です。swap パーティションなしでのインストール作"
-#~ "業の継続には %(requiredMem)s のメモリーが必要となっています。しかし、お使"
-#~ "いのシステムには %(installedMem)s MB しか搭載されていません。"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "swap パーティションが未指定です。すべての場合において必ず必要というわけで"
-#~ "はありませんが、ほとんどのインストールにおいて明らかに性能を向上させます。"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "swap デバイスの少なくとも1つは UUID を持っていなければなりません。これは旧"
-#~ "バージョンの mkswap コマンドを使用して作成した swap 領域ではよくあります。"
-#~ "これらのデバイスは /etc/fstab のデバイスパスによって参照されます。デバイス"
-#~ "パスによる参照はさまざまな状況により変更されてしまうため理想的な方法ではあ"
-#~ "りません。"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "このマウントポイントは正しくありません。%s ディレクトリーは / ファイルシス"
-#~ "テム上になければなりません。"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "マウントポイント %s は linux ファイルシステム上にある必要があります。"
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s 上の Linux"
 
@@ -4806,10 +6604,6 @@ msgstr "閉じる"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s － %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD デバイスをフォーマット中..."
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linuxで使うために %d 個のDASDのデバイスを準備中..."
@@ -5067,9 +6861,6 @@ msgstr "閉じる"
 #~ msgid "Error setting root password"
 #~ msgstr "root パスワードの設定エラーです"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "パスワードを入力してから確認を行ってください。"
-
 #~ msgid "_Remove Packages"
 #~ msgstr "パッケージを削除 (_R)"
 
@@ -5092,24 +6883,12 @@ msgstr "閉じる"
 #~ msgid "%s of %s"
 #~ msgstr "%s のうち %s"
 
-#~ msgid "Region:"
-#~ msgstr "地域:"
-
-#~ msgid "City:"
-#~ msgstr "都市:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 時間"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "使用アドオンを選択します"
 
@@ -5198,9 +6977,6 @@ msgstr "閉じる"
 #~ msgid "configureButton"
 #~ msgstr "設定ボタン"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "パーティション設定の終了(_F)"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "構成するボリュームグループ"
 
diff --git a/anaconda/po/ka.po b/anaconda/po/ka.po
index f9334fe..d2074e0 100644
--- a/anaconda/po/ka.po
+++ b/anaconda/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/fedora/language/"
@@ -20,211 +20,447 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ფაილური სისტემა"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC-ის გაშვება"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "გამოიყენე ტექსტური რეჟიმი"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_დიახ"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_არა"
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "_კონფიგურაციის URL"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ჩადგმისწინა სცენარების გაშვება"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "ჩადგმის შემდგომი გამართვის დავალებების შესრულება"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -233,87 +469,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ჩადგმისწინა სცენარების გაშვება"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ჰოსტის სახელი უნდა შეიცავდეს 255 ან ნაკლებ სიმბოლოს."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"ჰოსტის სახელი უნდა დაიწყოს დასაშვები სიმბოლოებით, დიაპაზონებიდან 'a-z', 'A-"
-"Z', ან '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "უცნობი"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "არაა დაკავშირებული"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -322,7 +848,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -335,8 +866,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "შველა"
 
@@ -374,28 +905,22 @@ msgstr "საშველი სისტემა"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "გასვლა"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -408,7 +933,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -417,28 +942,199 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "მაშველი რეჟიმი"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr ""
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "თქვენ არ შეგიქმნიათ ჩატვირთვადი დანაყოფი."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -528,84 +1224,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "შეცდომა პაკეტის ჩადგმისას"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "ჩადგმა"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "შეცდომა პაკეტის ჩადგმისას"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ჩადგმა"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ჩადგმისთვის მომზადება"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "საცავის კონფიგურაციის შემოწმება..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "ნაგულისხმები სათაური"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "ლოკალიზაცია"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "ლოკალიზაცია"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "პროგრამული უზრუნველყოფა"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ჩადგმის შემდგომი პროცესი"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -629,31 +1472,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -664,459 +1509,532 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "პაროლი უნდა შეიცავდეს მინიმუმ ექვს სიმბოლოს."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "პაროლი უნდა შეიცავდეს მინიმუმ ექვს სიმბოლოს."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "საცავის კონფიგურაციის შემოწმება..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "მოწყობილობის აღწერა"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ჩადგმა იწყება"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "საცავის კონფიგურაციის შემოწმება..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "საცავის კონფიგურაციის შემოწმება..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "საცავის კონფიგურაციის შემოწმება..."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC-ის გაშვება"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ჩადგმის მიმდინარეობა"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "უახლოესი სარკე"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS სერვერი %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "შეცდომა პროგრამული უზრუნველყოფის წყაროს გამართვისას"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD ამძრავი"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO ფაილი:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "შეცდომა პაკეტის ჩადგმისას"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS სერვერი %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "მონტირების წერტილის დ_ამატება"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "მოწყობილობა, რომელიც შეიცავს /boot-ს"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "პროგრ. უზრუნველყოფის შემუშავება"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "გაფრთხილება"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1132,585 +2050,409 @@ msgstr "პროცესშია"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "ახალი მოწყობილობა"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "ჩადგმიდან გამო_სვლა"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_გამოსვლა"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_არა"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_დიახ"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "ნაგულისხმები სათაური"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "ლოკალიზაცია"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "ლოკალიზაცია"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "პროგრამული უზრუნველყოფა"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "დასრულებულია!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "დასრულებულია!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_გამოსვლა"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "სვეტი"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "არაა"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "საცავის კონფიგურაციის შემოწმება..."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "საცავის კონფიგურაციის შემოწმება..."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "პროგრ. უზრუნველყოფის შემუშავება"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "ჩადგმის ვარიანტები"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "მიუწვდომელი"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "მიუწვდომელი"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "გამოერთებული"
@@ -1735,283 +2477,309 @@ msgstr "გათიშვა"
 msgid "Connection failed"
 msgstr "დაკავშირება ვერ მოხერხდა"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "გამოერთებული"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "უსადენო"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "გამოერთებული"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 მისამართი"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 მისამართი"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP მისამართი"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d მბ/წმ"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "არაა"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "ავთენტიფიკაცია აუცილებელია"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "ქსელის კონფიგურაცია"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_შეწყვეტა"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_გამოსვლა"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "პროგრ. უზრუნველყოფის შემუშავება"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "ავთენტიფიკაცია აუცილებელია"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ჩადგმის წყარო"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "შეცდომა რეპოზიტორიის გამართვისას"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "შეცდომა პროგრამული უზრუნველყოფის წყაროს გამართვისას"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "მოწყობიობა:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS სერვერი %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2019,14 +2787,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2035,129 +2803,152 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "ჩადგმის ვარიანტები"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD მოწყობილობების დაფორმატება"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "საცავის კონფიგურაციის შემოწმება..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_გამოსვლა"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "ქსელის კონფიგურაცია"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "მოგესალმებათ %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2167,1041 +2958,1578 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
+msgstr "არჩეული მოწყობილობა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "სვეტი"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_გამოსვლა"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "არაა მზად"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "_წაშალე"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
-msgstr ""
+msgstr "_წაშალე"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "ახალი მოწყობილობა"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 მბტ"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 გბტ"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_გაგრძელება"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "ქსელის კონფიგურაცია"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "ჯგუფის სახელი"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ვებ სერვერი"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "დადასტურება"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ქსელი მიუწვდომელია"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "გამოიყენე ტექსტური რეჟიმი"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "მოცულობა"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "არაა დაკავშირებული"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
-msgid "_Other SAN Devices"
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
+msgid "_Other SAN Devices"
+msgstr "არჩეული მოწყობილობა"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>მომხმარებლის სახელი</b>"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_არა"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "არჩეული მოწყობილობა"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID მოწყობილობა"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "დ_ამატება"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "დადასტურება"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ჯგუფის სახელი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "დადასტურება"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "დადასტურება"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "ჯგუფის სახელი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "მოხმარებლის სახელი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "დადასტურება"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_მეთოდი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_კონფიგურაციის URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP პროქსი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS პროქსი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP პროქსი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "საცავის კონფიგურაციის შემოწმება..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "განბლოკვა"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "საცავის კონფიგურაციის შემოწმება..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "მოხმარებლის სახელი"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "ქსელის კონფიგურაცია"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "ჯგუფის სახელი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "ჯგუფის პაროლი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "მოხმარებლის სახელი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_მეთოდი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_კონფიგურაციის URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP პროქსი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS პროქსი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP პროქსი"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "განბლოკვა"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "ავთენტიფიკაცია აუცილებელია"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "ავთენტიფიკაცია აუცილებელია"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "დაკავშირებული"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "სვეტი"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ჩადგმის ვარიანტები"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-#, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>ფაილური სისტემა:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "სისტემური EFI დანაყოფი "
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ჩადგმის ვარიანტები"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ჩადგმიდან გამოსვ_ლა"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "მოწყობილობის აღწერა"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "სისტემური EFI დანაყოფი "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "დაშიფრული"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "სისტემური EFI დანაყოფი "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "სახელი"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "სახელი"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "პაკეტების ამო_ღება"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "დ_ამატება"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "სახელი"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "მონტირების წერტილის დ_ამატება"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "არჩეული მოწყობილობა"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "დადასტურება"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "მატარებლის შემოწმება"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "მატარებელი მოწმდება, გთხოვთ დაიცადოთ..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "დ_ამატება"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
-msgid "_Enable HTTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:224
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Enable HTTP Proxy"
+msgstr "_HTTP პროქსი"
+
+#: pyanaconda/ui/gui/spokes/source.glade:300
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>პროქსის URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
-msgstr ""
+msgstr "ავთენტიფიკაცია აუცილებელია"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>მომხმარებლის სახელი</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "მოხმარებლის სახელი"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>პაროლი</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ჩადგმის წყარო"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "მოწყობიობა:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "შემო_წმება"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO ფაილი:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "მოწყობიობა:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO-ის არ_ჩევა"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxy-ის გამართვა..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "მონტირების წერტილის დ_ამატება"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "ეს ველი არასავალდებულოა."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "სტანდარტული YUM რეპოზიორია:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "დ_ამატება"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+#, fuzzy
+msgctxt "GUI|Software Source"
+msgid "_Remove"
+msgstr "პაკეტების ამო_ღება"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ოპერაციული შედომა"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ოპერაციული შედომა"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "სახელი"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>პროქსის URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "მოხმარებლის სახელი"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3209,661 +4537,1069 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "მოგესალმებათ %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_გამოსვლა"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_გაგრძელება"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "მოხმარებლის სახელი"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "ჯგუფის სახელი"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
 msgstr "მონტირების წერტილის დ_ამატება"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>მოწყობილობის ტიპი:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "დ_ამატება"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>მონტირების წერტილი:</b>"
+msgid "Reload storage configuration from disk."
+msgstr "საცავის კონფიგურაციის შემოწმება..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "მონტირების ახალი წერტილის დამატება"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_წაშალე"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "თავისუფალი"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
-#, fuzzy
-msgid "RAID Level:"
-msgstr "RAID მოწყობილობა"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "დაშიფრული"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "არჩეული მოწყობილობა"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "მოწყობილობის აღწერა"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
-msgstr "<b>მომხმარებლის სახელი</b>"
+msgid "Mount _Point:"
+msgstr "<b>მონტირების წერტილი:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:409
 #, fuzzy
-msgid "<b>Device _Type:</b>"
+msgid "_Desired Capacity:"
 msgstr "<b>მოწყობილობის ტიპი:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
+#: pyanaconda/ui/gui/spokes/custom.glade:461
 #, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>ფაილური სისტემა:</b>"
+msgid "_Label:"
+msgstr "<b>მომხმარებლის სახელი</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "მოწყობიობა:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "სახელი"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>მოწყობილობის ტიპი:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "დაშიფრული"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "<b>ფაილური სისტემა:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "სვეტი"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID მოწყობილობა"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
-msgstr ""
+msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
-msgstr ""
+msgstr "განბლოკვა"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "დადასტურება"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "საცავის კონფიგურაციის შემოწმება..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-"<span size=\"small\" foreground=\"white\">ხელმისაწვდომი მოცულობა</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP მისამართი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
-msgstr ""
+msgstr "ავთენტიფიკაცია აუცილებელია"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "მოხმარებლის სახელი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "მოხმარებლის სახელი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "მოხმარებლის სახელი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "ჯგუფის პაროლი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "ჯგუფის სახელი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "მოხმარებლის სახელი"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "მოხმარებლის სახელი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "მოხმარებლის სახელი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "დაკავშირება ვერ მოხერხდა"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "მოწყობიობა:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "თავისუფალი"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "პაკეტების ამო_ღება"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_წაშალე"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "არჩეული მოწყობილობა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "მონტირების წერტილის დ_ამატება"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>მოწყობილობის ტიპი:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>მონტირების წერტილი:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "მონტირების ახალი წერტილის დამატება"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "სახელი"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID მოწყობილობა"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "დაშიფრული"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD მოწყობილობების დაფორმატება"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "ჯგუფის პაროლი"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "დადასტურება"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_შეწყვეტა"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "_წაშალე"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "სისტემური EFI დანაყოფი "
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "მოწყობიობა:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "მონტირების წერტილის დ_ამატება"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "ჩადგმიდან გამო_სვლა"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_არა"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_დიახ"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_გამოსვლა"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_გამოსვლა"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ჩადგმის შემდგომი პროცესი"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ჩადგმისთვის მომზადება"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "მოწყობილობის აღწერა"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "გადა_ტვირთვა"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3877,16 +5613,16 @@ msgstr "ჩადგმა"
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3895,26 +5631,27 @@ msgstr ""
 "%s-ის ჩასადგმელად მოითხოვს %s მბტ მეხსიერებას, მაგრამ ამ მანქანაზე თქვენ "
 "გაქვთ მხოლოდ %s მბტ.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s-ის გრაფიკული ინსტალატორი მოითხოვს %s მბტ მეხსიერებას, მაგრამ თქვენ მხოლოდ "
 "%s მბტ გაქვთ."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "RAM არასაკმარისია"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3927,60 +5664,98 @@ msgstr ""
 "\n"
 "'/usr/bin/liveinst -T'"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "ტექსტური რეჟიმის გაშვება"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "შეცდომა"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ცვლადი არ არის გადმოცემული. იშვებს ტექსტური რეჟიმი."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "გრაფიკული ჩადგმა მიუწვდომელია. იშვებს ტექსტური რეჟიმი."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "ჰოსტის სახელი უნდა დაიწყოს დასაშვები სიმბოლოებით, დიაპაზონებიდან 'a-z', "
+#~ "'A-Z', ან '0-9'"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "ავთენტიფიკაცია აუცილებელია"
+
+#~ msgid "column"
+#~ msgstr "სვეტი"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>ფაილური სისტემა:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>პროქსის URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>მომხმარებლის სახელი</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>პაროლი</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID მოწყობილობა"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr ""
+#~ "<span size=\"small\" foreground=\"white\">ხელმისაწვდომი მოცულობა</span>"
+
 #~ msgid "Completed"
 #~ msgstr "დასრულებულია"
 
@@ -3997,9 +5772,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "პროგრამიდან გასვლა"
 
-#~ msgid "_Exit installer"
-#~ msgstr "ჩადგმიდან გამოსვ_ლა"
-
 #~ msgid "IP address is missing."
 #~ msgstr "IP მისამართი მითითებული არაა."
 
@@ -4047,12 +5819,6 @@ msgstr ""
 #~ msgid "cpio"
 #~ msgstr "cpio"
 
-#~ msgid "No Network Available"
-#~ msgstr "ქსელი მიუწვდომელია"
-
-#~ msgid "Re_boot"
-#~ msgstr "გადა_ტვირთვა"
-
 #~ msgid "_Retry"
 #~ msgstr "_კვლავ ცდა"
 
@@ -4101,22 +5867,12 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "გრაფიკული სამუშაო გარემო"
 
-#~ msgid "Web Server"
-#~ msgstr "ვებ სერვერი"
-
 #~ msgid "Minimal"
 #~ msgstr "მინიმალური"
 
 #~ msgid "This device is part of a RAID device."
 #~ msgstr "ეს მოწყობილობა არის RAID მოწყობილობის ნაწილი."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "თქვენ არ შეგიქმნიათ ჩატვირთვადი დანაყოფი."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD მოწყობილობების დაფორმატება"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD მოწყობილობების Linux-თან გამოყენებისთვის მომზადება..."
@@ -4130,9 +5886,6 @@ msgstr ""
 #~ msgid "No new iSCSI nodes discovered"
 #~ msgstr "ახალი iSCSI კვანძი არ არის ნაპოვნი"
 
-#~ msgid "_Remove Packages"
-#~ msgstr "პაკეტების ამო_ღება"
-
 #~ msgid "Repository"
 #~ msgstr "რეპოზიტორია"
 
diff --git a/anaconda/po/kk.po b/anaconda/po/kk.po
index 9161a3c..d890937 100644
--- a/anaconda/po/kk.po
+++ b/anaconda/po/kk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/fedora/language/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot файлдық жүйесі"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "'%s' кіретін RAID массивінің raid деңгейі келесіден біреу болуы тиіс: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -40,7 +40,7 @@ msgstr ""
 "'%s' кіретін RAID массивінің метаақпарат нұсқасы келесіден біреу болуы тиіс: "
 "%s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -48,108 +48,129 @@ msgid ""
 msgstr ""
 "'%s' кіретін RAID массивінің құрылғы түрі келесіден біреу болуы тиіс: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s диск белгісінің түрі келесіден біреу болуы тиіс: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s түрі %s болуы мүмкін емес."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s келесі тіркеу нүктелерінің біреуіне тіркелуі тиіс: %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s өлшемі %d және %d МБ арасында болуы тиіс"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s өлшемі %d МБ-тан аз болмауы тиіс."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s өлшемі %d МБ-тан үлкен болмауы тиіс."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s дисктің бірінші %d МБ ішінде жатуы тиіс."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s бірінішілік бөлімде орналасуы тиіс."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s шифрленген блоктық құрылғысында орналасуы мүмкін емес."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s түрі %s болуы мүмкін емес"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s ішінде grub2 өз core.img орнату үшін орны жеткіліксіз болуы мүмкін, %s "
 "файлдық жүйесін %s үшін қолданғанда"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC іске қосу"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Мәтіндік режимді қолдану"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Пароль орнатылды."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Парольдер өзара сәйкес келмейді!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Сіз көрсеткен пароль әлсіз: %s.  Сонда да оны қолдану үшін Дайын батырмасын "
 "басыңыз."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -157,87 +178,338 @@ msgstr ""
 "басыңыз."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Әлсіз"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Қалыпты"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Жақсы"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Күшті"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ОК"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Иә"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "Ж_оқ"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Келесі қате орнату репозиторийін іске қосу кезінде орын алды:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Орнатуды жалғастыру мүмкін емес."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Келесі қате орнату репозиторийін іске қосу кезінде орын алды:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Орнатуды жалғастыру мүмкін емес."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Орнату үшін белгіленген келесі бағд. қамтамада қателер бар. Бұл орнатудың "
+"қайнар\n"
+"көзіндегі қатеге ұқсайды. Бұл дестелерді орнату үшін белгілемеу, "
+"қолданылатын\n"
+"орнатудың қайнар көзін ауыстыру немесе орнатқыштан шығуға болады."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Орнату құрылғылық сияқты қате салдарынан тоқтатылды. Нақты қате "
+"хабарламасы:\n"
+"\n"
+"%s.\n"
+"\n"
+" Орнатқыш өз жұмысын аяқтайды."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Орнату құрылғылық сияқты қате салдарынан тоқтатылды. Нақты қате "
+"хабарламасы:\n"
+"\n"
+"%s.\n"
+"\n"
+" Орнатқыш өз жұмысын аяқтайды."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Құрылғылық қате кездесті"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Орнату құрылғылық сияқты қате салдарынан тоқтатылды. Нақты қате "
+"хабарламасы:\n"
+"\n"
+"%s.\n"
+"\n"
+" Орнатқыш өз жұмысын аяқтайды."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Орнатылған жүйені баптау"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Желі баптауларын жазу"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Пайдаланушыларды жасау"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Орнатылған жүйені баптау"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Орнату алдындағы скриптерді орындау"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Орнатудың қайнар көзін баптау..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Жүктеушіні орнату"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Орнатудан кейінгі тапсырмаларды орындау"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Жүктеушіні орнату"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "%s escrow сертификаты желіні талап етеді."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -249,31 +521,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s жоқ болып тұр. Файрволды баптау мүмкін емес."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s жоқ болып тұр. Файрволды баптау мүмкін емес."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Бұл файлдық жүйе белгіні қолдамайды."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Көрсетілген %s атауы қолдануда болып тұр."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "%s томдар тобының атауы қолдануда болып тұр. Өзгерістер сақталмайды."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Орнату алдындағы скриптерді орындау"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Хост аты None не бос жол болмауы тиіс."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Хост аты 255 не одан аз таңбадан тұруы тиіс."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Хост аты 'a-z', 'A-Z', не '0-9' аймақтарында жататын таңбадан басталуы тиіс"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -283,55 +846,55 @@ msgstr ""
 "нүктелер арасындағы бөліктерде бір нәрсе болуы тиіс және ол бөліктер '-' "
 "таңбасынан басталмауы тиіс."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Байланыс орнату..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Байланысты үзу..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "(%s) сымды желісі байланысқан"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Сымсыз желісіне байланысқан: %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Байланыспаған"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Қолжетерлік желілік құрылғылар жоқ"
 
@@ -340,7 +903,12 @@ msgstr "Қолжетерлік желілік құрылғылар жоқ"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s ОРНАТУ"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Жаңа %s %s орнатуы"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Аяқтағаннан кейін жүйені тіркеуден босату үшін %s орындаңыз."
@@ -354,8 +922,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Орындау үшін /bin/sh табылмады!  Қоршам іске қосылмайды"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Қалпына келтіру"
 
@@ -401,21 +969,15 @@ msgstr "Қалпына келтіру үшін жүйе"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Орнатылған жүйеңіздің түбірлік бөлімі қай құрылғыда жатыр?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ОК"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Шығу"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Жүйе қоршамнан шыққан кезде автоматты түрде қайта іске қосылады."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -424,7 +986,7 @@ msgstr ""
 "Жүйеңізде сіз тіркемеуге таңдаған \"кір\" файлдық жүйелері бар. Қоршамды алу "
 "үшін, Enter басыңыз, оның ішінен сіз бөлімдерді тексеріп, тіркей аласыз. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -445,7 +1007,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -458,28 +1020,231 @@ msgstr ""
 "\n"
 "Қоршамды алу үшін Enter басыңыз."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Linux диск бөлімдері жоқ.  Қайта іске қосылу.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Жүйе қоршамнан шыққан кезде автоматты түрде қайта іске қосылады."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Қалпына келтіру режимі"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "Linux диск бөлімдері жоқ. Қоршамға өту үшін Enter басыңыз.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Жүйеңіз %s бумасына тіркелген."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Қалыпты бөлім"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Диск"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Дискідегі 'swap' бөлімін операциялық жүйе бос жады азайған\n"
+"кезде қолданады."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Дискідегі 'boot' бөлімінде операциялық жүйесін іске қосу үшін\n"
+"керек файлдар сақталады."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr "Дискідегі 'root' бөлімінде қолданбалар мен жүйелік файлдар сақталады."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr "Дискідегі 'home' бөлімінде жеке мәліметтеріңіз сақталады."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS негізіндегі жүйеде GPT түрінде бөлімделген дисктерден\n"
+"жүктелу үшін BIOS жүктелу бөлімі керек."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"Кейбір PPC жүйелерінде жүктеуші баптауларының бөлігі\n"
+"ретінде PReP жүктелу бөлімі керек."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "Түбірлік (root) көлемі 250 МБ-тан кем, ол %s орнату үшін тым аз."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"%s орнатуын жалғастыру үшін керек түбірлік (root) бөлімі (/) көрсетілмеді."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Бұл платформа /boot бөлімін жеке бөлімде не логикалық томда болуын талап "
+"етеді. Егер жеке /boot бөлімін қаламасаңыз, түбірлік (/) бумасын жеке LVM-"
+"емес бөліміне орналастыру керек. "
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s бөлімінің өлшемі %(size)s мегабайттан аз, бұл қалыпты "
+"%(productName)s орнатуы үшін ұсынылатын шамадан аз."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s бөлімі %(format)s пішімдеуі үшін тым кіші (рұқсат етілетін өлшемі "
+"%(minSize)d МБ-тан бастап, %(maxSize)d МБ-қа дейін)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(mount)s бөлімі %(format)s пішімдеуі үшін тым үлкен (рұқсат етілетін өлшемі "
+"%(minSize)d МБ-тан бастап, %(maxSize)d МБ-қа дейін)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Жаңа құрылғыны қосу сәтсіз. Көбірек білу үшін шертіңіз."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Жүктелетін бөлім жасалмады."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Сіздің BIOS-қа негізделген жүйеңіз %s жаңа диск белгісімен (GPT) жүктелу "
+"үшін арнайы бөлімді талап етеді. Жалғастыру үшін, өлшемі 1 МБ 'BIOS Boot' "
+"түріндегі бөлімді жасаңыз."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Swap бөлімі көрсетілмеді. Swap бөлімсіз орнатуды жалғастыру үшін "
+"%(requiredMem)s МБ жады керек, ал сізде тек %(installedMem)s МБ бар."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Swap бөлімі көрсетілмеді. Swap бөлімі міндетті емес болғанымен де, көп "
+"жағдайда орнатудың өнімділігін арттыра алады."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Swap құрылғылардың кем дегенде біреуінде UUID жоқ, бұл mkswap-тың ескі "
+"нұсқаларымен жасалған swap аймағына тән қасиет. Осындай құрылғылар /etc/"
+"fstab ішінде құрылғы жолы арқылы көрсетіледі, ал, құрылғылар жолдары көп "
+"себептен өзгере алатындықтан, бұл ең тиімді шешім емес."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "Бұл тіркеу нүктесі қате.  %s бумасы / файлдық жүйесінде болуы тиіс."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s тіркеу нүктесі linux файлдық жүйесінде болуы тиіс."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Пароль:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -590,53 +1355,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Көрсетілген VNC пароль ұзындығы кем дегенде 6 таңбаға жетпеген.\n"
 "Жаңа парольді көрсетіңіз.  Парольсіз қалдыру үшін бос қалдырыңыз."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Орнатудың қайнар көзін баптау сәтсіз"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Дестелер метаақпаратын жүктеп алу сәтсіз..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Қолжетерлік орнатудың қайнар көзі жоқ"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Бағд. қамтаманы орнату"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Дестелерді орнату үрдісін бастау"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Келесі файлдық жүйелерде көбірек орын керек:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Қайнар көзінен транзакцияны бастау"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Орнатылуда"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Дестелер метаақпараты жүктелуде..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Орнатылуда"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Орнатуға дайындалу"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Жинақтаушылар баптауларын тексеру..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "БАСТАПҚЫ АТАУЫ"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "ЛОКАЛИЗАЦИЯ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "ЛОКАЛИЗАЦИЯ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "БАҒД. ҚАМТАМА"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "ЖҮЙЕ"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "ПАЙДАЛАНУШЫЛАР"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -645,34 +1495,100 @@ msgstr ""
 "Ағымдағы бағдарламалық қамтама таңдауы үшін орын жеткіліксіз. Қосымша %s "
 "керек."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Орнату торабы"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Автоматты орнатуды бастау"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Командалық жол режимінде сұрақтар болмауы тиіс!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  Жоғарыдан таңдаңыз ['q' шығу | 'c' жалғастыру үшін]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Жалғастыру алдында барлық өрістерді толтырыңыз"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Тораптың үнсіз келісім бойынша аты"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Жалғастыру алдында барлық өрістерді толтырыңыз"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Қате"
 
@@ -696,32 +1612,35 @@ msgstr "yes"
 msgid "no"
 msgstr "no"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Шығуды шынымен қалайсыз ба?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  Жоғарыдан таңдаңыз ['q' шығу | 'c' жалғастыру үшін]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -736,221 +1655,260 @@ msgstr ""
 "графикалық орнатуды орындау үшін VNC-ді іске қосуды немесе мәтіндік режимде "
 "орнатуды жалғастыруды қалайсыз ба?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC паролі"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "VNC паролін орнатыңыз. Оны екі рет енгізу керек болады. \n"
 "Парольсіз қалдыру үшін бос қалдырыңыз"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Пароль:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Пароль (растау):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Парольдер өзара сәйкес келмейді!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Пароль ұзындығы кем дегенде алты таңба болуы тиіс."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Пароль ұзындығы кем дегенде алты таңба болуы тиіс."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Уақыт белдеуі баптаулары"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Уақыт белдеуі орнатылмаған."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Қолжетерлік аймақтар"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Қолжетерлік аймақтар"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Желі баптауларын жазу"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "(%s) сымды желісі байланысқан"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "(%s) сымды желісі байланысқан"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Компьютер аты:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Хост аты"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Хост аты"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Хост аты қате: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Бап_тауды аяқтау"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Шлюз"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "файлдық жүйе баптауында оның түрі көрсетілмеген"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Орнатылған жүйені баптау"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root паролі:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Пароль орнатылды."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root тіркелгісі сөндірулі."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Пароль орнатылмаған."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Әкімші (root) үшін жаңа парольді көрсетіңіз. Оны екі рет теруіңіз керек "
 "болады."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Бүкіл орынды қолдану"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Бар болып тұрған Linux жүйесін(жүйелерін) алмастыру"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Бос орынды қолдану"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Орнатылатын жері"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Дисктер таңдалмады"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Жинақтаушының баптауларын тексеру қатесі"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Жинақтаушының баптауларын тексеру қатесі"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Автобөлімдеу таңдалды"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Таңдауыңызша бөлімдеу таңдалды"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -958,39 +1916,61 @@ msgstr ""
 "Бірде-бір диск табылмады. Компьютерді өшіріп, кем дегенде бір диск қосыңыз, "
 "одан кейін компьютерді қайта іске қосыңыз."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Бірде-бір диск таңдалмады; орнату үшін кем дегенде бір дискті таңдаңыз."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Жинақтаушыларды іздеу..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "Таң_дау"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Жаңартылған жинақтаушылар баптауларын жасау"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "жинақтаушы(лар) баптау сәтсіз: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Жинақтаушылар баптауларын тексеру..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Автобөлімдеу баптаулары"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -999,41 +1979,41 @@ msgstr ""
 "Орнату үрдісі қатты дискіңізді бөлімдеуді қамтиды.  Орнату жері ретінде "
 "қолдалылатын орынды таңдаңыз."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Бөлімдеу схемасын баптау"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Бөлімдеу схемасын баптау"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Уақыт белдеуі баптаулары"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s уақыт белдеуі"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Уақыт белдеуі орнатылмаған."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "%s аймағындағы қолжетерлік уақыт белдеулері"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Қолжетерлік аймақтар"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1042,179 +2022,197 @@ msgstr ""
 "Сандарды қолданыңыз немесе атауды теріңіз [b - аймақтар тізімі үшін, q - "
 "шығу]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC іске қосу"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Орнату үрдісі"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Жақын айна"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS сервері %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Бағд. қамтаманың қайнар көзін баптау сәтсіз"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Ешнәрсе таңдалмады"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Байланыс орнату..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD құрылғысы"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO фа_йлы:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Желілік уақыт"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Қолжетерлік орнатудың қайнар көзі жоқ"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Орнатудың қайнар көзін баптау сәтсіз"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Дестелер метаақпаратын жүктеп алу сәтсіз..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Қолжетерлік орнатудың қайнар көзі жоқ"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS сервері %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS тіркеу опциялары:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Орнатудың қайнар көзін баптау сәтсіз, репозиторий сілтемесін тексеріңіз"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot орналасқан құрылғысы"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Орнатудың қайнар көзін баптау сәтсіз"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Бағд. қамтама таң_дауын өзгерту"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Бағд. қамтама таңдауды тексеру сәтсіз"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Орнатудың қайнар көзі бапталмаған"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Қайнар көзі ауысты - тексеріңіз"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Таңдауыңызша бағд. қамтама таңдалған"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Орнатудың қайнар көзі бапталмаған"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Ортаңызды таңдаңыз"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Аутентификацияны қолдану"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Сізге парольді көрсетіп, оны растау керек."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Ескерту"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1230,36 +2228,36 @@ msgstr "Орындалуда"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tОрнату аяқталды. Шығу үшін Enter басыңыз"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Еске сақтау үшін қалыпты атауы"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "қалып-күйді тексеру..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Жаңа құрылғы"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Пароль (растау):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1268,7 +2266,7 @@ msgstr ""
 "Сіз көрсеткен пароль әлсіз: %s.  Сонда да оны қолдану үшін Дайын батырмасын "
 "басыңыз."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1277,63 +2275,47 @@ msgstr ""
 "Сіз көрсеткен пароль әлсіз: %s.  Сонда да оны қолдану үшін Дайын батырмасын "
 "басыңыз."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Пароль орнатылды."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Орнатқы_штан шығу"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Көмек"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "Ж_оқ"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Иә"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "БАСТАПҚЫ АТАУЫ"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "ЛОКАЛИЗАЦИЯ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "ЛОКАЛИЗАЦИЯ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "БАҒД. ҚАМТАМА"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "ЖҮЙЕ"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "ПАЙДАЛАНУШЫЛАР"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1341,7 +2323,11 @@ msgstr ""
 "Келесі қадамға өтер алдында бұл таңбашамен белгіленген барлық нәрсені "
 "аяқтаңыз."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Аяқталды!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1350,169 +2336,65 @@ msgstr ""
 "%s енді сіздің жүйеңізге сәтті орнатылды және қолдануға дайын!\n"
 "Оны қолдануды бастау үшін жүйеңізді қайта қосыңыз!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Аяқталды!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Шығу"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Жаңа %s %s орнатуы"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s жүйеңізге сәтті орнатылды, бірақ әлі де орындалу керек баптаулар қалды. \n"
+"Оларды аяқтап, Баптауды аяқтау батырмасын басыңыз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s енді сіздің жүйеңізге сәтті орнатылды және қолдануға дайын!\n"
+"Оны қолдануды бастау үшін жүйеңізді қайта қосыңыз!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Жаңа томдар тобын жасау ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Құрылғыны қайта баптау сәтсіз. Көбірек білу үшін шерітңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Томдар тобы үшін атын көрсетіңіз және төмендегі дисктерден кем дегенде "
-"біреуін таңдаңыз."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Томдар тобы:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "баған"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Жинақтаушылар баптаулары жөнделмейтін қате салдарынан тасталды. Көбірек білу "
 "үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Құрылғыны қайта баптау сәтсіз. Көбірек білу үшін шерітңіз."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Дұрыс тіркеу нүктесін көрсетіңіз."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Бұл тіркеу нүктесі дұрыс емес. Басқасын көру керек пе?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Бұл тіркеу нүктесі қолдануда болып тұр. Басқасын көру керек пе?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Таңдалған RAID деңгейі ағымдағы таңдалып тұрған дисктер санынан көбірек "
-"дискті талап етеді."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Дұрыс тіркеу нүктесін көрсетіңіз."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Бұл тіркеу нүктесі дұрыс емес. Басқасын көру керек пе?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Қалыпты бөлім"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Диск"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Ешнәрсе"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Сонымен қатар, %s түбіріндегі басқа барлық файлдық жүйелерді өшіру."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "%s ішіндегі барлық мәліметті өшіруді шынымен қалайсыз ба?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "%s ішіндегі барлық мәліметті өшіруді шынымен қалайсыз ба?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "ҚОЛМЕН БӨЛУ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d жинақтаушылар құрылғы таңдалды"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1521,125 +2403,111 @@ msgstr ""
 "%s %s орнатуы үшін тіркеу нүктелерін жасағаннан кейін,\n"
 "осында олардың ақпаратын көре аласыз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Дискідегі 'swap' бөлімін операциялық жүйе бос жады азайған\n"
-"кезде қолданады."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Дискідегі 'boot' бөлімінде операциялық жүйесін іске қосу үшін\n"
-"керек файлдар сақталады."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr "Дискідегі 'root' бөлімінде қолданбалар мен жүйелік файлдар сақталады."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr "Дискідегі 'home' бөлімінде жеке мәліметтеріңіз сақталады."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS негізіндегі жүйеде GPT түрінде бөлімделген дисктерден\n"
-"жүктелу үшін BIOS жүктелу бөлімі керек."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"Кейбір PPC жүйелерінде жүктеуші баптауларының бөлігі\n"
-"ретінде PReP жүктелу бөлімі керек."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi %s түріндегі құрылғыда болуы тиіс"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s %s түріндегі бөлімде болуы тиіс"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s шифрлеу мүмкін емес"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Түбірлік құрылғыда жаңа файлдық жүйені жасауыңыз керек."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "%s түріндегі құрылғылар дұрыс RAID деңгейін таңдауды талап етеді."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "Құрылғы өлшемін өзгертуге сұраным сәтсіз. Көбірек білу үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "Құрылғыны қайта пішімдеуге сұраным сәтсіз. Көбірек білу үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Көрсетілген %s атауы қолдануда болып тұр."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Бұл файлдық жүйе белгіні қолдамайды."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Дисктер таңдалмады"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Бұл файлдық жүйенің өлшемін өзгерті мүмкін емес."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Жинақтаушылардың баптауларын тексеру сәтсіз. Көбірек ақпарат үшін шертіңіз."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Жинақтаушылардың баптауларын тексеру сәтсіз. Көбірек ақпарат үшін шертіңіз."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Жаңа %s бар болып тұрған %s контейнеріне қосылды."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Жаңа құрылғыны қосу сәтсіз. Көбірек білу үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Бөлім өлшемі қате көрсетілді. Дұрыс бүтін санды енгізіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Құрылғыны өшіруге сұраным сәтсіз. Көбірек білу үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "%s томдар тобының атауы қолдануда болып тұр. Өзгерістер сақталмайды."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "файлдық жүйе бос"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1648,7 +2516,7 @@ msgstr ""
 "Бұл бағдарламалық RAID массивінде %d қатысушы бөлім жетіспейді (жалпы саны "
 "%d болуы тиіс). Оны өшіре аласыз не басқа құрылғыны таңдай аласыз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1657,285 +2525,142 @@ msgstr ""
 "Бұл LVM томдар тобында %d физикалық том жетіспейді (жалпы саны %d болуы "
 "тиіс). Оны өшіре аласыз не басқа құрылғыны таңдай аласыз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Бірде-бір диск таңдалмады."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Таңдалған дисктерде бос орын жеткіліксіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Автобөлімдеу сәтсіз аяқталды. Көбірек білу үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Бағд. қамтама таң_дауын өзгерту"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "Шифрленген блоктық құрылғыны босату сәтсіз. Көбірек білу үшін шертіңіз"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Сіз өзіңіздің жаңа %(productName)s орнатуы үшін файлдық жүйелерді қолмен "
-"көрсетуді таңдадыңыз. Бастар алдында, осымен танысуды қалайтын шығарсыз. Көп "
-"нәрсе өзгерді.\n"
-"\n"
-"Ең маңызды өзгеріс - жаңа файлдық жүйелерді жасау реттелді. LVM логикалық "
-"томдар сияқты комплексті құрылғыларды енді қадамдар бойынша жасау керек емес "
-"(физикалық том, одан кейін томдар тобы, одан кейін логикалық том) -- енді "
-"логикалық томды жасау жеткілікті, орнатқыш физикалық томдарды мен томдар "
-"топтарын жасау жұмысын өзі атқарады. Сонымен қатар, сіз логикалық томдарды "
-"қосқан, өшірген не өлшемін өзгерткен кезде, томдар тобы автоматты түрде "
-"орнатқышпен түзетіледі.\n"
-"\n"
-"\n"
-"Экран бөлінуі\n"
-"\n"
-"Экранның сол жағында бұл компьютерден табылған ОЖ орнатулары көрсетілген . "
-"Жаңа %(productName)s орнатуы тізімнің басында көрсетіледі. ОЖ орнатуларының "
-"үстінен шертіп, оларда қандай файлдық жүйелер бар екенін көруге болады.\n"
-"\n"
-"Түрлі орнатулар мен тіркеу нүктелері көрсетілген экранның сол жақ аймағының "
-"астында жаңа файлдық жүйені қосу, таңдалған файлдық жүйені өшіру не оны "
-"баптау батырмалары орналасқан.\n"
-"\n"
-"Экранның оң жағында ағымдағы таңдалып тұрған тіркеу нүктесін баптай аласыз.\n"
-"\n"
-"Сол жақ астында орнату үшін таңдалып тұрған дискілер жөніндегі жинақы "
-"ақпаратты көруге болады. Сіз таңдаған дисктер жөнінде толығырақ ақпаратты "
-"алу үшін көк мәтінге шертуге болады.\n"
-"\n"
-"\n"
-"Жаңа файлдық жүйені жаңа құрылғыда қалай жасау керек\n"
-"\n"
-"1. + батырмасына шертіңіз.\n"
-"2. Тіркеу нүктесін мен өлшемін енгізіңіз. (Кеңес: Көмек үшін тышқан курсорын "
-"мәтіндік өрістердің біреуіне апарып ұстаңыз.)\n"
-"3. Экранның сол жақ жағындағы \"Жаңа %(productName)s орнату\" астынан тіркеу "
-"нүктесін таңдап, оны баптауға болады.\n"
-"\n"
-"\n"
-"Дискіңізде бар болып тұрған файлдық жүйе/құрылғыны қалай қайта пішімдеуге "
-"болады\n"
-"\n"
-"1. Экранның сол жақ жағынан файлдық жүйені таңдаңыз.\n"
-"2. Тіркеу нүктесін баптау аймағында \"Баптау\" жазық қылу батырмасын "
-"басыңыз.\n"
-"3. \"Қайта пішімдеу\" белгішесін орнатыңыз, файлдық жүйе түрін мен, керек "
-"болса, жоғарыдағы \"Тіркеу нүктесі\" өрісіне тіркеу нүктесін көрсетіңіз.\n"
-"4. \"Өзгерістерді іске асыру\" батырмасын басыңыз\"\n"
-"\n"
-"\n"
-"Дискіде бар болып тұрған файлдық жүйе үшін тіркеу нүктесін орнату\n"
-"\n"
-"1. Файлдық жүйені экранның сол жағынан таңдаңыз.\n"
-"2. \"Тіркеу нүктесі\" мәтіндік өрісінде тіркеу нүктесін енгізіңіз.\n"
-"3. \"Өзгерістерді іске асыру\" батырмасын басыңыз\n"
-"\n"
-"\n"
-"Дискіде бар болып тұрған файлдық жүйені өшіру\n"
-"\n"
-"1. Өшіргіңіз келетін файлдық жүйені экранның сол жағынан таңдаңыз.\n"
-"2. - батырмасына басыңыз.\n"
-"\n"
-"Кеңес: Дискіңізде бар болып тұрған құрылғыны \"Жаңа %(productName)s орнатуы"
-"\" ішінен өшіру ол құрылғыны дисктен өшірмейді. Ол тек сол құрылғыны "
-"бастапқы күйіне тастайды. Дискіңізде бар болып тұрған құрылғыны өшіру үшін, "
-"ол құрылғыны басқа анықталған ОЖ орнатулардың кез-келгені (немесе \"Белгісіз"
-"\") ішінен таңдап, - батырмасын басуыңыз керек.\n"
-"\n"
-"\n"
-"Кеңестер мен құлықтар\n"
-"\n"
-"Жаңа файлдық жүйелер өлшемдерін дисктегі қолжетерлік бос орнынан үлкенірек "
-"етіп көрсетуге болады. Орнатқыш сіз сұраған өлшемге мүмкіндігінше жақын "
-"шаманы орнатады.\n"
-"\n"
-"Үнсіз келісім бойынша, жаңа құрылғылар таңдалған дисктердің кез-келгенін/"
-"барлығын қолданады.\n"
-"\n"
-"Жаңа құрылғы орналаса алатын дисктерді таңдау үшін, ол құрылғы таңдалып "
-"тұрған кезінде баптау батырмасына басыңыз (сайман суретшесі бар).\n"
-"\n"
-"Жаңа файлдық жүйені + батырмасын басу арқылы қосу кезінде, құрылғыны "
-"қолжетерлік бос орынды толығымен қолданатындай етіп орнату үшін, өлшемді "
-"көрсету өрісін бос қалдырыңыз.\n"
-"\n"
-"LVM томдар тобы сияқты контейнер құрылғысынан соңғы құрылғыны өшіру кезінде, "
-"жаңа құрылғыларға жол ашу үшін ол контейнер құрылғысының өзі де өшіріледі.\n"
-"\n"
-"Дисктен соңғы бөлім өшірілген кезде, ол диск жаңа бөлімдеу кестесімен қайта "
-"инициализациядан өтуі мүмкін, егер ол диск үшін сәйкес келетін түрі "
-"табылса.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "КҮН МЕН УАҚЫТ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Уақыт белдеуі қате"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "NTP қолданбас бұрын желіні баптау керек"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Жұмыс істейтін бірде-бір NTP сервері бапталмаған"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "ОРНАТУ МАҚСАТЫ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d жинақтаушылар құрылғы таңдалды"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s жаймаларды ауыстыру үшін."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "ПЕРНЕТАҚТА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Жаймалар баптауларын сынау қолжетерсіз."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "қалып-күйді тексеру..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Жаймаларды ауыстыру бапталмаған."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "ТІЛ"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Қалып-күйі белгісіз (жоқ болып тұр)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Қалып-күйі белгісіз"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Басқарылмайтын"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Қолжетерсіз"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware жоқ"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Кабель ажыратылды"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Қолжетерсіз"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Ажыратылған"
@@ -1960,154 +2685,170 @@ msgstr "Байланысты үзу"
 msgid "Connection failed"
 msgstr "Байланысу сәтсіз"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "ажыратылған"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Сымсыз"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "ажыратылған"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 адресі"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 адресі"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP адресі"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Мб/с"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Ешнәрсе"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Аутентификация керек"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "ЖЕЛІ БАПТАУЛАРЫ"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT ПАРОЛІ"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Пароль орнатылды."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root паролі орнатылды"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root тіркелгісі сөндірулі"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Әкімші (root) паролі орнатылмаған"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "БАҒДАРЛАМА ТАҢДАУ"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Бағд. қамтама тәуелділіктерін тексеру..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Бағд. қамтама тәуелділіктерін тексеру сәтсіз"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Дестелер метаақпараты жүктелуде..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Топтар метаақпараты жүктелуде..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Бағд. қамтама тәуелділіктерін тексеру..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Бағд. қамтама тәуелділіктерін тексеру сәтсіз"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Бағд. қамтама тәуелділіктерін тексеру қатесі. Көбірек білу үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Орнату үшін белгіленген келесі бағд. қамтамада қателер бар. Бұл орнатудың "
 "қайнар\n"
@@ -2115,47 +2856,78 @@ msgstr ""
 "қолданылатын\n"
 "орнатудың қайнар көзін ауыстыру немесе орнатқыштан шығуға болады."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "Ба_с тарту"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Шығу"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "Бағд. қамтама қайнар кө_зін түзету"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Бағд. қамтама таң_дауын өзгерту"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Орнатудың қайнар көзін баптау..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Дестелер метаақпаратын жүктеп алу сәтсіз..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Аутентификация керек"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Бұл тасушыдан орнатуды жүргізуге болады."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Бұл тасушыдан орнатуды жүргізуге болмайды."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ОРНАТУДЫҢ ҚАЙНАР КӨЗІ"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Орнатудың қайнар көзін баптау сәтсіз, репозиторий сілтемесін тексеріңіз"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Репозиторийді іске қосу қатесі"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Бағд. қамтаманың қайнар көзін баптау сәтсіз"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2163,98 +2935,80 @@ msgstr ""
 "Орнатудың қайнар көзін баптау сәтсіз, репозиторий сілтемесін мен прокси "
 "баптауларын тексеріңіз"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Репозиторийді іске қосу қатесі"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Бағд. қамтаманың қайнар көзін баптау сәтсіз"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Құрылғы:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS сервері %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Уақыт белдеуі қате"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Уақыт белдеуі қате"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Уақыт белдеуі қате"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Күте тұрыңыз...бағд. қамтама метаақпараты әлі жүктелуде."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Таңдалған дисктерде бос орын көлемі келесідей:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Күте тұрыңыз...бағд. қамтама метаақпараты әлі жүктелуде."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2264,7 +3018,7 @@ msgstr ""
 "<b>%s орнату үшін бос орын жеткіліксіз</b>, бірақ, бар болып тұрған диск\n"
 "бөлімдерінің көлемін азайту не оларды өшіру арқылы бос орынды алуға болады."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2275,7 +3029,7 @@ msgstr ""
 "барлық\n"
 "бос орын қолданылатын болса да."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2290,50 +3044,61 @@ msgstr ""
 "орнату үшін таңдалған бағд. қамтаманы түзетуге, немесе орнатқыштан шығуға "
 "болады."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "ОРНАТУ МАҚСАТЫ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Жинақтаушылар баптауларын сақтау..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Жинақтаушылар баптауларын сақтау сәтсіз..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD құрылғысын пішімдеу"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Жинақтаушылардың баптауларын тексеру сәтсіз. Көбірек ақпарат үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Жинақтаушылардың баптауларын тексеру сәтсіз. Көбірек ақпарат үшін шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "файлдық жүйе бос"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d диск таңдалды; жалпы орны %s; бос орны %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 "Жүктеушіні орнатуды аттап кету таңдалды. Жүйе жүктеле алмайтын болуы мүмкін."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2343,11 +3108,19 @@ msgstr ""
 "Жинақтаушы құрылғылар\n"
 "схемасын өзгертуге не орнатқыштан шығуға болады."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Шығу"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Жинақтаушылар схемасын өзгерту"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2358,77 +3131,81 @@ msgstr ""
 "Жинақтаушы құрылғылар\n"
 "схемасын өзгертуге не орнатқыштан шығуға болады."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ОК"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "ПАЙДАЛАНУШЫЛАР"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Уақыт белдеуі қате"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s ішіне қош келдіңіз."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "МӘЛІМЕТТЕР"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "%s %s орнатуы үшін әлі бірде-бір тіркеу нүктесі жасалмады:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Оларды автоматты түрде жасау үшін осында шертіңіз."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 "Немесе, жаңа тіркеу нүктелерін төмендегі '+' таңбашасына басу арқылы жасаңыз."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2440,55 +3217,163 @@ msgstr[0] ""
 "<b>%d диск; жалпы орны %s; бос орны %s</b> (бөлінбеген және файлдық "
 "жүйелердегі)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "Жүктеушіні ор_натпау"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "Жүктелу құрылғысы ретінде ор_нату"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Таңдалған RAID деңгейі ағымдағы таңдалып тұрған дисктер санынан көбірек "
+"дискті талап етеді."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Томдар тобы үшін атын көрсетіңіз және төмендегі дисктерден кем дегенде "
+"біреуін таңдаңыз."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Томдар тобы:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "баған"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s тіркеу нүктесі linux файлдық жүйесінде болуы тиіс."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Бұл тіркеу нүктесі қолдануда болып тұр. Басқасын көру керек пе?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Дұрыс тіркеу нүктесін көрсетіңіз."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Бұл тіркеу нүктесі дұрыс емес. Басқасын көру керек пе?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Сонымен қатар, %s түбіріндегі басқа барлық файлдық жүйелерді өшіру."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "%s ішіндегі барлық мәліметті өшіруді шынымен қалайсыз ба?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "%s ішіндегі барлық мәліметті өшіруді шынымен қалайсыз ба?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Уақыт белдеуі қате"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Шығу"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Сіз енгізген пароль әлсіз: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Парольдер өзара сәйкес емес."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Сақтау"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Кішірейту"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Өшіру"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Бұл дискте орнатудың қайнар көзі орналасқан."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s жасау %(device)s құрылғысында"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Дайын емес"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Бос орынды қолдану"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2501,367 +3386,776 @@ msgstr ""
 "болады.  Диск бөлімі өшірілсе, ондағы сақталған мәліметтерді қайтаруға "
 "мүмкін емес болады."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] "<b>%s диск; %s алынатын орын</b> (файлдық жүйелерде)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Қайта бөлу арқылы алу үшін толық диск орны : <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Өшіру"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Сақтау"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "ДИСТРИБУТИВТІ ОРНАТУ"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "Еске сақтау үшін атауы"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "ШЫҒАРЫЛЫМҒА-ДЕЙІНГІ / СЫНАЛУДА"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Жаңа құрылғы"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 МБ"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 ГБ"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Жаңа таңдаушы"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "Д_айын"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "Жалға_стыру"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "Өзгерістерді іске _асыру"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "ЖЕЛІ БАПТАУЛАРЫ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Топ аты"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ОК"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "КҮН МЕН УАҚЫТ"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "NTP серверлерін қосу және қолдану үшін белгілеу"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Веб сервер"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Жұмыс істеуде"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Қолдану"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Бап_тау..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "КҮН МЕН УАҚЫТ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Аймақ:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Аймақ:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Қала:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Қала:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Желі а_тауы"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Желі атауы"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 сағат"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "ОРНАТУ МАҚСАТЫ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Сыйымдылығы"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Байланыспаған"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Таңдалған құрылғы"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Ешнәрсе таңдалмады"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Белгі:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware жоқ"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "Ж_оқ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN түрі"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Таңдалған құрылғы"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "жинақы"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID құрылғысы"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "Қ_осу"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Негізгі бағдар"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Желі маскасы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Жылдамдығы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Құрылғылық адрес"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Ба_птау..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Қауіпсіздік"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Желі а_тауы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Желі атауы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Қауіпсіздік кілті"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "Қат_ынау нүкте ретінде қолдану..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "Қа_тынау нүктесін тоқтату..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Бап_тау..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Провайдер"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Бап_тау..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN түрі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Топ аты"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Топ паролі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Пайдаланушы аты"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Бап_тау..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "Тә_сіл"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Баптау URL-ы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP _проксиі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS п_роксиі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP пр_оксиі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Socks _хосты"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Желі баптауларын жазу"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Босату"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Ұ_шу режимі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Желі баптауларын жазу"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Компьютер аты:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "ЖЕЛІ БАПТАУЛАРЫ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2871,282 +4165,204 @@ msgstr ""
 "үшін,\n"
 "желілік байланыс қажет."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Негізгі бағдар"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Желі маскасы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Жылдамдығы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Құрылғылық адрес"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "Ба_птау..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Қауіпсіздік"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "Желі а_тауы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Желі атауы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Қауіпсіздік кілті"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "Қат_ынау нүкте ретінде қолдану..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "Қа_тынау нүктесін тоқтату..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "Бап_тау..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Провайдер"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN түрі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Шлюз"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Топ аты"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Топ паролі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Пайдаланушы аты"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "Тә_сіл"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Баптау URL-ы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP _проксиі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS п_роксиі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP пр_оксиі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Socks _хосты"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Босату"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Ұ_шу режимі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Компьютер аты:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Аутентификацияны қолдану"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Аутентификация керек"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Байланысқан"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "БАҒДАРЛАМА ТАҢДАУ"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Ортаңызды таңдаңыз"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "баған"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Бас тарту мен кө_бірек дискті қосу"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ОРНАТУ ОПЦИЯЛАРЫ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Бөлім түрі:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Менің мәліметтерімді шифрлеу. Мен парольді кейінірек орнатамын."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Таңдауыңызша бөлімдеу таңдалды"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "Ор_ынды қайта бөлу"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ОРНАТУ ОПЦИЯЛАРЫ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "Осында біз таңдалған бағд. қамтама үшін керек орынды жазып отырамыз."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "диск бос"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Қолдану үшін қолжетерлік бос орын."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "файлдық жүйе бос"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "Бос орын жоқ бірақ оны басқа бөлімдерден алуға болады."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Осында біз таңдауға келетін нұсқаларды жазамыз."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Бос орынды қолдану"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Орнатқыштан шығу"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Құрылғы анықтамасы"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Жергілікті қалыпты дисктер"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "Бөлімдеуді а_яқтау"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Шифрлеу"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Автобөлімдеу таңдалды"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "Бөлімдеуді а_яқтау"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Шифрлеу"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Менің мәліметтерімді шифрлеу. Мен парольді кейінірек орнатамын."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Автобөлімдеу баптаулары"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "жинақы"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Диск бойынша жинақы ақпарат пен опциялар..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ПЕРНЕТАҚТА ЖАЙМАСЫН ҚОСУ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Төменнен таңдау арқылы пернетақта жаймасын қоса аласыз:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Аты"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "ПЕРНЕТАҚТА ЖАЙМАСЫ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3154,7 +4370,7 @@ msgstr ""
 "Бұл жүйеде қай пернетақта жаймаларын қолданғыңыз келеді? Жайманы негізгі "
 "ретінде орнату үшін оны тізімнің басына жылжытыңыз."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3162,118 +4378,200 @@ msgstr ""
 "Осындағы өзгертулер тек орнатылатын жүйе үшін іске асырылады. Орнату "
 "кезіндегі пернетақта жаймасын баптау үшін жұмыс үстел сайманын қолданыңыз."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "аты"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Жайманы қосу"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Жайманы өшіру"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Таңдалған жайманы жоғары жылжыту"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Жайманы қосу"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Жайманы өшіру"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Таңдалған жайманы жоғары жылжыту"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Таңдалған жайманы төмен жылжыту"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Жайманы алдын-ала қарау"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Жаймалар баптауларын сынау қолжетерсіз."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Жайманы ауыстыру үшін Alt + Shift."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "Опция_лар"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "Қ_осу"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ПЕРНЕТАҚТА ЖАЙМАСЫН ҚОСУ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Төменнен таңдау арқылы пернетақта жаймасын қоса аласыз:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Аты"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Қолжетерлік аймақтар"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Жайманы қосу"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ОК"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ЖАЙМАНЫ АУЫСТЫРУ ОПЦИЯЛАРЫ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Пернетақта жаймаларын ауыстыру үшін пернелердің қай комбинациясын қолдануды "
 "қалайсыз?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "қолдану"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "анықтамасы"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS тіркеу опциялары:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "ТІЛ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Ешнәрсе таңдалмады"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT ПАРОЛІ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root паролі:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Растау:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC паролі"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Әкімші (root) паролін орнату"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3281,237 +4579,285 @@ msgstr ""
 "Әкімші (root) тіркелгісі жүйеге әкімшілік қызметтер ету үшін қолданылады. "
 "Әкімші (root) пайдаланушысы үшін парольді енгізіңіз."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "Д_айын"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "ТАСУШЫНЫ ТЕКСЕРУ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Тасушыны тексеру, күте тұрыңыз..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "Қ_осу"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ОК"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP _проксиді іске қосу"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Прокси сілтемесі</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Мысалы:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Аутентификацияны қолдану"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Пайдаланушы аты</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Пайдаланушы аты"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Пароль</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ОРНАТУДЫҢ ҚАЙНАР КӨЗІ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Орнатудың қай қайнар көзін қолдануды қалайсыз?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Автоанықталған орнату тасушысы:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Құрылғы:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Белгі:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Растау"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO фа_йлы:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Құрылғы:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO ф_айлын таңдаңыз"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Ж_еліде:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Проксиді баптау..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Бұл сілтеме а_йналар тізіміне көрсетіп тұр."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS тіркеу опциялары:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Бұл өріс қосымша."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People репозиторийлері"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Жаңа тіркеу нүктесін қосу."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "Қ_осу"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Таңдалған тіркеу нүкте(лер) өшіру."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Ө_шіру"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Әрекет қатесі."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Әкімші (root) паролін орнату"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Бұл сілтеме а_йналар тізіміне көрсетіп тұр."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Аты:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Прокси сілтемесі</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Пайдаланушы аты"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Бұл тіркеу нүктесі дұрыс емес. Басқасын көру керек пе?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "Ос_ыдан кеткім келеді!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "Ке_лісемін."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Бұл тұрақсыз, шығарылымға дейінгі бағд. қамтама."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3522,204 +4868,264 @@ msgstr ""
 "Бірақ, қателері бар. Қателер әр жерде.  Келісу керек қателер. Болашақтың ОЖ-"
 "і сенуге болатын ОЖ емес. Ол тек сынау үшін арналған."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s ішіне қош келдіңіз."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Орнату кезінде қай тілді қолданғыңыз келеді?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Шығу"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "Жалға_стыру"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Пайдаланушы аты"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Топ аты"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC паролі"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Тіркеу нүктесін қосу"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Керек өлшемі:</b>"
+msgid "Add a new mount point."
+msgstr "Жаңа тіркеу нүктесін қосу."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Тіркелу нүктесі:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "Қ_осу"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "ЖАҢА ТІРКЕУ НҮКТЕСІН ҚОСУ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Төменде тіркеу нүктесін жасағаннан кейін\n"
-"көбірек баптау опциялары қолжетерлік болады."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Бұл тіркелу нүктесі қолдануда\n"
-"болып тұр. Басқасын көру керек пе?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "мыс.: \"20 GB\", \"500mb\" (тырнақшасыз)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "О_ны өшіру"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Сақтау"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "ТІРКЕУ НҮКТЕСІН БАПТАУ"
+msgid "Remove the selected mount point(s)."
+msgstr "Таңдалған тіркеу нүкте(лер) өшіру."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Томдар тобы үшін атын көрсетіңіз және төмендегі дисктерден кем дегенде "
-"біреуін таңдаңыз."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Ө_шіру"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Бос"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID құрылғысы"
+msgid "Reload storage configuration from disk."
+msgstr "жинақтаушы(лар) баптау сәтсіз: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Шифрлеу"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Таңдалған құрылғы"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Құрылғы анықтамасы"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Тіркелу нүктесі:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Керек өлшемі:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Белгі:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Құрылғы түрі:</b>"
+msgid "Device(s):"
+msgstr "Құрылғы:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Файлдық жүйесі:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Шифрлеу"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Қайта пішімдеу"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Томдар тобы:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Өзгерту ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Аты:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Құрылғы түрі:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Шифрлеу"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Файлдық жүйе"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Қайта пішімдеу"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Томдар тобы:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Өзгерту ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID құрылғысы"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3727,17 +5133,19 @@ msgstr ""
 "Бұл құрылғы шифрленген, орны дұрыс шифрлеу парольсіз оқуға мүмкін емес. Оны "
 "төменде аша аласыз."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "Бо_сату"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3745,295 +5153,572 @@ msgstr ""
 "Бұл құрылғыны тікелей түзету мүмкін емес. Оны өшіре аласыз, немесе басқа "
 "құрылғыны таңдай аласыз."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Жаңа тіркеу нүктесін қосу."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Таңдалған тіркеу нүкте(лер) өшіру."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Таңдалған тіркеу нүктесін баптау."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Бап_тау..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "жинақтаушы(лар) баптау сәтсіз: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Көмек алу үшін шертіңіз"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Көмек"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ҚОЛЖЕТЕРЛІК ОРНЫ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">БҮКІЛ ОРНЫ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "Таң_дау"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "ТІРКЕУ НҮКТЕСІН БАПТАУ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Бұл құрылғы орналаса алатын бір немесе бірнеше дискті таңдаңыз."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ОК"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP адресі"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI-инициатор аты көрсетілуі тиіс"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Аутентификацияны қолдану"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Мысалы:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Пайдаланушы аты"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC паролі"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Пайдаланушы аты"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC паролі"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Пайдаланушы аты"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC паролі"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Желі атауы"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Аутентификацияны қолдану"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Пайдаланушы аты"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC паролі"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Пайдаланушы аты"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC паролі"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Пайдаланушы аты"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC паролі"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Байланысу сәтсіз"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ОК"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Құрылғы:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "ТАҢДАЛҒАН ДИСКТЕР"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Жабу"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Boot"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Сипаттамасы"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Бос"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "Ө_шіру"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Диск ақпараты осында"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "О_ны өшіру"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Таң_дау"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "ТІРКЕУ НҮКТЕСІН БАПТАУ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Бұл құрылғы орналаса алатын бір немесе бірнеше дискті таңдаңыз."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Тіркеу нүктесін қосу"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Керек өлшемі:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Тіркелу нүктесі:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "ЖАҢА ТІРКЕУ НҮКТЕСІН ҚОСУ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Төменде тіркеу нүктесін жасағаннан кейін\n"
+"көбірек баптау опциялары қолжетерлік болады."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Бұл тіркелу нүктесі қолдануда\n"
+"болып тұр. Басқасын көру керек пе?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "мыс.: \"20 GB\", \"500mb\" (тырнақшасыз)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Сақтау"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "ТІРКЕУ НҮКТЕСІН БАПТАУ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Томдар тобы үшін атын көрсетіңіз және төмендегі дисктерден кем дегенде "
+"біреуін таңдаңыз."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Аты:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID құрылғысы"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Шифрлеу"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Дұрыс тіркеу нүктесін көрсетіңіз."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ОК"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD құрылғысын пішімдеу"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Орнату кезінде белгісіз қате орын алды. Көбірек ақпараты төменде."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ДИСКТІ ШИФРЛЕУ ПАРОЛІ"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Парольді сақтау"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ДИСКТІ ШИФРЛЕУ ПАРОЛІ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4043,7 +5728,19 @@ msgstr ""
 "қатынау үшін қолданылатын, компьютеріңізді іске қосқан кезде енгізілетін "
 "кілттік фразаны жасауыңыз керек."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Пароль:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Растау:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4052,117 +5749,172 @@ msgstr ""
 "Ескерту: Ағымдағы пернетақта жаймасы - <b>%s</b>. Егер ол өзгертілсе, "
 "орнатудан кейін дисктерді дешифрлеу мүмкін емес болуы мүмкін."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ДИСК ОРНЫН ҚАЙТА БӨЛУ"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ОК"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "Ор_ынды қайта бөлу"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ДИСК ОРНЫН ҚАЙТА БӨЛУ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Анықтамасы осында."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Файлдық жүйе"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Қайта бөлінетін орын"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Әрекет"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Сақтау"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Өшіру"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Кішірейту"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Таңдауыңызша бөлімдеу таңдалды"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "Өзгерістерді іске _асыру"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Құрылғы:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Тіркеу нүктесін қосу"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Орнатқы_штан шығу"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "Ж_оқ"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Иә"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4170,50 +5922,50 @@ msgstr ""
 "Орнату бағдарламасынан шығуды\n"
 "шынымен қалайсыз ба?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Шығу"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ОРНАТУДЫҢ ЖИНАҚЫ АҚПАРАТЫ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Шығу"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "Орнатуды _бастау"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "БАПТАУ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Орнатуға дайындалу"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s жүйеңізге сәтті орнатылды, бірақ әлі де орындалу керек баптаулар қалды. \n"
-"Оларды аяқтап, Баптауды аяқтау батырмасын басыңыз."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "Бап_тауды аяқтау"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s енді сіздің жүйеңізге сәтті орнатылды және қолдануға дайын!\n"
-"Оны қолдануды бастау үшін жүйеңізді қайта қосыңыз!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "Қа_йта қосу"
 
@@ -4229,41 +5981,42 @@ msgstr "Орнату"
 msgid "Install the live CD to your hard disk"
 msgstr "Тірі CD-ін қатты дискіңізге орнату"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Қатты дискіге орнатуды бастау"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Fedora-ға қош келдіңіз"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr "%s орнатылу үшін %s МБ жады керек, ал бұл машинада тек %s МБ бар.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s графикалық орнатқышы %s МБ жадыны талап етеді, ал сізде тек %s МБ бар."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Жады жеткіліксіз"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4277,24 +6030,24 @@ msgstr ""
 "\n"
 " осыны әкімші (root) терминалынан жасаңыз."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Мәтіндік режимді бастау."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Қате"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY айнымалысы орнатылмаған. Мәтіндік режимді бастау."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Графикалық түрде орнату қолжетерсіз. Мәтіндік режимді бастау."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4305,20 +6058,20 @@ msgstr ""
 "дискт(ерд)і өзіңіздің схемаңыз бойынша бөлу немесе дестелерді таңдауды "
 "қолдамайды. Оның орнына VNC режимін қолдануды қалайсыз ба?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Орнатуды бастау үшін орындаңыз: ssh install@%s."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Орнатуды жалғастыру үшін орындаңыз: ssh install@<host>."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora қолданып көріңіз"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4328,7 +6081,7 @@ msgstr ""
 "Fedora-ны дәл қазір орната аласыз, немесе кейін де, \"Қатты дискіге орнату\" "
 "нұсқасын Әрекеттерді шолудан таңдай аласыз."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4336,10 +6089,288 @@ msgstr ""
 "\"Қатты дискіге орнату\" нұсқасын кейін де\n"
 "Әрекеттерді шолудан таңдай аласыз."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Жабу"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Хост аты 'a-z', 'A-Z', не '0-9' аймақтарында жататын таңбадан басталуы "
+#~ "тиіс"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Келесі файлдық жүйелерде көбірек орын керек:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Командалық жол режимінде сұрақтар болмауы тиіс!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Бұл тіркеу нүктесі дұрыс емес. Басқасын көру керек пе?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Сіз өзіңіздің жаңа %(productName)s орнатуы үшін файлдық жүйелерді қолмен "
+#~ "көрсетуді таңдадыңыз. Бастар алдында, осымен танысуды қалайтын шығарсыз. "
+#~ "Көп нәрсе өзгерді.\n"
+#~ "\n"
+#~ "Ең маңызды өзгеріс - жаңа файлдық жүйелерді жасау реттелді. LVM логикалық "
+#~ "томдар сияқты комплексті құрылғыларды енді қадамдар бойынша жасау керек "
+#~ "емес (физикалық том, одан кейін томдар тобы, одан кейін логикалық том) -- "
+#~ "енді логикалық томды жасау жеткілікті, орнатқыш физикалық томдарды мен "
+#~ "томдар топтарын жасау жұмысын өзі атқарады. Сонымен қатар, сіз логикалық "
+#~ "томдарды қосқан, өшірген не өлшемін өзгерткен кезде, томдар тобы "
+#~ "автоматты түрде орнатқышпен түзетіледі.\n"
+#~ "\n"
+#~ "\n"
+#~ "Экран бөлінуі\n"
+#~ "\n"
+#~ "Экранның сол жағында бұл компьютерден табылған ОЖ орнатулары "
+#~ "көрсетілген . Жаңа %(productName)s орнатуы тізімнің басында көрсетіледі. "
+#~ "ОЖ орнатуларының үстінен шертіп, оларда қандай файлдық жүйелер бар екенін "
+#~ "көруге болады.\n"
+#~ "\n"
+#~ "Түрлі орнатулар мен тіркеу нүктелері көрсетілген экранның сол жақ "
+#~ "аймағының астында жаңа файлдық жүйені қосу, таңдалған файлдық жүйені "
+#~ "өшіру не оны баптау батырмалары орналасқан.\n"
+#~ "\n"
+#~ "Экранның оң жағында ағымдағы таңдалып тұрған тіркеу нүктесін баптай "
+#~ "аласыз.\n"
+#~ "\n"
+#~ "Сол жақ астында орнату үшін таңдалып тұрған дискілер жөніндегі жинақы "
+#~ "ақпаратты көруге болады. Сіз таңдаған дисктер жөнінде толығырақ ақпаратты "
+#~ "алу үшін көк мәтінге шертуге болады.\n"
+#~ "\n"
+#~ "\n"
+#~ "Жаңа файлдық жүйені жаңа құрылғыда қалай жасау керек\n"
+#~ "\n"
+#~ "1. + батырмасына шертіңіз.\n"
+#~ "2. Тіркеу нүктесін мен өлшемін енгізіңіз. (Кеңес: Көмек үшін тышқан "
+#~ "курсорын мәтіндік өрістердің біреуіне апарып ұстаңыз.)\n"
+#~ "3. Экранның сол жақ жағындағы \"Жаңа %(productName)s орнату\" астынан "
+#~ "тіркеу нүктесін таңдап, оны баптауға болады.\n"
+#~ "\n"
+#~ "\n"
+#~ "Дискіңізде бар болып тұрған файлдық жүйе/құрылғыны қалай қайта пішімдеуге "
+#~ "болады\n"
+#~ "\n"
+#~ "1. Экранның сол жақ жағынан файлдық жүйені таңдаңыз.\n"
+#~ "2. Тіркеу нүктесін баптау аймағында \"Баптау\" жазық қылу батырмасын "
+#~ "басыңыз.\n"
+#~ "3. \"Қайта пішімдеу\" белгішесін орнатыңыз, файлдық жүйе түрін мен, керек "
+#~ "болса, жоғарыдағы \"Тіркеу нүктесі\" өрісіне тіркеу нүктесін көрсетіңіз.\n"
+#~ "4. \"Өзгерістерді іске асыру\" батырмасын басыңыз\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Дискіде бар болып тұрған файлдық жүйе үшін тіркеу нүктесін орнату\n"
+#~ "\n"
+#~ "1. Файлдық жүйені экранның сол жағынан таңдаңыз.\n"
+#~ "2. \"Тіркеу нүктесі\" мәтіндік өрісінде тіркеу нүктесін енгізіңіз.\n"
+#~ "3. \"Өзгерістерді іске асыру\" батырмасын басыңыз\n"
+#~ "\n"
+#~ "\n"
+#~ "Дискіде бар болып тұрған файлдық жүйені өшіру\n"
+#~ "\n"
+#~ "1. Өшіргіңіз келетін файлдық жүйені экранның сол жағынан таңдаңыз.\n"
+#~ "2. - батырмасына басыңыз.\n"
+#~ "\n"
+#~ "Кеңес: Дискіңізде бар болып тұрған құрылғыны \"Жаңа %(productName)s "
+#~ "орнатуы\" ішінен өшіру ол құрылғыны дисктен өшірмейді. Ол тек сол "
+#~ "құрылғыны бастапқы күйіне тастайды. Дискіңізде бар болып тұрған құрылғыны "
+#~ "өшіру үшін, ол құрылғыны басқа анықталған ОЖ орнатулардың кез-келгені "
+#~ "(немесе \"Белгісіз\") ішінен таңдап, - батырмасын басуыңыз керек.\n"
+#~ "\n"
+#~ "\n"
+#~ "Кеңестер мен құлықтар\n"
+#~ "\n"
+#~ "Жаңа файлдық жүйелер өлшемдерін дисктегі қолжетерлік бос орнынан "
+#~ "үлкенірек етіп көрсетуге болады. Орнатқыш сіз сұраған өлшемге "
+#~ "мүмкіндігінше жақын шаманы орнатады.\n"
+#~ "\n"
+#~ "Үнсіз келісім бойынша, жаңа құрылғылар таңдалған дисктердің кез-келгенін/"
+#~ "барлығын қолданады.\n"
+#~ "\n"
+#~ "Жаңа құрылғы орналаса алатын дисктерді таңдау үшін, ол құрылғы таңдалып "
+#~ "тұрған кезінде баптау батырмасына басыңыз (сайман суретшесі бар).\n"
+#~ "\n"
+#~ "Жаңа файлдық жүйені + батырмасын басу арқылы қосу кезінде, құрылғыны "
+#~ "қолжетерлік бос орынды толығымен қолданатындай етіп орнату үшін, өлшемді "
+#~ "көрсету өрісін бос қалдырыңыз.\n"
+#~ "\n"
+#~ "LVM томдар тобы сияқты контейнер құрылғысынан соңғы құрылғыны өшіру "
+#~ "кезінде, жаңа құрылғыларға жол ашу үшін ол контейнер құрылғысының өзі де "
+#~ "өшіріледі.\n"
+#~ "\n"
+#~ "Дисктен соңғы бөлім өшірілген кезде, ол диск жаңа бөлімдеу кестесімен "
+#~ "қайта инициализациядан өтуі мүмкін, егер ол диск үшін сәйкес келетін түрі "
+#~ "табылса.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "ЖЕЛІ БАПТАУЛАРЫ"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Дестелер метаақпаратын жүктеп алу сәтсіз..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Ешнәрсе таңдалмады"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware жоқ"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Аутентификация керек"
+
+#~ msgid "column"
+#~ msgstr "баған"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Бөлім түрі:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Прокси сілтемесі</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Пайдаланушы аты</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Пароль</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Бұл тіркеу нүктесі дұрыс емес. Басқасын көру керек пе?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Белгі:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Файлдық жүйесі:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID құрылғысы"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Таңдалған тіркеу нүктесін баптау."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Көмек алу үшін шертіңіз"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ҚОЛЖЕТЕРЛІК ОРНЫ</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">БҮКІЛ ОРНЫ</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Аяқталды"
 
@@ -4391,41 +6422,9 @@ msgstr "Жабу"
 #~ msgid "Install on System"
 #~ msgstr "Жүйеге орнату"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Келесі қате орнату репозиторийін іске қосу кезінде орын алды:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Орнатуды жалғастыру мүмкін емес."
-
 #~ msgid "Exit installer"
 #~ msgstr "Орнатқыштан шығу"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Орнату құрылғылық сияқты қате салдарынан тоқтатылды. Нақты қате "
-#~ "хабарламасы:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Орнатқыш өз жұмысын аяқтайды."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Құрылғылық қате кездесті"
-
 #~ msgid "_Exit installer"
 #~ msgstr "Орнатқы_штан шығу"
 
@@ -4719,9 +6718,6 @@ msgstr "Жабу"
 #~ msgid "Software Development"
 #~ msgstr "Бағдарламалық қамтаманы өндіру"
 
-#~ msgid "Web Server"
-#~ msgstr "Веб сервер"
-
 #~ msgid "Minimal"
 #~ msgstr "Минималды"
 
@@ -4766,47 +6762,6 @@ msgstr "Жабу"
 #~ "кеңейтілген диск бөлімі болып табылады:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "%s орнатуын жалғастыру үшін керек түбірлік (root) бөлімі (/) көрсетілмеді."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "Түбірлік (root) көлемі 250 МБ-тан кем, ол %s орнату үшін тым аз."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Бұл платформа /boot бөлімін жеке бөлімде не логикалық томда болуын талап "
-#~ "етеді. Егер жеке /boot бөлімін қаламасаңыз, түбірлік (/) бумасын жеке LVM-"
-#~ "емес бөліміне орналастыру керек. "
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s бөлімінің өлшемі %(size)s мегабайттан аз, бұл қалыпты "
-#~ "%(productName)s орнатуы үшін ұсынылатын шамадан аз."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s бөлімі %(format)s пішімдеуі үшін тым кіші (рұқсат етілетін "
-#~ "өлшемі %(minSize)d МБ-тан бастап, %(maxSize)d МБ-қа дейін)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(mount)s бөлімі %(format)s пішімдеуі үшін тым үлкен (рұқсат етілетін "
-#~ "өлшемі %(minSize)d МБ-тан бастап, %(maxSize)d МБ-қа дейін)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4823,53 +6778,6 @@ msgstr "Жабу"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "жүктеушінің stage1 мақсат құрылғысы жасалмады"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Жүктелетін бөлім жасалмады."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Сіздің BIOS-қа негізделген жүйеңіз %s жаңа диск белгісімен (GPT) жүктелу "
-#~ "үшін арнайы бөлімді талап етеді. Жалғастыру үшін, өлшемі 1 МБ 'BIOS Boot' "
-#~ "түріндегі бөлімді жасаңыз."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Swap бөлімі көрсетілмеді. Swap бөлімсіз орнатуды жалғастыру үшін "
-#~ "%(requiredMem)s МБ жады керек, ал сізде тек %(installedMem)s МБ бар."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Swap бөлімі көрсетілмеді. Swap бөлімі міндетті емес болғанымен де, көп "
-#~ "жағдайда орнатудың өнімділігін арттыра алады."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Swap құрылғылардың кем дегенде біреуінде UUID жоқ, бұл mkswap-тың ескі "
-#~ "нұсқаларымен жасалған swap аймағына тән қасиет. Осындай құрылғылар /etc/"
-#~ "fstab ішінде құрылғы жолы арқылы көрсетіледі, ал, құрылғылар жолдары көп "
-#~ "себептен өзгере алатындықтан, бұл ең тиімді шешім емес."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "Бұл тіркеу нүктесі қате.  %s бумасы / файлдық жүйесінде болуы тиіс."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s тіркеу нүктесі linux файлдық жүйесінде болуы тиіс."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux, орналасқан жері %s"
 
@@ -4879,10 +6787,6 @@ msgstr "Жабу"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s, %(arch)s үшін"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD құрылғысын пішімдеу"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD құрылғыны Linux-пен қолдануға дайындау..."
@@ -5150,9 +7054,6 @@ msgstr "Жабу"
 #~ msgid "Error setting root password"
 #~ msgstr "Root паролін орнату сәтсіз"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Сізге парольді көрсетіп, оны растау керек."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "Дестелерді ө_шіру"
 
@@ -5185,24 +7086,12 @@ msgstr "Жабу"
 #~ msgid "%s of %s"
 #~ msgstr "%s, барлығы %s"
 
-#~ msgid "Region:"
-#~ msgstr "Аймақ:"
-
-#~ msgid "City:"
-#~ msgstr "Қала:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 сағат"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Қосымшалаларды таңдаңыз"
 
@@ -5290,9 +7179,6 @@ msgstr "Жабу"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "Бөлімдеуді а_яқтау"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "ТОМДАР ТОБЫН БАПТАУ"
 
diff --git a/anaconda/po/kn.po b/anaconda/po/kn.po
index 3f9f917..3d60629 100644
--- a/anaconda/po/kn.po
+++ b/anaconda/po/kn.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/"
@@ -28,11 +28,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot filesystem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -41,7 +41,7 @@ msgstr ""
 "'%s' ಅನ್ನು ಹೊಂದಿರುವ RAID ಸೆಟ್‌ಗಳು ಈ ಕೆಳಗಿನ raid ಹಂತಗಳಲ್ಲಿ ಕನಿಷ್ಟ ಒಂದು raid "
 "ಹೊಂದಿರಬೇಕು: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -50,7 +50,7 @@ msgstr ""
 "'%s' ಅನ್ನು ಹೊಂದಿರುವ RAID ಸೆಟ್‌ಗಳು ಈ ಕೆಳಗಿನ ಮೆಟಾಡೇಟ ಆವೃತ್ತಿಗಳಲ್ಲಿ ಕನಿಷ್ಟ ಒಂದನ್ನು "
 "ಹೊಂದಿರಬೇಕು: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -59,186 +59,450 @@ msgstr ""
 "'%s' ಅನ್ನು ಹೊಂದಿರುವ RAID ಸೆಟ್‌ಗಳು ಈ ಕೆಳಗಿನ ಸಾಧನಗಳಲ್ಲಿ ಕನಿಷ್ಟ ಒಂದನ್ನು ಹೊಂದಿರಬೇಕು: "
 "%s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s ಎಂಬಲ್ಲಿ ಈ ಕೆಳಗಿನ ಬಗೆಯ ಡಿಸ್ಕ್‍ಲೇಬಲ್‌ಗಳಲ್ಲಿ ಒಂದು ಇರಬೇಕು: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s ಎನ್ನುವುದು %s ಯ ಬಗೆಯದ್ದಾಗಿರಬಾರದು."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s ಎನ್ನುವುದು %d ಹಾಗು %d MB ನಡುವಿನ ಗಾತ್ರವನ್ನು ಹೊಂದಿರಬೇಕು"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s ಎನ್ನುವುದು %dMB ಗಿಂತ ಚಿಕ್ಕದಾಗಿರಬೇಕು."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s ಎನ್ನುವುದು %dMB ಗಿಂತ ದೊಡ್ಡದಾಗಿರಬೇಕು."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s ಎನ್ನುವುದು ಮೊದಲ %dMB ಡಿಸ್ಕಿನಲ್ಲಿ ಇರಬೇಕು."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ಎನ್ನುವುದು ಗೂಢಲಿಪೀಕರಿಸಲಾದ ಖಂಡ ಸಾಧನವಾಗಿರಬಾರದು."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ಎನ್ನುವುದು %s ಯ ಬಗೆಯದ್ದಾಗಿರಬಾರದು"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC ಪ್ರಾರಂಭಿಸು"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "ಪಠ್ಯವಿಧಾನವನ್ನು ಬಳಸು"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ಸರಿ"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"ಅನುಸ್ಥಾಪನಾ ರೆಪೊಸಿಟರಿಯನ್ನು ಸಿದ್ಧಗೊಳಿಸುವಲ್ಲಿ ಈ ಕೆಳಗಿನ ದೋಷವು ಎದುರಾಗಿದೆ:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ಅನುಸ್ಥಾಪನೆಯನ್ನು ಮುಂದುವರೆಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"ಅನುಸ್ಥಾಪನಾ ರೆಪೊಸಿಟರಿಯನ್ನು ಸಿದ್ಧಗೊಳಿಸುವಲ್ಲಿ ಈ ಕೆಳಗಿನ ದೋಷವು ಎದುರಾಗಿದೆ:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ಅನುಸ್ಥಾಪನೆಯನ್ನು ಮುಂದುವರೆಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"ನಿಮ್ಮ ಯಂತ್ರಾಂಶದಲ್ಲಿ ಇರಬಹುದಾದ ಒಂದು ತೊಂದರೆಯ ಕಾರಣದಿಂದಾಗಿ ಅನುಸ್ಥಾಪನೆಯು ನಿಂತು ಹೋಗಿದೆ. "
+"ನಿಖರವಾದ ದೋಷ ಸಂದೇಶವು ಹೀಗಿದೆ:\n"
+"\n"
+"%s.\n"
+"\n"
+" ಅನುಸ್ಥಾಪಕವು ಈಗ ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"ನಿಮ್ಮ ಯಂತ್ರಾಂಶದಲ್ಲಿ ಇರಬಹುದಾದ ಒಂದು ತೊಂದರೆಯ ಕಾರಣದಿಂದಾಗಿ ಅನುಸ್ಥಾಪನೆಯು ನಿಂತು ಹೋಗಿದೆ. "
+"ನಿಖರವಾದ ದೋಷ ಸಂದೇಶವು ಹೀಗಿದೆ:\n"
+"\n"
+"%s.\n"
+"\n"
+" ಅನುಸ್ಥಾಪಕವು ಈಗ ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "ಯಂತ್ರಾಂಶ ದೋಷವು ಕಂಡುಬಂದಿದೆ"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"ನಿಮ್ಮ ಯಂತ್ರಾಂಶದಲ್ಲಿ ಇರಬಹುದಾದ ಒಂದು ತೊಂದರೆಯ ಕಾರಣದಿಂದಾಗಿ ಅನುಸ್ಥಾಪನೆಯು ನಿಂತು ಹೋಗಿದೆ. "
+"ನಿಖರವಾದ ದೋಷ ಸಂದೇಶವು ಹೀಗಿದೆ:\n"
+"\n"
+"%s.\n"
+"\n"
+" ಅನುಸ್ಥಾಪಕವು ಈಗ ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ಅನುಸ್ಥಾಪನಾ-ಪೂರ್ವ ಸ್ಕ್ರಿಪ್ಟ್‍ಗಳನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಲಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ಅನುಸ್ಥಾಪನಾ ಪ್ರಕ್ರಿಯೆಯನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "ಅನುಸ್ಥಾಪನಾ ನಂತರದ ಸಂರಚನೆಗಳು ನೆರವೇರುತ್ತಿವೆ"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -250,87 +514,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ಅನುಸ್ಥಾಪನಾ-ಪೂರ್ವ ಸ್ಕ್ರಿಪ್ಟ್‍ಗಳನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಲಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ಆತಿಥೇಯನಾಮ ೨೫೫ ಅಕ್ಷರಗಳನ್ನು ಅಥವ ಅದಕ್ಕಿಂತ ಕಡಿಮೆ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"ಆತಿಥೇಯನಾಮವು 'a-z', 'A-Z', 0-9, '-' ಅಥವ '.' ವ್ಯಾಪ್ತಿಯ ಒಳಗಿರುವ ಮಾನ್ಯವಾದ ಅಕ್ಷರಗಳಿಂದ "
-"ಮಾತ್ರ ಪ್ರಾರಂಭವಾಗಬೇಕು"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -339,7 +893,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s ಅನುಸ್ಥಾಪನೆ"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "ನೀವು ಪೂರ್ಣಗೊಳಿಸಿದ ನಂತರ ವ್ಯವಸ್ಥೆಯನ್ನು ಅವರೋಹಿಸಲು %s ಅನ್ನು ಚಲಾಯಿಸಿ."
@@ -353,8 +912,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "ಕಾರ್ಯಗತಗೊಳಿಸಲು /bin/sh ಅನ್ನು ಪತ್ತೆಮಾಡಲಾಗಿಲ್ಲ!  ಶೆಲ್‌ ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "ಪಾರುಗಾಣಿಸು"
 
@@ -392,21 +951,15 @@ msgstr "ಪಾರುಗಾಣಿಸಲ್ಪಡಬೇಕಾದ ವ್ಯವಸ
 msgid "Which device holds the root partition of your installation?"
 msgstr "ನಿಮ್ಮ ಅನುಸ್ಥಾಪನೆಯಲ್ಲಿ ಯಾವ ವಿಭಾಗವು ನಿರ್ವಾಹಣಾ(ರೂಟ್) ವಿಭಾಗವನ್ನು ಹೊಂದಿದೆ?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ಸರಿ"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "ನಿರ್ಗಮಿಸಿ"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "ನೀವು ಶೆಲ್‌ನಿಂದ ಹೊರನಡೆದೊಡನೆಯೇ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಣಕವು ಮರು ಬೂಟ್ ಆಗುತ್ತದೆ."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -416,7 +969,7 @@ msgstr ""
 "ರಿಟರ್ನ್ ಅನ್ನು ಒತ್ತುವುದರ ಮೂಲಕ fsck ಮಾಡಿ ವಿಭಾಗಗಳನ್ನು ಆರೋಹಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುವ ಶೆಲ್‌ "
 "ಅನ್ನು ಪಡೆಯಿರಿ. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -437,7 +990,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -450,28 +1003,221 @@ msgstr ""
 "\n"
 "ಒಂದು ಶೆಲ್ ಅನ್ನು ಪಡೆದುಕೊಳ್ಳಲು <return> ಅನ್ನು ಒತ್ತಿ."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "ನಿಮ್ಮಲ್ಲಿ ಲಿನಕ್ಸ್ ವಿಭಾಗಗಳಿಲ್ಲ.  ಮರಳಿ ಬೂಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "ಶೆಲ್‌ ಇಂದ ಹೊರನಡೆದೊಡನೆಯೇ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗಣಕವು ಮರು ಬೂಟ್ ಆಗುತ್ತದೆ."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "ಪಾರುಗಾಣಿಸುವ ಸ್ಥಿತಿ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "ನಿಮ್ಮಲ್ಲಿ ಯಾವುದೆ ಲಿನಕ್ಸ್ ವಿಭಾಗಗಳಿಲ್ಲ.  ಶೆಲ್‌ ಅನ್ನು ಪಡೆಯಲು ರಿಟರ್ನ್ ಅನ್ನು ಒತ್ತಿ. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯು %s ಕೋಶದಡಿಯಲ್ಲಿ ಆರೋಹಿಸಲ್ಪಟ್ಟಿದೆ."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"ನಿಮ್ಮ ನಿರ್ವಾಹಣಾ(ರೂಟ್)ವಿಭಾಗ ೨೫೦ ಮೆಗಾಬೈಟ್ ಗಳಿಗಿಂತಲೂ ಕಡಿಮೆಯದಾಗಿದ್ದು, ಸಾಮಾನ್ಯವಾಗಿ %s ನ "
+"ಅನುಸ್ಥಾಪನೆಗೆ ಅತಿ ಚಿಕ್ಕದಾಗಿದ್ದಾಗಿದೆ."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"%s ನ ಅನುಸ್ಥಾಪನೆಗೆ ಅಗತ್ಯವಾದ ನಿರ್ವಾಹಣಾ(ರೂಟ್)ವಿಭಾಗವನ್ನು (/) (root partition) ನೀವು "
+"ಗೊತ್ತುಪಡಿಸಿಲ್ಲ."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"ಈ ಪ್ಲಾಟ್‌ಫಾರ್ಮಿಗಾಗಿ ಒಂದು ಮೀಸಲಿಡಲಾದ ವಿಭಾಗ ಅಥವ ತಾರ್ಕಿಕ ಪರಿಮಾಣದಲ್ಲಿ /boot "
+"ಇರಬೇಕಾಗುತ್ತದೆ. ನಿಮಗೆ ಒಂದು /boot ಪರಿಮಾಣದ ಅಗತ್ಯವಿರದೆ ಇದ್ದಲ್ಲಿ, ನೀವು / ಅನ್ನು ಒಂದು "
+"LVM ವಿಭಾಗವಲ್ಲದ, ಮೀಸಲಿಡಲಾದ ಸ್ಥಳದಲ್ಲಿ ಇರಿಸಬೇಕು."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"ನಿಮ್ಮ %(mount)s ವಿಭಾಗದ ಗಾತ್ರವು %(size)s ಮೆಗಾಬೈಟ್ ಗಳಿಗಿಂತಲೂ ಕಡಿಮೆಯಾಗಿದ್ದು, ಇದು "
+"%(productName)s ನ ಸಾಮಾನ್ಯ ಅನುಸ್ಥಾಪನೆಗೆ ಶಿಫಾರಸುಮಾಡಿರುವುದಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(format)s ಫಾರ್ಮ್ಯಾಟ್‌ ಮಾಡಲು ನಿಮ್ಮ %(mount)s ವಿಭಾಗವು ಬಹಳ ಸಣ್ಣದಾಗಿದೆ (ಅನುಮತಿ ಇರುವ "
+"ಗಾತ್ರವು %(minSize)d MB ಇಂದ %(maxSize)d MB ಆಗಿರುತ್ತದೆ)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(format)s ಫಾರ್ಮ್ಯಾಟ್‌ ಮಾಡಲು ನಿಮ್ಮ %(mount)s ವಿಭಾಗವು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ (ಅನುಮತಿ ಇರುವ "
+"ಗಾತ್ರವು %(minSize)d MB ಇಂದ %(maxSize)d MB ಆಗಿರುತ್ತದೆ)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "ನೀವು ಒಂದು ಬೂಟ್ ಮಾಡಬಹುದಾದ ಮಾರ್ಗವನ್ನು ರಚಿಸಿಲ್ಲ."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"ನೀವು ಒಂದು ಸ್ವಾಪ್ ವಿಭಾಗವನ್ನು ಸೂಚಿಸಿಲ್ಲ.  ಸ್ವಾಪ್ ವಿಭಾಗವು ಇಲ್ಲದೆ ಅನುಸ್ಥಾಪನೆಯನ್ನು "
+"ಮುಂದುವರೆಸಲು %(requiredMem)s MB ಯಷ್ಟು ಮೆಮೊರಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ನೀವು ಕೇವಲ "
+"%(installedMem)s MB ಯನ್ನು ಮಾತ್ರ ಹೊಂದಿದ್ದೀರಿ."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"ನೀವು ಒಂದು ಸ್ವಾಪ್ ವಿಭಾಗವನ್ನು ನಿಗದಿಪಡಿಸಿಲ್ಲ. ಎಲ್ಲಾ ಸಮಯ್ದಲ್ಲೂ ಇದರ ಕಟ್ಟುನಿಟ್ಟಿನ ಆವಶ್ಯಕತೆ "
+"ಇರದಿದ್ದರೂ ಸಹ, ಬಹುತೇಕ ಅನುಸ್ಥಾಪನೆಗಳ ಕಾರ್ಯದಕ್ಷತೆಯು ಇದರಿಂದ ಉತ್ತಮಗೊಳ್ಳುತ್ತದೆ."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"ನಿಮ್ಮಲ್ಲಿನ ಸ್ವಾಪ್‌ ಸಾಧನಗಳಲ್ಲಿ ಕನಿಷ್ಟ ಒಂದು UUID ಯನ್ನು ಹೊಂದಿಲ್ಲ, ಇದು ಹಳೆಯ mkswap "
+"ಆವೃತ್ತಿಗಳಿಂದ ರಚಿಸಲಾದ ಸ್ವಾಪ್‌ ಜಾಗಗಳಲ್ಲಿ ಸಾಮಾನ್ಯವಾಗಿರುತ್ತದೆ. ಈ ಸಾಧನಗಳನ್ನು ಸಾಧನದ "
+"ಮಾರ್ಗಗಳನ್ನು ಸೂಚಿಸುವ ಮೂಲಕ /etc/fstab ಗುರುತಿಸಲಾಗುತ್ತದೆ, ಹಾಗು ವಿವಿಧ ಸಂದರ್ಭಗಳಲ್ಲಿ "
+"ಮಾರ್ಗಗಳು ಬದಲಾಗುವುದರಿಂದ ಇದು ಸೂಕ್ತವಲ್ಲ."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "ಈ ಆರೋಹಣಾ ತಾಣವು ಅಮಾನ್ಯವಾಗಿದೆ.  %s ಕೋಶವು / ಕಡತ ವ್ಯವಸ್ಥೆಯಲ್ಲಿರಬೇಕು."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s ಆರೋಹಣಾತಾಣವು ಲಿನಕ್ಸ್ ಕಡತ ವ್ಯವಸ್ಥೆಯಾಗಿರಬೇಕು."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -586,84 +1332,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "ಫೆಡೋರಾ (_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ಅನುಸ್ಥಾಪನಾ ಆಕರದಿಂದ ವ್ಯವಹಾರ ತಯಾರಾಗುತ್ತಿದೆ"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "ಪ್ಯಾಕೇಜ್‌ಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸುವಲ್ಲಿ ದೋಷ"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "ಕೆಳಕಂಡ ಕಡತ ವ್ಯವಸ್ಥೆಗಳಲ್ಲಿ ಹೆಚ್ಚಿನ ಸ್ಥಳ ಬೇಕಾಗುತ್ತದೆ:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ಅನುಸ್ಥಾಪನಾ ಆಕರದಿಂದ ವ್ಯವಹಾರ ತಯಾರಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "ಪ್ಯಾಕೇಜ್‌ಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸುವಲ್ಲಿ ದೋಷ"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ಅನುಸ್ಥಾಪನಾ ನಂತರ"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ಅನುಸ್ಥಾಪಿಸಲು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ಅನುಸ್ಥಾಪನಾ ನಂತರ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "ಆಜ್ಞಾಸಾಲು ಸ್ಥಿತಿಯಲ್ಲಿ ಒಂದು ಪ್ರಶ್ನೆ ಇರುವಂತಿಲ್ಲ!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ದೋಷ"
 
@@ -687,31 +1580,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -726,452 +1621,523 @@ msgstr ""
 "ಗಣಕಕ್ಕೆ ಸಂಪರ್ಕ ಬೆಳೆಸಿ, ಚಿತ್ರಾತ್ಮಕ ಅನುಸ್ಥಾಪನೆಯನ್ನು ನೆರವೇರಿಸುವುದೇ ಅಥವಾ ಪಠ್ಯಾತ್ಮಕ "
 "ಅನುಸ್ಥಾಪನೆಯೊಂದಿಗೆ ಮುಂದುವರೆಯುವುದೇ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "ಗುಪ್ತಪದ ಆರು ಸನ್ನೆಗಳಷ್ಟಾದರೂ ದೊಡ್ಡದಾಗಿರಬೇಕು."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "ಗುಪ್ತಪದ ಆರು ಸನ್ನೆಗಳಷ್ಟಾದರೂ ದೊಡ್ಡದಾಗಿರಬೇಕು."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ಕಡತ ವ್ಯವಸ್ಥೆ ಸಂರಚನೆಯ ಬಗೆಯು ಕಾಣಿಸುತ್ತಿಲ್ಲ"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ಅನುಸ್ಥಾಪನೆ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "ನವೀಕರಿಸಲಾದ ನಂತರದ ಸಂರಚನೆಗಳು ನೆರವೇರುತ್ತಿವೆ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC ಪ್ರಾರಂಭಿಸು"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ಅನುಸ್ಥಾಪನೆಯ ಮುನ್ನಡೆ"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ಅನುಸ್ಥಾಪನಾ ಆಕರದಿಂದ ವ್ಯವಹಾರ ತಯಾರಾಗುತ್ತಿದೆ"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "ಪ್ಯಾಕೇಜ್‌ಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸುವಲ್ಲಿ ದೋಷ"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "ಸಾಧನವು /boot ಅನ್ನು ಹೊಂದಿದೆ"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "ತಂತ್ರಾಂಶ ವಿಕಾಸನ"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ಎಚ್ಚರಿಕೆ"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1187,579 +2153,402 @@ msgstr "ಪ್ರಗತಿಯಲ್ಲಿದೆ"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s ಅನುಸ್ಥಾಪನೆ"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "ರೂಟ್ ಸಾಧನಕ್ಕಾಗಿ ನೀವು ಒಂದು ಹೊಸ ಕಡತವ್ಯವಸ್ಥೆಯನ್ನು ರಚಿಸಬೇಕು."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "ರೂಟ್ ಸಾಧನಕ್ಕಾಗಿ ನೀವು ಒಂದು ಹೊಸ ಕಡತವ್ಯವಸ್ಥೆಯನ್ನು ರಚಿಸಬೇಕು."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "ತಂತ್ರಾಂಶ ವಿಕಾಸನ"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1786,279 +2575,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ವಿಳಾಸ"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ವಿಳಾಸ"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "ತಂತ್ರಾಂಶ ವಿಕಾಸನ"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "ರೆಪೊಸಿಟರಿಯನ್ನು ಅಣಿಗೊಳಿಸುವಾದ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "ರೆಪೊಸಿಟರಿಯನ್ನು ಅಣಿಗೊಳಿಸುವಾದ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2066,14 +2879,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2082,127 +2895,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ಸಾಧನಗಳನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವಿಕೆ"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ಸರಿ"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2212,1019 +3046,1537 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s ಆರೋಹಣಾತಾಣವು ಲಿನಕ್ಸ್ ಕಡತ ವ್ಯವಸ್ಥೆಯಾಗಿರಬೇಕು."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "ರೂಟ್ ಸಾಧನಕ್ಕಾಗಿ ನೀವು ಒಂದು ಹೊಸ ಕಡತವ್ಯವಸ್ಥೆಯನ್ನು ರಚಿಸಬೇಕು."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s ಅನ್ನು %(device)s ನಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "ಮುಂದುವರೆ (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ಸರಿ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ಜಾಲ ಪರಿಚಾರಕ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "ದೃಢೀಕರಣೆ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ಯಾವುದೆ ಜಾಲ ಸಾಧನವು ಲಭ್ಯವಿಲ್ಲ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ಪಠ್ಯವಿಧಾನವನ್ನು ಬಳಸು"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ಸಾಮರ್ಥ್ಯ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ಸಾಧನ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "ಸೇರಿಸು (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "ದೃಢೀಕರಣೆ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ಯಾವುದೆ ಜಾಲ ಸಾಧನವು ಲಭ್ಯವಿಲ್ಲ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "ದೃಢೀಕರಣೆ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "ದೃಢೀಕರಣೆ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "ದೃಢೀಕರಣೆ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "ಸಂಪರ್ಕಗೊಂಡಿದೆ!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI ಕಡತ ವಿಭಾಗ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ಅನುಸ್ಥಾಪಕದಿಂದ ನಿರ್ಗಮಿಸು (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI ಕಡತ ವಿಭಾಗ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI ಕಡತ ವಿಭಾಗ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "ಸೇರಿಸು (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ಸರಿ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "ದೃಢೀಕರಣೆ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "ಸೇರಿಸು (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ಸರಿ"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID ಸಾಧನ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "ಸೇರಿಸು (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ಕಾರ್ಯಾಚರಣೆಯಲ್ಲಿನ ದೋಷ."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ಕಾರ್ಯಾಚರಣೆಯಲ್ಲಿನ ದೋಷ."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3232,649 +4584,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ಅನುಸ್ಥಾಪನಾ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ ಯಾವ ಭಾಷೆಯನ್ನು ಬಳಸಬೇಕೆಂದಿದ್ದೀರಿ?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "ಮುಂದುವರೆ (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "ದೃಢೀಕರಣೆ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ಖಾಲಿ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ಸಾಧನ"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "ಸೇರಿಸು (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "ಸಾಮರ್ಥ್ಯ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID ಸಾಧನ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID ಸಾಧನ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID ಸಾಧನ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "ದೃಢೀಕರಣೆ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ಸರಿ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 ವಿಳಾಸ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "ನೀವು ಒಂದು iSCSI ಆರಂಭಕದ ಹೆಸರನ್ನು ನೀಡಬೇಕು"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ಸರಿ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID ಸಾಧನ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ಖಾಲಿ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "ಸಾಮರ್ಥ್ಯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ಸಾಧನ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ಸರಿ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ಸಾಧನಗಳನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವಿಕೆ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "ದೃಢೀಕರಣೆ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ಸರಿ"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "ರದ್ದುಗೊಳಿಸು (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI ಕಡತ ವಿಭಾಗ"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ಅನುಸ್ಥಾಪನಾ ನಂತರ"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "ನವೀಕರಿಸಲಾದ ನಂತರದ ಸಂರಚನೆಗಳು ನೆರವೇರುತ್ತಿವೆ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "ಮರುಬೂಟ್ ಮಾಡು (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3888,16 +5631,16 @@ msgstr "ಅನುಸ್ಥಾಪಿಸು"
 msgid "Install the live CD to your hard disk"
 msgstr "ಲೈವ್ ಚಿತ್ರಿಕೆ ಹಾರ್ಡ್ ಡ್ರೈವಿಗೆ ಅನುಸ್ಥಾಪಿಸಿ"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "ಹಾರ್ಡ್ ಡ್ರೈವಿಗೆ ಅನುಸ್ಥಾಪಿಸುವುದನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3906,26 +5649,27 @@ msgstr ""
 "ಅನುಸ್ಥಾಪಿಸಲು %s ಕ್ಕಾಗಿ %s MB ಯಷ್ಟು ಮೆಮೊರಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ ಆದರೆ ನೀವು ಈ ಗಣಕದಲ್ಲಿ "
 "ಕೇವಲ %s MB ಯನ್ನು ಮಾತ್ರ ಹೊಂದಿದ್ದೀರಿ.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s ಚಿತ್ರಾತ್ಮಕ ಅನುಸ್ಥಾಪಕಕ್ಕೆ %s MB ಯಷ್ಟು ಮೆಮೊರಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ ಆದರೆ ನೀವು ಕೇವಲ %s MB "
 "ಯನ್ನು ಮಾತ್ರ ಹೊಂದಿದ್ದೀರಿ."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "ಬೇಕಾದಷ್ಟು RAM ಇಲ್ಲ"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3939,24 +5683,24 @@ msgstr ""
 "\n"
 " ನಿರ್ವಾಹಕ ಟರ್ಮಿನಲ್‌ನಿಂದ."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " ಪಠ್ಯವಿಧಾನವನ್ನ ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ದೋಷ"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ಚರಮೌಲ್ಯ (ವೇರಿಯೇಬಲ್) ನಿಗದಿಗೊಂಡಿಲ್ಲ. ಪಠ್ಯಾತ್ಮಕ ಶೈಲಿ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ಚಿತ್ರಾತ್ಮಕ ಅನುಸ್ಥಾಪನೆ ಲಭ್ಯವಿಲ್ಲ.  ಪಠ್ಯಾತ್ಮಕ ಕ್ರಮದಲ್ಲಿ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3967,36 +5711,57 @@ msgstr ""
 "ವಿನ್ಯಾಸ ಅಥವ ಪ್ಯಾಕೇಜು ಆಯ್ಕೆಗಳನ್ನು ಸೂಚಿಸಲು ಅವಕಾಶ ನೀಡುವುದಿಲ್ಲ. ಇದರ ಬದಲಿಗೆ ನೀವು VNC "
 "ಕ್ರಮವನ್ನು ಬಳಸಲು ಬಯಸುವಿರಾ?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "ಆತಿಥೇಯನಾಮವು 'a-z', 'A-Z', 0-9, '-' ಅಥವ '.' ವ್ಯಾಪ್ತಿಯ ಒಳಗಿರುವ ಮಾನ್ಯವಾದ "
+#~ "ಅಕ್ಷರಗಳಿಂದ ಮಾತ್ರ ಪ್ರಾರಂಭವಾಗಬೇಕು"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "ಕೆಳಕಂಡ ಕಡತ ವ್ಯವಸ್ಥೆಗಳಲ್ಲಿ ಹೆಚ್ಚಿನ ಸ್ಥಳ ಬೇಕಾಗುತ್ತದೆ:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "ಆಜ್ಞಾಸಾಲು ಸ್ಥಿತಿಯಲ್ಲಿ ಒಂದು ಪ್ರಶ್ನೆ ಇರುವಂತಿಲ್ಲ!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ಸಾಧನ"
+
 #~ msgid "Completed"
 #~ msgstr "ಪೂರ್ಣಗೊಂಡಿದೆ"
 
@@ -4045,44 +5810,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "ಗಣಕದಲ್ಲಿ ಅನುಸ್ಥಾಪಿಸು"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "ಅನುಸ್ಥಾಪನಾ ರೆಪೊಸಿಟರಿಯನ್ನು ಸಿದ್ಧಗೊಳಿಸುವಲ್ಲಿ ಈ ಕೆಳಗಿನ ದೋಷವು ಎದುರಾಗಿದೆ:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "ಅನುಸ್ಥಾಪನೆಯನ್ನು ಮುಂದುವರೆಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
-
 #~ msgid "Exit installer"
 #~ msgstr "ಅನುಸ್ಥಾಪಕದಿಂದ ನಿರ್ಗಮಿಸು"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "ನಿಮ್ಮ ಯಂತ್ರಾಂಶದಲ್ಲಿ ಇರಬಹುದಾದ ಒಂದು ತೊಂದರೆಯ ಕಾರಣದಿಂದಾಗಿ ಅನುಸ್ಥಾಪನೆಯು ನಿಂತು "
-#~ "ಹೋಗಿದೆ. ನಿಖರವಾದ ದೋಷ ಸಂದೇಶವು ಹೀಗಿದೆ:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " ಅನುಸ್ಥಾಪಕವು ಈಗ ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "ಯಂತ್ರಾಂಶ ದೋಷವು ಕಂಡುಬಂದಿದೆ"
-
-#~ msgid "_Exit installer"
-#~ msgstr "ಅನುಸ್ಥಾಪಕದಿಂದ ನಿರ್ಗಮಿಸು (_E)"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4179,9 +5909,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "%r ಎನ್ನುವ ರೆಪೊಸಿಟರಿಯಲ್ಲಿ ಸಂರಚನಾ ಹೆಸರು ಕಾಣುತ್ತಿಲ್ಲ, id ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ"
 
-#~ msgid "No Network Available"
-#~ msgstr "ಯಾವುದೆ ಜಾಲ ಸಾಧನವು ಲಭ್ಯವಿಲ್ಲ"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4189,9 +5916,6 @@ msgstr ""
 #~ "ಕೆಲವು ತಂತ್ರಾಂಶ ರೆಪೋಸಿಟರಿಗಳಿಗಾಗಿ ಜಾಲಬಂಧದ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ನಿಮ್ಮ ಗಣಕದಲ್ಲಿ "
 #~ "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸುವಲ್ಲಿ ಒಂದು ದೋಷವು ಕಂಡುಬಂದಿದೆ."
 
-#~ msgid "Re_boot"
-#~ msgstr "ಮರುಬೂಟ್ ಮಾಡು (_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "ಹೊರತಳ್ಳು(_E)"
 
@@ -4350,9 +6074,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "ಚಿತ್ರಾತ್ಮಕ ಗಣಕತೆರೆ"
 
-#~ msgid "Web Server"
-#~ msgstr "ಜಾಲ ಪರಿಚಾರಕ"
-
 #~ msgid "Minimal"
 #~ msgstr "ಕನಿಷ್ಟ ಅಗತ್ಯವಿರುವ"
 
@@ -4393,50 +6114,6 @@ msgstr ""
 #~ "ವಿಭಾಗಗಳನ್ನು ಹೊಂದಿದೆ:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "%s ನ ಅನುಸ್ಥಾಪನೆಗೆ ಅಗತ್ಯವಾದ ನಿರ್ವಾಹಣಾ(ರೂಟ್)ವಿಭಾಗವನ್ನು (/) (root partition) ನೀವು "
-#~ "ಗೊತ್ತುಪಡಿಸಿಲ್ಲ."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "ನಿಮ್ಮ ನಿರ್ವಾಹಣಾ(ರೂಟ್)ವಿಭಾಗ ೨೫೦ ಮೆಗಾಬೈಟ್ ಗಳಿಗಿಂತಲೂ ಕಡಿಮೆಯದಾಗಿದ್ದು, ಸಾಮಾನ್ಯವಾಗಿ "
-#~ "%s ನ ಅನುಸ್ಥಾಪನೆಗೆ ಅತಿ ಚಿಕ್ಕದಾಗಿದ್ದಾಗಿದೆ."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "ಈ ಪ್ಲಾಟ್‌ಫಾರ್ಮಿಗಾಗಿ ಒಂದು ಮೀಸಲಿಡಲಾದ ವಿಭಾಗ ಅಥವ ತಾರ್ಕಿಕ ಪರಿಮಾಣದಲ್ಲಿ /boot "
-#~ "ಇರಬೇಕಾಗುತ್ತದೆ. ನಿಮಗೆ ಒಂದು /boot ಪರಿಮಾಣದ ಅಗತ್ಯವಿರದೆ ಇದ್ದಲ್ಲಿ, ನೀವು / ಅನ್ನು ಒಂದು "
-#~ "LVM ವಿಭಾಗವಲ್ಲದ, ಮೀಸಲಿಡಲಾದ ಸ್ಥಳದಲ್ಲಿ ಇರಿಸಬೇಕು."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "ನಿಮ್ಮ %(mount)s ವಿಭಾಗದ ಗಾತ್ರವು %(size)s ಮೆಗಾಬೈಟ್ ಗಳಿಗಿಂತಲೂ ಕಡಿಮೆಯಾಗಿದ್ದು, ಇದು "
-#~ "%(productName)s ನ ಸಾಮಾನ್ಯ ಅನುಸ್ಥಾಪನೆಗೆ ಶಿಫಾರಸುಮಾಡಿರುವುದಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(format)s ಫಾರ್ಮ್ಯಾಟ್‌ ಮಾಡಲು ನಿಮ್ಮ %(mount)s ವಿಭಾಗವು ಬಹಳ ಸಣ್ಣದಾಗಿದೆ (ಅನುಮತಿ "
-#~ "ಇರುವ ಗಾತ್ರವು %(minSize)d MB ಇಂದ %(maxSize)d MB ಆಗಿರುತ್ತದೆ)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(format)s ಫಾರ್ಮ್ಯಾಟ್‌ ಮಾಡಲು ನಿಮ್ಮ %(mount)s ವಿಭಾಗವು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ (ಅನುಮತಿ "
-#~ "ಇರುವ ಗಾತ್ರವು %(minSize)d MB ಇಂದ %(maxSize)d MB ಆಗಿರುತ್ತದೆ)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4453,49 +6130,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "ನೀವು ಬೂಟ್‌ಲೋಡರ್ stage1 target device ಅನ್ನು ರಚಿಸಿದ್ದೀರಿ"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "ನೀವು ಒಂದು ಬೂಟ್ ಮಾಡಬಹುದಾದ ಮಾರ್ಗವನ್ನು ರಚಿಸಿಲ್ಲ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "ನೀವು ಒಂದು ಸ್ವಾಪ್ ವಿಭಾಗವನ್ನು ಸೂಚಿಸಿಲ್ಲ.  ಸ್ವಾಪ್ ವಿಭಾಗವು ಇಲ್ಲದೆ ಅನುಸ್ಥಾಪನೆಯನ್ನು "
-#~ "ಮುಂದುವರೆಸಲು %(requiredMem)s MB ಯಷ್ಟು ಮೆಮೊರಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ನೀವು ಕೇವಲ "
-#~ "%(installedMem)s MB ಯನ್ನು ಮಾತ್ರ ಹೊಂದಿದ್ದೀರಿ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "ನೀವು ಒಂದು ಸ್ವಾಪ್ ವಿಭಾಗವನ್ನು ನಿಗದಿಪಡಿಸಿಲ್ಲ. ಎಲ್ಲಾ ಸಮಯ್ದಲ್ಲೂ ಇದರ ಕಟ್ಟುನಿಟ್ಟಿನ "
-#~ "ಆವಶ್ಯಕತೆ ಇರದಿದ್ದರೂ ಸಹ, ಬಹುತೇಕ ಅನುಸ್ಥಾಪನೆಗಳ ಕಾರ್ಯದಕ್ಷತೆಯು ಇದರಿಂದ ಉತ್ತಮಗೊಳ್ಳುತ್ತದೆ."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "ನಿಮ್ಮಲ್ಲಿನ ಸ್ವಾಪ್‌ ಸಾಧನಗಳಲ್ಲಿ ಕನಿಷ್ಟ ಒಂದು UUID ಯನ್ನು ಹೊಂದಿಲ್ಲ, ಇದು ಹಳೆಯ mkswap "
-#~ "ಆವೃತ್ತಿಗಳಿಂದ ರಚಿಸಲಾದ ಸ್ವಾಪ್‌ ಜಾಗಗಳಲ್ಲಿ ಸಾಮಾನ್ಯವಾಗಿರುತ್ತದೆ. ಈ ಸಾಧನಗಳನ್ನು ಸಾಧನದ "
-#~ "ಮಾರ್ಗಗಳನ್ನು ಸೂಚಿಸುವ ಮೂಲಕ /etc/fstab ಗುರುತಿಸಲಾಗುತ್ತದೆ, ಹಾಗು ವಿವಿಧ ಸಂದರ್ಭಗಳಲ್ಲಿ "
-#~ "ಮಾರ್ಗಗಳು ಬದಲಾಗುವುದರಿಂದ ಇದು ಸೂಕ್ತವಲ್ಲ."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "ಈ ಆರೋಹಣಾ ತಾಣವು ಅಮಾನ್ಯವಾಗಿದೆ.  %s ಕೋಶವು / ಕಡತ ವ್ಯವಸ್ಥೆಯಲ್ಲಿರಬೇಕು."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s ಆರೋಹಣಾತಾಣವು ಲಿನಕ್ಸ್ ಕಡತ ವ್ಯವಸ್ಥೆಯಾಗಿರಬೇಕು."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ಸಾಧನಗಳನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವಿಕೆ"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD ಸಾಧನಗಳನ್ನು ಲಿನಕ್ಸಿನೊಂದಿಗೆ ಬಳಸಲು ಸಿದ್ಧಗೊಳಿಸುವಿಕೆ..."
diff --git a/anaconda/po/ko.po b/anaconda/po/ko.po
index cc0b0d8..dc656f8 100644
--- a/anaconda/po/ko.po
+++ b/anaconda/po/ko.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/fedora/language/"
@@ -31,11 +31,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot 파일 시스템"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -44,7 +44,7 @@ msgstr ""
 "'%s'이(가) 들어 있는 RAID 설정에는 다음과 같은 RAID 레벨 중 하나가 있어야 합"
 "니다: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -53,7 +53,7 @@ msgstr ""
 "'%s'이(가) 들어 있는 RAID 설정에는 다음과 같은 베타데이터 버전 중 하나가 있어"
 "야 합니다: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -62,192 +62,463 @@ msgstr ""
 "'%s'이(가) 들어 있는 RAID 설정에는 다음과 같은 장치 유형 중 하나가 있어야 합"
 "니다: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s에는 다음과 같은 디스크 레이블 유형 중 하나가 있어야 합니다: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s은(는) %s 유형이 될 수 없습니다."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s은(는) %s 중 하나에 마운트해야 합니다."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s 의 크기는 %d에서 %d MB 사이로 지정해 주셔야 합니다"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s의 크기는 %dMB 보다 작아야 합니다."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s의 크기는 %dMB 보다 커야 합니다."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s은(는) 디스크의 첫번째 %dMB 이내에 있어야 합니다."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s은(는) 첫 번째 파티션에 지정해야 합니다."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s은(는) 암호화된 블록 장치에 지정할 수 없습니다."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s은(는) %s 유형이 될 수 없습니다"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s에서 %s 파일 시스템을 사용하는 경우 core.img를 끼워넣기에 %s는 grub2의 공간"
 "이 부족할 수 있습니다 "
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC 시작"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "텍스트 모드 사용"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "암호가 설정되어 있습니다."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "암호가 일치하지 않습니다!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "취약한 암호입니다: %s 그래도 사용하시려면 완료를 누릅니다."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "취약한 암호입니다: %s 그래도 사용하시려면 완료를 누릅니다."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "취약 "
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "보통 "
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "양호 "
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "강력함 "
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "확인"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "예(_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "아니요(_ N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"설치 리포지터리를 설정하는 도중 다음과 같은 오류가 발생했습니다:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"설치를 계속 진행할 수 없습니다. "
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"설치 리포지터리를 설정하는 도중 다음과 같은 오류가 발생했습니다:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"설치를 계속 진행할 수 없습니다. "
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"설치 표시된 다음의 소프트웨어에 오류가 발생하였습니다. 이는 설치 소스와 관련"
+"된 오류인 것 같습니다.\n"
+"설치에서 이 패키지를 제거할 수 있습니다.\n"
+"설치 소스를 변경하거나 설치 프로그램을 종료합니다."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"하드웨어에 문제가 있어 설치가 중지되었습니다. 정확한 오류 메세지는 다음과 같"
+"습니다:\n"
+"\n"
+"%s.\n"
+"\n"
+"설치 프로그램을 종료합니다. "
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"하드웨어에 문제가 있어 설치가 중지되었습니다. 정확한 오류 메세지는 다음과 같"
+"습니다:\n"
+"\n"
+"%s.\n"
+"\n"
+"설치 프로그램을 종료합니다. "
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "하드웨어 오류 발생 "
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"하드웨어에 문제가 있어 설치가 중지되었습니다. 정확한 오류 메세지는 다음과 같"
+"습니다:\n"
+"\n"
+"%s.\n"
+"\n"
+"설치 프로그램을 종료합니다. "
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "설정 URL(_ C)"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "설치전 스크립트를 실행 중 입니다 "
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "설치 소스를 설정 중..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "설치 후 설정을 하고 있습니다"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "에스크로 인증서 %s에 네트워크가 필요합니다. "
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -259,87 +530,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s이 누락되어 있습니다. 방화벽을 설정할 수 없습니다."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s이 누락되어 있습니다. 방화벽을 설정할 수 없습니다."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "이 파일 시스템은 레이블을 지원하지 않습니다."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "설치전 스크립트를 실행 중 입니다 "
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "호스트명은 255자 이하의 문자로 구성되어야 합니다."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"호스트명의 첫 문자는 영문자 'a-z', 'A-Z' 또는 '0-9' 사이의 문자만을 이용하여 "
-"지정하셔야 합니다."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "연결 중..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "연결 해제 중..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "유선 (%s) 연결됨"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "%s로의 무선 연결 "
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "연결되지 않음"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "사용 가능한 네트워크 장치가 없음"
 
@@ -348,7 +909,12 @@ msgstr "사용 가능한 네트워크 장치가 없음"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "새로운 %s %s 설치"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "완료 시 시스템을 마운트 해제하기 위해 %s을(를) 실행합니다."
@@ -361,8 +927,8 @@ msgstr "작업을 완료하신 후에 쉘에서 빠져 나가면, 시스템이 
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "실행할 /bin/sh 를 찾을 수 없습니다! 쉘을 시작하지 않습니다 "
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "복구"
 
@@ -408,21 +974,15 @@ msgstr "복구할 시스템"
 msgid "Which device holds the root partition of your installation?"
 msgstr "시스템 설치를 위한 루트(/) 파티션은 어느 장치에 있습니까? "
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "확인"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "종료"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "쉘을 종료하면 시스템은 자동으로 재부팅됩니다."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -431,7 +991,7 @@ msgstr ""
 "마운트하지 않기로 결정하신 파일 시스템에 오류가 있습니다. 파티션을 마운트 해"
 "서 fsck 할 수 있는 쉘로 나가려면, [ENTER] 키를 누르십시오. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -452,7 +1012,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -465,28 +1025,241 @@ msgstr ""
 "\n"
 "쉘로 나가려면, <return> 키를 누르십시오."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Linux 파티션이 없습니다.  재부팅합니다.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "쉘에서 빠져 나가면, 시스템은 자동으로 재부팅됩니다."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "복구 모드"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "Linux 파티션이 없습니다. 쉘을 실행하려면 <enter> 키를 누르십시오.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "시스템이 %s 디렉토리에 마운트되었습니다."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "표준 파티션 "
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "디스크 "
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"사용중인 컴퓨터가 메모리 부족 상태에서 실행되고 있을 경우\n"
+"운영 체제는 'swap'영역을 사용합니다."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"사용중인 컴퓨터의 'boot' 영역에는 운영 체제 시작에 필요한 파일이\n"
+"저장되어 있습니다."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"사용중인 컴퓨터의 'root' 영역에는 코어 시스템 파일 및 애플리케이션이\n"
+"저장되어 있습니다. "
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"사용중인 컴퓨터의 'home' 영역에는 사용자의 모든 개인 정보 데이터가\n"
+"저장되어 있습니다."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS 부트 파티션은 BIOS 하드웨어에 있는 GPT 파티션 디스트에서\n"
+"부팅 가능해야 합니다."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PReP 부트 파티션은 일부 PPC 플랫폼에 있는 부트로더 설정\n"
+"부분으로 필요합니다."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"현재 설정된 루트(/) 파티션의 용량이 250 MB 보다 작습니다. %s를 설치하기에는 "
+"설정된 용량이 너무 작습니다."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"루트(/) 파티션을 지정하지 않으셨습니다. %s 설치를 계속하시려면, 반드시 지정"
+"해 주셔야 합니다."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"이 플랫폼에는 전용 파티션이나 논리 볼륨에 /boot가 필요합니다. /boot 볼륨을 원"
+"하지 않을 경우, 비 LVM 전용 파티션에 /를 배치해야 합니다. "
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"설정하신 %(mount)s 파티션의 용량이 %(size)s MB 보다 작습니다. 이 용량은 "
+"%(productName)s를 설치하기 위해 권장되는 일반적인 용량보다 작습니다."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"시스템의 %(mount)s 파티션 %(format)s 형식은 너무 작습니다. (사용 가능한 크기"
+"는 %(minSize)d MB에서 %(maxSize)d MB임)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"시스템의 %(mount)s 파티션 %(format)s 형식은 너무 큽니다. (사용 가능한 크기는 "
+"%(minSize)d MB에서  %(maxSize)d MB임)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "새 장치를 추가하지 못했습니다. 자세한 내용을 보려면 클릭하십시오."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "부트 파티션을 생성하지 않으셨습니다."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"%s의 새 디스크 레이블 형식 (GPT)으로 부팅하려면 BIOS 기반 시스템에는 특수 파"
+"티션이 필요합니다. 1MB 크기의 'BIOS Boot' 형식의 파티션을 생성하여 계속 진행"
+"하십시오."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"스왑 파티션을 지정하지 않으셨습니다. 스왑 파티션 없이 설치 작업을 계속할 경"
+"우 %(requiredMem)s MB의 메모리가 필요하지만 시스템에 %(installedMem)s MB 밖"
+"에 없습니다."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"스왑 파티션을 지정하지 않으셨습니다. 스왑 파티션을 반드시 지정해야 하는 것은 "
+"아니지만, 스왑 파티션을 지정하면 대부분의 시스템에서 큰 성능 향상을 가져올 "
+"수 있습니다."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"swap 장치 중 하나는 UUID를 가지고 있지 않습니다. 이는 이전 버전의 mkswap을 사"
+"용하여 생성된 swap 영역에서는 일반적입니다. 이러한 장치는 /etc/fstab에 있는 "
+"장치 경로로 참조됩니다. 다양한 상황에 따라 장치 경로가 변경될 수 있기 때문에 "
+"이상적인 방법은 없습니다. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"이 마운트 지점은 올바르지 않습니다. %s 디렉토리는 / 파일 시스템에 있어야 합니"
+"다."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s 마운트 지점은 linux 파일 시스템 상에 있어야 합니다.  "
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "암호문:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -596,87 +1369,238 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "입력된 VNC 암호는 최소 6 문자가 아닙니다.\n"
 "새 암호를 입력하십시오. 암호가 필요하지 않다면 비워 두십시오."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "Fedora(_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "설치 소스를 설정하는데 실패했습니다 "
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "패키지 메타데이터를 다운로드하는 도중 오류 발생..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "사용 가능한 설치 소스가 없음"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "소프트웨어 설치 중"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "패키지 설치 프로세스 시작 중"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "다음의 파일 시스템에서 더 많은 공간이 필요합니다:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "설치 소스에서 트랜잭션을 준비하고 있습니다 "
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "설치 중"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "패키지 메타데이터 다운로드 중..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "설치 중"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "설치 준비 "
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "스토리지 설정 확인 중..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "기본 제목"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "현지화"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "현지화"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "소프트웨어"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "시스템"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "설치 Hub"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "자동 설치 시작 중 "
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "명령행 모드에서 질문할 수 없습니다!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "위에서 [종료하려면 'q' | 계속 진행하려면 'c']를 선택하십시오:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "계속 진행하지 전 모든 spoke를 완료하십시오"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "기본 HUB 제목"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "계속 진행하지 전 모든 spoke를 완료하십시오"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "오류"
 
@@ -700,32 +1624,35 @@ msgstr "예"
 msgid "no"
 msgstr "아니요"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "정말로 종료하시겠습니까?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "위에서 [종료하려면 'q' | 계속 진행하려면 'c']를 선택하십시오:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -739,219 +1666,258 @@ msgstr ""
 "X가 시스템에 실행되지 않았습니다. 다른 컴퓨터에서 이 컴퓨터에 VNC 연결하여 그"
 "래픽 설치를 하시겠습니까 아니면 텍스트 모드로 설치를 계속 하시겠습니까?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC 암호 "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "VNC 암호를 입력하십시오. 두 번 입력하셔야 합니다. \n"
 "암호가 필요하지 않은 경우 비워 두십시오"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "암호:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "암호 (확인):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "암호가 일치하지 않습니다!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "암호는 최소 6자 이상이어야 합니다."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "암호는 최소 6자 이상이어야 합니다."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "시간대 설정"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "시간대가 설정되어 있지 않습니다. "
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "사용 가능 지역 "
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "사용 가능 지역 "
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "스토리지 설정 확인 중..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "유선 (%s) 연결됨"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "유선 (%s) 연결됨"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "호스트명 "
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "호스트명 "
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "호스트명 "
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "설정 완료(_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "게이트웨이"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "파일 시스템 설정에 유형이 빠져 있습니다 "
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root 암호:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "암호가 설정되어 있습니다."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root 계정이 비활성화되어 있습니다."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "암호가 설정되어 있지 않습니다."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "새 root 암호를 선택해 주십시오. 두 번 입력하셔야 합니다."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "암호:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "모든 공간 사용"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "기존의 Linux 시스템 교체"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "여유공간 사용"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "설치 목적지"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "선택한 디스크가 없음"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "스토리지 설정 확인 중 오류 발생"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "스토리지 설정 확인 중 오류 발생"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "자동 파티션 설정 선택"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "사용자 지정 파티션 설정 선택"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -959,40 +1925,61 @@ msgstr ""
 "디스크를 검색할 수 없습니다. 컴퓨터를 종료하고 최소 1 개의 디스트에 연결한 "
 "후 설치 완료를 위해 다시 시작합니다."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "디스크가 선택되어 있지 않습니다; 설치할 최소 하나의 디스크를 선택해 주셔야 합"
 "니다."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "스토리지 탐색 중..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "업데이트된 스토리지 설정을 생성 중 "
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "스토리지 설정 실패: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "스토리지 설정 확인 중..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "자동 파티션 설정 옵션 "
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1001,41 +1988,41 @@ msgstr ""
 "설치시 하드 드라이브를 파티션 설정해야 합니다. 설치 대상으로 사용할 공간을 선"
 "택하십시오."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "파티션 스키마 설정 "
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "파티션 스키마 설정 "
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "시간대 설정"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s 시간대"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "시간대가 설정되어 있지 않습니다. "
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "%s 지역에서 사용 가능한 시간대"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "사용 가능 지역 "
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1043,178 +2030,196 @@ msgstr ""
 "시간대를 선택하십시오.\n"
 "숫자나 유형 이름을 직접 사용합니다 [b: 지역 목록, q: 종료]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC 시작"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "설치 절차"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "최근 미러"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS 서버 %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "소프트웨어 소스 설정 오류"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "아무것도 선택되지 않음"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "연결 중..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD 드라이브 "
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO 파일(_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "네트워크 시간"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "사용 가능한 설치 소스가 없음"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "설치 소스를 설정하는데 실패했습니다 "
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "패키지 메타데이터를 다운로드하는 도중 오류 발생..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "사용 가능한 설치 소스가 없음"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS 서버 %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS 마운트 옵션:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "설치 소스를 설정하는데 실패했습니다. 리포지터리 url을 확인하십시오"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot가 들어있는 장치 "
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "설치 소스를 설정하는데 실패했습니다 "
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "소프트웨어 선택 수정(_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "소프트웨어 선택 확인 중 오류 발생"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "설치 소스가 설정되지 않음"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "사용자 지정 소프트웨어가 선택됨"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "설치 소스가 설정되지 않음"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "환경 선택"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "인증 사용(_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "암호를 입력하고 확인해야 합니다."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "경고"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1230,112 +2235,99 @@ msgstr "진행 중"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\t설치가 완료되었습니다. 종료하려면 돌아가기를 누르십시오"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "기본 spoke 제목"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "상태 테스트 중..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "새 장치"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "암호 (확인):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "취약한 암호입니다: %s 그래도 사용하시려면 완료를 누릅니다."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "취약한 암호입니다: %s 그래도 사용하시려면 완료를 누릅니다."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "암호가 설정되어 있습니다."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "설치 프로그램 종료(_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "종료(_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "아니요(_ N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "예(_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "기본 제목"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "현지화"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "현지화"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "소프트웨어"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "시스템"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "다음 단계를 계속 진행하기 전 이 아이콘으로 표시된 항목을 완료하십시오."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "완료되었습니다!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1344,165 +2336,66 @@ msgstr ""
 "현재 %s은 시스템에 성공적으로 설치되어 사용할 준비가 되었습니다!\n"
 "재부팅하여 이를 사용 시작합니다!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "완료되었습니다!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "종료(_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "새로운 %s %s 설치"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s이(가) 성공적으로 시스템에 설치되었지만 아직 일부 설정을 실행해야 합니"
+"다. \n"
+"이를 완료한 후 설정 완료 버튼을 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"현재 %s은 시스템에 성공적으로 설치되어 사용할 준비가 되었습니다!\n"
+"재부팅하여 이를 사용 시작합니다!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "장치 재설정을 실패했습니다. 자세한 내용을 보려면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "컬럼"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "복구할 수 없는 오류로 인해 스토리지 설정이 리셋되었습니다. 자세한 내용을 보려"
 "면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "장치 재설정을 실패했습니다. 자세한 내용을 보려면 클릭하십시오."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "유효한 마운트 지점을 입력하십시오."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "마운트 지점이 잘못되었습니다. 다른 것을 시도해 보시겠습니까?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-"이 마운트 지점은 이미 사용되고 있습니다. 다른 것을 시도해 보시겠습니까?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "선택한 RAID 레벨에는 현재 선택한 것 보다 많은 디스크가 필요합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "유효한 마운트 지점을 입력하십시오."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "마운트 지점이 잘못되었습니다. 다른 것을 시도해 보시겠습니까?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "표준 파티션 "
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "디스크 "
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "없음"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s root에 있는 모든 다른 파일 시스템도 삭제합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "%s 상의 모든 데이터를 정말로 삭제하시겠습니까?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "%s 상의 모든 데이터를 정말로 삭제하시겠습니까?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "수동으로 파티션 설정 "
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d개의 스토리지 장치가 선택되어 있습니다"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1511,129 +2404,113 @@ msgstr ""
 "%s %s 설치의 마운트 지점을 생성할 때\n"
 "여기에서 상세 종보를 확인할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"사용중인 컴퓨터가 메모리 부족 상태에서 실행되고 있을 경우\n"
-"운영 체제는 'swap'영역을 사용합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"사용중인 컴퓨터의 'boot' 영역에는 운영 체제 시작에 필요한 파일이\n"
-"저장되어 있습니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"사용중인 컴퓨터의 'root' 영역에는 코어 시스템 파일 및 애플리케이션이\n"
-"저장되어 있습니다. "
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"사용중인 컴퓨터의 'home' 영역에는 사용자의 모든 개인 정보 데이터가\n"
-"저장되어 있습니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS 부트 파티션은 BIOS 하드웨어에 있는 GPT 파티션 디스트에서\n"
-"부팅 가능해야 합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PReP 부트 파티션은 일부 PPC 플랫폼에 있는 부트로더 설정\n"
-"부분으로 필요합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi는 유형 %s의 장치에 있어야 합니다 "
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s는 유형 %s의 장치에 있어야 합니다 "
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s은(는) 암호화할 수 없습니다 "
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "root 장치에 새 파일 시스템을 생성해야 합니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "유형 %s의 장치에는 유효한 RAID 레벨을 선택해야 합니다. "
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "장치 크기 조정 요청에 실패했습니다. 자세한 내용을 보려면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "장치 재포맷 요청을 실패했습니다. 자세한 내용을 보려면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "이 파일 시스템은 레이블을 지원하지 않습니다."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "선택한 디스크가 없음"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "이 파일 시스템은 크기 조정할 수 없습니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"스토리지 설정을 확인하는 도중 오류가 발생했습니다. 자세한 내용을 보려면 클릭"
+"하십시오."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"스토리지 설정을 확인하는 도중 오류가 발생했습니다. 자세한 내용을 보려면 클릭"
+"하십시오."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "새 장치를 추가하지 못했습니다. 자세한 내용을 보려면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "잘못된 파티션 크기가 설정되어 있습니다. 유효한 정수 값을 사용합니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "장치 제거 요청에 실패했습니다. 자세한 내용을 보려면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs free"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1641,7 +2518,7 @@ msgid ""
 msgstr ""
 "이 장치는 직접 편집할 수 없습니다. 이를 제거하거나 다른 장치를 선택합니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1649,196 +2526,144 @@ msgid ""
 msgstr ""
 "이 장치는 직접 편집할 수 없습니다. 이를 제거하거나 다른 장치를 선택합니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "디스크가 선택되어 있지 않습니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "선택한 디스크에 여유 공간이 충분하지 않습니다."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "자동 파티션 설정을 실패했습니다. 자세한 내용을 보려면 클릭하십시오."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "소프트웨어 선택 수정(_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "암호화된 블럭 장치를 잠금 해제 실패했습니다. 자세한 내용을 보려면 클릭하십시"
 "오 "
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "날짜 및 시간"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "잘못된 시간대"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "NTP를 사용하려면 먼저 네트워크를 설정해야 합니다"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "작동할 수 있는 NTP 서버 설정이 없습니다"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "설치 목적지"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d개의 스토리지 장치가 선택되어 있습니다"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s 레이아웃 전환 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "키보드"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "레이아웃 설정 테스트를 실행할 수 없습니다."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "상태 테스트 중..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "레이아웃 전환은 설정되어 있지 않습니다."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "언어"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "상태를 알 수 없음 (누락됨)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "상태를 알 수 없음"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "관리되지 않음"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "사용 불가능"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "펌웨어가 없습니다"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "케이블이 연결되어 있지 않습니다"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "사용 불가능"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "연결 해제됨"
@@ -1863,200 +2688,247 @@ msgstr "연결 해제 중"
 msgid "Connection failed"
 msgstr "연결 실패"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "연결되어 있지 않음"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "이더넷"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "무선"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "연결되어 있지 않음"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 주소 "
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 주소 "
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP 주소"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "기업"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "없음"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "인증이 필요합니다"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "암호:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "네트워크 설정"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT 암호"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "암호가 설정되어 있습니다."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root 암호가 설정되어 있음"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root 계정이 비활성화되어 있음"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root 암호가 설정되어 있지 않습니다 "
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "소프트웨어 선택"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "소프트웨어 종속성을 확인 중..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "소프트웨어 종속성 확인 중 오류 발생"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "패키지 메타데이터 다운로드 중..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "그룹 메타데이터 다운로드 중..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "소프트웨어 종속성을 확인 중..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "소프트웨어 종속성 확인 중 오류 발생"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "소프트웨어 종속성 확인 중 오류 발생. 보다 자세한 정보를 보려면 클릭합니다."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "설치 표시된 다음의 소프트웨어에 오류가 발생하였습니다. 이는 설치 소스와 관련"
 "된 오류인 것 같습니다.\n"
 "설치에서 이 패키지를 제거할 수 있습니다.\n"
 "설치 소스를 변경하거나 설치 프로그램을 종료합니다."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "취소(_C) "
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "종료(_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "소프트웨어 소스 수정(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "소프트웨어 선택 수정(_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "설치 소스를 설정 중..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "패키지 메타데이터를 다운로드하는 도중 오류 발생..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "인증이 필요합니다"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "이 미디어에서 설치하는 것이 좋습니다."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "이 미디어는 설치에 사용 적합하지 않습니다."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "설치 소스"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "설치 소스를 설정하는데 실패했습니다. 리포지터리 url을 확인하십시오"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "리포지터리 설정 오류  "
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "소프트웨어 소스 설정 오류"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2064,98 +2936,80 @@ msgstr ""
 "설치 소스를 설정하는데 실패했습니다. 리포지터리 url 및 proxy 설정을 확인하십"
 "시오"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "리포지터리 설정 오류  "
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "소프트웨어 소스 설정 오류"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "장치:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS 서버 %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "잘못된 시간대"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "잘못된 시간대"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "잘못된 시간대"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "잠시만 기다려 주십시오... 소프트웨어 메타데이터가 아직 로딩 중입니다."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "선택한 디스크에 다음과 같은 여유 공간이 있습니다:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "잠시만 기다려 주십시오... 소프트웨어 메타데이터가 아직 로딩 중입니다."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2165,7 +3019,7 @@ msgstr ""
 "<b>%s을(를) 설치하기 위해 사용 가능한 공간이 충분하지 않습니다</b> 하지만\n"
 "기존 파티션을 축소 또는 제거하여 공간을 확보할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2175,7 +3029,7 @@ msgstr ""
 "선택한 디스트에서 사용 가능한 여유 공간을 모두 사용해도 <b>%s</b>을(를)\n"
 "설치하기 위한 공간이 충분하지 않습니다."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2189,45 +3043,52 @@ msgstr ""
 "설치하기 위해 소프트웨어 선택을 수정하거나 또는 설치 프로그램을 종료할 수 있"
 "습니다."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "설치 목적지"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "스토리지 설정 저장 중..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "스토리지 설정 저장 실패..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD 장치 포맷중"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "스토리지 설정을 확인하는 도중 오류가 발생했습니다. 자세한 내용을 보려면 클릭"
 "하십시오."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "스토리지 설정을 확인하는 도중 오류가 발생했습니다. 자세한 내용을 보려면 클릭"
 "하십시오."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs free"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "선택된 디스크 수 %d; 용량 %s; 공간 %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2235,7 +3096,11 @@ msgstr ""
 "부트로더 설치를 생략하도록 선택합니다. 시스템은 부팅 불가능하게 될 수 있습니"
 "다."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2245,11 +3110,19 @@ msgstr ""
 "을 수정하거나 설치 프로그램을\n"
 "종료할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "스토리지 레이아웃 수정(_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2260,75 +3133,80 @@ msgstr ""
 "을 수정하거나 설치 프로그램을\n"
 "종료할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "확인"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "네트워크 설정"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "잘못된 시간대"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr " %s %s에 오신것을 환영합니다."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "데이터"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "%s %s 설치에 대한 마운트 지점을 아직 생성하지 않았습니다:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "여기를 클릭하여 자동으로 생성합니다."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "또는 '+' 아이콘을 사용하여 아래에 새 마운트 지점을 생성합니다."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2339,55 +3217,158 @@ msgid_plural ""
 msgstr[0] ""
 "<b>디스크 수 %d; 용량 %s ; 공간 %s </b> (파티션이 설정되지 않은 파일 시스템)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "부트 장치로 설정(_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "선택한 RAID 레벨에는 현재 선택한 것 보다 많은 디스크가 필요합니다."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "컬럼"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s 마운트 지점은 linux 파일 시스템 상에 있어야 합니다.  "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+"이 마운트 지점은 이미 사용되고 있습니다. 다른 것을 시도해 보시겠습니까?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "유효한 마운트 지점을 입력하십시오."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "마운트 지점이 잘못되었습니다. 다른 것을 시도해 보시겠습니까?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s root에 있는 모든 다른 파일 시스템도 삭제합니다."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "%s 상의 모든 데이터를 정말로 삭제하시겠습니까?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "%s 상의 모든 데이터를 정말로 삭제하시겠습니까?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "잘못된 시간대"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "입력하신 암호가 취약합니다: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "암호문이 일치하지 않습니다. "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "저장 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "축소 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "삭제 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s을 %(device)s에 생성 중"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "준비되지 않음"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "여유공간 사용"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2399,367 +3380,776 @@ msgstr ""
 "필요없는 기존 파일 시스템을 제거하여 설치를 위한 공간을 마련합니다. 파일 시스"
 "템을 제거하면 이에 들어 있는 모든 데이터가 영구적으로 삭제됩니다."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] "<b>%s 개의 디스크; %s 확보할 수 있는 공간</b> (파일 시스템에서)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "확보할 선택 공간 합계: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "삭제 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "저장 "
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "배포판 설치"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "SPOKE 이름"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "시험판 / 테스트 중 "
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "새 장치"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "새로운 선택기"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "완료(_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "계속 진행(_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "변경 사항 적용 (_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "네트워크 설정"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "그룹 이름"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "취소(_C) "
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "확인"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "날짜 및 시간"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "NTP 서버 사용을 위한 표시 및 추가 "
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "웹 서버  "
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "작동 중"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "사용"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "설정(_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "날짜 및 시간"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "지역:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "지역:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "도시: "
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "도시: "
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "네트워크 이름(_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "네트워크 이름"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 시간"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "설치 목적지"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "용량"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "연결되지 않음"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "선택한 장치"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "아무것도 선택되지 않음"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>레이블:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "펌웨어가 없습니다"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "아니요(_ N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN 유형"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "선택한 장치"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "요약"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID 장치"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "추가(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "디폴트 라우트"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "서브넷 마스크"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "속도"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "하드웨어 주소"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "계속 진행(_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "보안"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "네트워크 이름(_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "네트워크 이름"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "보안 키"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "핫스팟으로 사용(_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "핫스팟 중지(_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "설정(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "공급자"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "설정(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN 유형"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "게이트웨이"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "그룹 이름"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "그룹 암호"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "사용자명"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "설정(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "방식(_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "설정 URL(_ C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP 프록시(_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTP 프록시(_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP 프록시(_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "소켓 호스트(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "스토리지 설정 확인 중..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "잠금 해제"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "비행기 탑승 모드(_P)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "스토리지 설정 확인 중..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "호스트명 "
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "네트워크 설정"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2769,283 +4159,205 @@ msgstr ""
 "위해\n"
 "네트워크 액세스가 필요합니다. "
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "디폴트 라우트"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "서브넷 마스크"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "속도"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "하드웨어 주소"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "계속 진행(_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "보안"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "네트워크 이름(_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "네트워크 이름"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "보안 키"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "핫스팟으로 사용(_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "핫스팟 중지(_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "설정(_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "공급자"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN 유형"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "게이트웨이"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "그룹 이름"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "그룹 암호"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "사용자명"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "방식(_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "설정 URL(_ C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP 프록시(_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTP 프록시(_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP 프록시(_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "소켓 호스트(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "잠금 해제"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "비행기 탑승 모드(_P)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "호스트명 "
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "인증 사용(_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "인증이 필요합니다"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "연결됨"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "소프트웨어 선택"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "환경 선택"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "컬럼"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "더 많은 디스크를 삭제 및 추가(_A) "
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "설치 옵션"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>파티션 유형:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "데이터를 암호화합니다. 암호는 나중에 설정합니다."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "사용자 지정 파티션 설정 선택"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "공간 확보(_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "설치 옵션"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 "여기에서는 현재 소프트웨어 선택에 얼마 만큼의 공간이 필요한지를 설명합니다."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disk free"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "사용 가능한 여유 공간"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs free"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "사용 가능한 여유 공간이 없지만 기존 파티션에서 확보할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "여기에서 사용 가능한 옵션을 설명합니다."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "여유공간 사용"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "설치 프로그램 종료(_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "장치 설명"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "로컬 표준 디스크 "
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "파티션 설정 완료(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "암호화(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "자동 파티션 설정 선택"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "파티션 설정 완료(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "암호화(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "데이터를 암호화합니다. 암호는 나중에 설정합니다."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "자동 파티션 설정 옵션 "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "요약"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "전체 디스크 요약 및 옵션..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "키보드 레이아웃 추가 "
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "아래에서 선택하여 키보드 레이아웃을 추가할 수 있습니다:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "이름 "
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "키보드 레이아웃 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3053,358 +4365,487 @@ msgstr ""
 "시스템에서 사용하고자 하는 키보드 레이아웃을 선택하십시오. 레이아웃을 목록 "
 "맨 위로 옮겨 디폴트로 선택되도록 할 수 있습니다. "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "이름"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "레이아웃 추가 "
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "레이아웃 제거 "
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "선택한 레이아웃을 위로 이동 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "레이아웃 추가 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "레이아웃 제거 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "선택한 레이아웃을 위로 이동 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "선택한 레이아웃을 아래로 이동 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "레이아웃 미리 보기 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "레이아웃 설정 테스트를 실행할 수 없습니다."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "레이아웃을 전환하려면 Alt + Shift 키를 누릅니다."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "옵션(_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "추가(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "키보드 레이아웃 추가 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "아래에서 선택하여 키보드 레이아웃을 추가할 수 있습니다:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "이름 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "사용 가능 지역 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "레이아웃 추가 "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "확인"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "레이아웃 전환 옵션 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "전환할 키보드 레이아웃 조합을 선택하십시오."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "사용 "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "설명 "
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS 마운트 옵션:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "언어"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "아무것도 선택되지 않음"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT 암호"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root 암호:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "확인:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC 암호 "
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "root 암호 설정"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 "시스템 관리는 root계정을 사용합니다. root 사용자의 암호를 입력하십시오. "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "완료(_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "미디어 확인"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "미디어 확인 중, 잠시만 기다려 주십시오..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "추가(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "확인"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP 프록시 활성화(_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>프록시 URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>예:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "인증 사용(_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>사용자명</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "사용자명"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>암호</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "암호:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "설치 소스"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "사용하고자 하는 설치 소스는 무엇입니까?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "설치 미디어 자동 감지 (_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "장치:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>레이블:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "확인(_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO 파일(_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "장치:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO 선택(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "네트워크 상 (_n):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Proxy 설정(_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS 마운트 옵션:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "이 필드는 선택 사항입니다."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People 리포지터리"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "새 마운트 지점을 추가합니다."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "추가(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "선택한 마운트 지점을 제거힙니다 (s.)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "레이아웃 제거 "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "동작 오류."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "root 암호 설정"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "이름 "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>프록시 URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "사용자명"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "암호:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "마운트 지점이 잘못되었습니다. 다른 것을 시도해 보시겠습니까?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "여기서 나갑니다(_G)!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "동의합니다(_I)"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "이는 불안정한 시험판 소프트웨어입니다."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3416,199 +4857,262 @@ msgstr ""
 "께 공존해야 합니다. 차후의 OS는 의존할 수 있는 안정적인 OS가 아닙니다. 이는 "
 "단지 테스트를 목적으로 합니다. "
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr " %s %s에 오신것을 환영합니다."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "설치 과정에서 어떤 언어를 사용하길 원하십니까?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "계속 진행(_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "사용자명"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "그룹 이름"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "암호:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC 암호 "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "마운트 지점 추가(_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>원하는 용량:</b>  "
+msgid "Add a new mount point."
+msgstr "새 마운트 지점을 추가합니다."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>마운트 지점:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "추가(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "새 마운트 지점 추가 "
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"아래에 마운트 지점을 생성한 후 보다 많은\n"
-"사용자 정의 옵션을 사용할 수 있습니다."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"이 마운트 지점은 이미 사용되고 있습니다.\n"
-"다른 마운트 지점을 사용하시겠습니까?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "예: \"20 GB\", \"500mb\" (인용 부호 제외)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "삭제(_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "마운트 지점 설정 "
+msgid "Remove the selected mount point(s)."
+msgstr "선택한 마운트 지점을 제거힙니다 (s.)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "여유공간"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID 장치"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "레이아웃 제거 "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "Encrypt"
-msgstr "암호화(_E)"
+msgid "Reload storage configuration from disk."
+msgstr "스토리지 설정 실패: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "선택한 장치"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "장치 설명"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>마운트 지점:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>원하는 용량:</b>  "
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>레이블:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>장치 유형:</b>"
+msgid "Device(s):"
+msgstr "장치:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>파일 시스템:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "암호화(_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "다시 포맷 "
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "이름 "
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>장치 유형:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "암호화(_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "파일 시스템 "
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "다시 포맷 "
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "컬럼"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID 장치"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3616,312 +5120,588 @@ msgstr ""
 "이 장치는 암호화되어 유효한 암호문없이 읽을 수 없습니다. 아래에서 잠금 해제"
 "를 할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "암호문:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "잠금 해제(_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 "이 장치는 직접 편집할 수 없습니다. 이를 제거하거나 다른 장치를 선택합니다."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "새 마운트 지점을 추가합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "선택한 마운트 지점을 제거힙니다 (s.)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "선택한 마운트 지점을 설정합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "설정(_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "스토리지 설정 실패: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">사용 가능한 공간</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">전체 공간</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "취소(_C) "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "마운트 지점 설정 "
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "이 장치가 존재하는 하나 이상의 디스크를 선택합니다."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "확인"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP 주소"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "이니셰이터 이름을 입력해야만 합니다"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "인증 사용(_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>예:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "사용자명"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC 암호 "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "사용자명"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 암호 "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "사용자명"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC 암호 "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "네트워크 이름"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "인증 사용(_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "사용자명"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 암호 "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "사용자명"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 암호 "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "사용자명"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC 암호 "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "연결 실패"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "확인"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "장치:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "선택한 디스크"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "종료"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "부팅 "
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "설명"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "여유공간"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "레이아웃 제거 "
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "디스크 요약은 여기에 있습니다"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "삭제(_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "아무것도 선택되지 않음"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "마운트 지점 설정 "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "이 장치가 존재하는 하나 이상의 디스크를 선택합니다."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "마운트 지점 추가(_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>원하는 용량:</b>  "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>마운트 지점:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "새 마운트 지점 추가 "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"아래에 마운트 지점을 생성한 후 보다 많은\n"
+"사용자 정의 옵션을 사용할 수 있습니다."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"이 마운트 지점은 이미 사용되고 있습니다.\n"
+"다른 마운트 지점을 사용하시겠습니까?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "예: \"20 GB\", \"500mb\" (인용 부호 제외)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "마운트 지점 설정 "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "이름 "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID 장치"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "암호화(_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "유효한 마운트 지점을 입력하십시오."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "확인"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD 장치 포맷중"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "설치 도중 알 수 없는 오류가 발생했습니다. 자세한 내용은 아래와 같습니다."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "디스크 암호화 암호문 "
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "암호문 저장 "
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "디스크 암호화 암호문 "
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3930,7 +5710,19 @@ msgstr ""
 "데이터의 일부를 암호화할 것을 선택하셨습니다. 컴퓨터를 시작할 때 데이터에 액"
 "세스하기 위해 사용될 암호를 생성해야 합니다. "
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "암호문:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "확인:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3939,117 +5731,172 @@ msgstr ""
 "경고: 현재 키보드 레이아웃은 <b>%s</b>입니다. 키보드 레이아웃을 변경하면 설"
 "치 후 디스크를 해독하지 못 할 수 있습니다."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "디스크 공간 확보 "
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "취소(_C) "
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "확인"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "취소(_C) "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "공간 확보(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "디스크 공간 확보 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "설명 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "파일 시스템 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "확보 가능한 공간 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "동작 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "저장 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "삭제 "
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "축소 "
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "사용자 지정 파티션 설정 선택"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "변경 사항 적용 (_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "장치:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "마운트 지점 추가(_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "설치 프로그램 종료(_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "아니요(_ N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "예(_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4057,51 +5904,50 @@ msgstr ""
 "정말로 설치 프로그램을\n"
 "종료하시겠습니까?  "
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "종료(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "설치 요약 "
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "설치 시작(_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "설정 "
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "설치 준비 "
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s이(가) 성공적으로 시스템에 설치되었지만 아직 일부 설정을 실행해야 합니"
-"다. \n"
-"이를 완료한 후 설정 완료 버튼을 클릭하십시오."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "설정 완료(_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"현재 %s은 시스템에 성공적으로 설치되어 사용할 준비가 되었습니다!\n"
-"재부팅하여 이를 사용 시작합니다!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "재부팅(_R)"
 
@@ -4117,16 +5963,16 @@ msgstr "설치"
 msgid "Install the live CD to your hard disk"
 msgstr "라이브 CD를 하드 디스크에 설치합니다"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "하드 드라이브에 설치를 시작합니다"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Fedora에 오신것을 환영합니다 "
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4135,26 +5981,27 @@ msgstr ""
 "설치하기 위해 %s은(는) 최소 %s MB의 메모리가 필요합니다. 시스템에는 %s MB의 "
 "메모리만 있습니다.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s 그래픽 설치 프로그램은 최소 %s MB의 메모리가 필요합니다. 시스템에는 %s MB"
 "의 메모리만 있습니다."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "RAM 공간이 부족합니다"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4168,24 +6015,24 @@ msgstr ""
 "\n"
 "이 작업은 root 터미널에서 실행합니다."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "텍스트 모드로 시작합니다."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "오류"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY 변수가 설정되지 않았습니다. 텍스트 모드로 시작합니다."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "그래픽 모드 설치를 사용할 수 없습니다. 텍스트 모드로 설치합니다."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4195,20 +6042,20 @@ msgstr ""
 "텍스트 모드는 제한된 설치 옵션을 제공합니다.  원하는 파티션 레이아웃을 지정하"
 "거나 패키지를 선택할 수 없습니다. 대신 VNC 모드를 사용하시겠습니까?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "설치를 시작하기 위해 ssh install@%s를 실행하십시오."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "ssh install@<host>로 설치를 계속 진행하십시오."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora를 사용해 보십시오"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4218,7 +6065,7 @@ msgstr ""
 "지금 Fedora를 설치하거나 나중에 활동 개요에서 \"하드 드라이브에 설치\"를 선택"
 "할 수 있습니다. "
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4226,10 +6073,86 @@ msgstr ""
 "나중에 활동 개요에서 \"하드 드라이브에 설치\"를\n"
 "선택할 수 있습니다. "
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "종료"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "호스트명의 첫 문자는 영문자 'a-z', 'A-Z' 또는 '0-9' 사이의 문자만을 이용하"
+#~ "여 지정하셔야 합니다."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "다음의 파일 시스템에서 더 많은 공간이 필요합니다:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "명령행 모드에서 질문할 수 없습니다!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "마운트 지점이 잘못되었습니다. 다른 것을 시도해 보시겠습니까?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "패키지 메타데이터를 다운로드하는 도중 오류 발생..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "아무것도 선택되지 않음"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "펌웨어가 없습니다"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "인증이 필요합니다"
+
+#~ msgid "column"
+#~ msgstr "컬럼"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>파티션 유형:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>프록시 URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>사용자명</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>암호</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "마운트 지점이 잘못되었습니다. 다른 것을 시도해 보시겠습니까?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>레이블:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>파일 시스템:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID 장치"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "선택한 마운트 지점을 설정합니다."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">사용 가능한 공간</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">전체 공간</span>"
+
 #~ msgid "Completed"
 #~ msgstr "완료됨"
 
@@ -4278,41 +6201,9 @@ msgstr "종료"
 #~ msgid "Install on System"
 #~ msgstr "시스템에 설치"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "설치 리포지터리를 설정하는 도중 다음과 같은 오류가 발생했습니다:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "설치를 계속 진행할 수 없습니다. "
-
 #~ msgid "Exit installer"
 #~ msgstr "설치 프로그램 종료"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "하드웨어에 문제가 있어 설치가 중지되었습니다. 정확한 오류 메세지는 다음과 "
-#~ "같습니다:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "설치 프로그램을 종료합니다. "
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "하드웨어 오류 발생 "
-
 #~ msgid "_Exit installer"
 #~ msgstr "설치 프로그램 종료(_E)"
 
@@ -4597,9 +6488,6 @@ msgstr "종료"
 #~ msgid "Software Development"
 #~ msgstr "소프트웨어 개발"
 
-#~ msgid "Web Server"
-#~ msgstr "웹 서버  "
-
 #~ msgid "Minimal"
 #~ msgstr "최소"
 
@@ -4643,49 +6531,6 @@ msgstr "종료"
 #~ "이 장치는 삭제할 수 없는 논리 파티션이 들어있는 확장 파티션입니다:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "루트(/) 파티션을 지정하지 않으셨습니다. %s 설치를 계속하시려면, 반드시 지"
-#~ "정해 주셔야 합니다."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "현재 설정된 루트(/) 파티션의 용량이 250 MB 보다 작습니다. %s를 설치하기에"
-#~ "는 설정된 용량이 너무 작습니다."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "이 플랫폼에는 전용 파티션이나 논리 볼륨에 /boot가 필요합니다. /boot 볼륨"
-#~ "을 원하지 않을 경우, 비 LVM 전용 파티션에 /를 배치해야 합니다. "
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "설정하신 %(mount)s 파티션의 용량이 %(size)s MB 보다 작습니다. 이 용량은 "
-#~ "%(productName)s를 설치하기 위해 권장되는 일반적인 용량보다 작습니다."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "시스템의 %(mount)s 파티션 %(format)s 형식은 너무 작습니다. (사용 가능한 크"
-#~ "기는 %(minSize)d MB에서 %(maxSize)d MB임)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "시스템의 %(mount)s 파티션 %(format)s 형식은 너무 큽니다. (사용 가능한 크기"
-#~ "는 %(minSize)d MB에서  %(maxSize)d MB임)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4702,57 +6547,6 @@ msgstr "종료"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "부트로더 stage1 대상 장치를 만들 수 없습니다"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "부트 파티션을 생성하지 않으셨습니다."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "%s의 새 디스크 레이블 형식 (GPT)으로 부팅하려면 BIOS 기반 시스템에는 특수 "
-#~ "파티션이 필요합니다. 1MB 크기의 'BIOS Boot' 형식의 파티션을 생성하여 계속 "
-#~ "진행하십시오."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "스왑 파티션을 지정하지 않으셨습니다. 스왑 파티션 없이 설치 작업을 계속할 "
-#~ "경우 %(requiredMem)s MB의 메모리가 필요하지만 시스템에 %(installedMem)s "
-#~ "MB 밖에 없습니다."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "스왑 파티션을 지정하지 않으셨습니다. 스왑 파티션을 반드시 지정해야 하는 것"
-#~ "은 아니지만, 스왑 파티션을 지정하면 대부분의 시스템에서 큰 성능 향상을 가"
-#~ "져올 수 있습니다."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "swap 장치 중 하나는 UUID를 가지고 있지 않습니다. 이는 이전 버전의 mkswap"
-#~ "을 사용하여 생성된 swap 영역에서는 일반적입니다. 이러한 장치는 /etc/fstab"
-#~ "에 있는 장치 경로로 참조됩니다. 다양한 상황에 따라 장치 경로가 변경될 수 "
-#~ "있기 때문에 이상적인 방법은 없습니다. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "이 마운트 지점은 올바르지 않습니다. %s 디렉토리는 / 파일 시스템에 있어야 "
-#~ "합니다."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s 마운트 지점은 linux 파일 시스템 상에 있어야 합니다.  "
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s 상의 Linux"
 
@@ -4762,10 +6556,6 @@ msgstr "종료"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(arch)s 용 %(product)s Linux %(version)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD 장치 포맷중"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux에서 사용하도록 %d개의 DASD 장치를 준비하는 중"
@@ -4963,9 +6753,6 @@ msgstr "종료"
 #~ msgid "Error setting root password"
 #~ msgstr "root 암호 설정 도중 오류 발생"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "암호를 입력하고 확인해야 합니다."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "패키지 제거(_R)"
 
@@ -4985,24 +6772,12 @@ msgstr "종료"
 #~ msgid "%s of %s"
 #~ msgstr "%s 중 %s"
 
-#~ msgid "Region:"
-#~ msgstr "지역:"
-
-#~ msgid "City:"
-#~ msgstr "도시: "
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr "  "
 
-#~ msgid "24-hour"
-#~ msgstr "24 시간"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "애드온 기능 선택"
 
@@ -5075,9 +6850,6 @@ msgstr "종료"
 #~ msgid "configureButton"
 #~ msgstr "설정 버튼 "
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "파티션 설정 완료(_F)"
-
 #~ msgid "Id"
 #~ msgstr "Id"
 
diff --git a/anaconda/po/lt.po b/anaconda/po/lt.po
index b795e8d..e505c2e 100644
--- a/anaconda/po/lt.po
+++ b/anaconda/po/lt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/projects/p/fedora/"
@@ -21,18 +21,18 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot failų sistema"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "RAID aibės, turinčios „%s“, turi turėti vieną iš šių raid lygių: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "RAID aibės, turinčios „%s“, turi turėti vieną iš šių metaduomenų versijų: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -48,108 +48,129 @@ msgid ""
 msgstr ""
 "RAID aibės, turinčios „%s“, turi turėti vieną iš šių įrenginių tipų: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s turi turėti vieną iš šių disko etikečių tipų: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s negali tūri %s tipo."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s turi būti prijungta viename iš %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s turi būti tarp %d ir %d MB dydžio"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s turi būti ne mažesnis nei %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s negali būti didesnis nei %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s turi būti disko pirmuose %dMB."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s turi būti pirminis skirsnis."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s negali būti šifruotas blokinis įrenginys."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s negali būti %s tipo"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s gali neturėti pakankamai vietos grub2 įtraukti core.img naudojant %s "
 "failų sistemą %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Paleisti VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Naudoti tekstinę veikseną"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Slaptažodis nustatytas."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Slaptažodžiai nesutampa!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Jūs pateikėte silpną slaptažodį: %s.  Spauskite Atlikta, jei norite vistiek "
 "jį naudoti."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -157,87 +178,338 @@ msgstr ""
 "jį naudoti."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Silpnas"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Pakankamas"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Geras"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Stiprus"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Taip"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Ne"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Kilo ši klaida nustatant diegimo saugyklą\"\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Diegimo negalima tęsti."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Kilo ši klaida nustatant diegimo saugyklą\"\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Diegimo negalima tęsti."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Ši pažymėta diegimui programinė įranga turi klaidų.  Tai greičiausiai sukėlė "
+"klaida su diegimo\n"
+"šaltiniu.  Galite mėginti pašalinti šiuos paketus iš diegimo, pakeisti "
+"diegimo šaltinį arba\n"
+"išeiti iš diegimo."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Diegimas buvo sustabdytas, kadangi atrodo yra problema su technine įranga. "
+"Tikslus klaidos pranešimas:\n"
+"\n"
+"%s.\n"
+"\n"
+" Diegyklė dabar baigs darbą."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Diegimas buvo sustabdytas, kadangi atrodo yra problema su technine įranga. "
+"Tikslus klaidos pranešimas:\n"
+"\n"
+"%s.\n"
+"\n"
+" Diegyklė dabar baigs darbą."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Aptikta techninės įrangos klaida"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Diegimas buvo sustabdytas, kadangi atrodo yra problema su technine įranga. "
+"Tikslus klaidos pranešimas:\n"
+"\n"
+"%s.\n"
+"\n"
+" Diegyklė dabar baigs darbą."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Konfigūruojamas įdiegta sistema"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Rašoma tinklo konfigūracija"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Kuriami naudotojai"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Konfigūruojamas įdiegta sistema"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Vykdomi prieš-diegimo scenarijai"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Nustatomas diegimo šaltinis..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Diegiamas įkėliklis"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Vykdomos po diegimo nustatymo užduotys"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Diegiamas įkėliklis"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow liudijimas %s reikalauja tinklo."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -249,32 +521,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "Trūksta %s. Nepavyko nustatyti ugniasienės."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "Trūksta %s. Nepavyko nustatyti ugniasienės."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Failų sistema nepalaiko etikečių."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Nurodytas pavadinimas %s nau naudojamas."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Tomų grupės pavadinimas %s jau naudojamas. Pakeitimai nesaugomi."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Vykdomi prieš-diegimo scenarijai"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Kompiuterio pavadinimas negali būti None arba tuščias."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Kompiuterio vardas turi būti 255 arba mažiau simbolių."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Kompiuterio vardas turi prasidėti tinkamu simbolių iš rėžių „a-z“, „A-Z“ "
-"arba „0-9“"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -284,55 +846,55 @@ msgstr ""
 "„-“ ir „.“, dalys tarp taškų turi ką nors turėti ir negali prasidėti ar "
 "baigtis „-“."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Jungiamasi..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Atsijungiama..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Laidinis (%s) prijungtas"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Belaidis prijungtas pie %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Neprisijungta"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Nėra prieinamų tinklo įrenginių"
 
@@ -341,7 +903,12 @@ msgstr "Nėra prieinamų tinklo įrenginių"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s DIEGIMAS"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Naujas %s %s diegimas"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Paleiskite %s sistemai atjungti, kai baigsite."
@@ -355,8 +922,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Nepavyksta rasti /bin/sh vykdymui!  Nepaleidžiamas apvalkalas"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Gelbėjimas"
 
@@ -404,21 +971,15 @@ msgstr "Gelbėjama sistema"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Kuris įrenginys turi jūsų sistemos šakninį skirsnį?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Išeiti"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Sistema automatiškai bus įkelta iš naujo, kai paliksite apvalkalą."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -428,7 +989,7 @@ msgstr ""
 "neprijungti.  Spauskite grįžti apvalkalo gavimui, iš kur galėsite patikrinti "
 "ir prijungti skirsnius. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -449,7 +1010,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -462,29 +1023,240 @@ msgstr ""
 "\n"
 "Spauskite <grįžti> grįžimui į apvalkalą."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Jūs neturite jokių Linux skirsnių.  Įkeliama iš naujo.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Sistema bus automatiškai įkelta iš naujo, kai paliksite apvalkalą."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Gelbėjimo veiksena"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Jūs neturite jokių Linux skirsnių. Spauskite grįžti apvalkalo gavimui.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Jūsų sistema prijungta %s kataloge."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standartinis skirsnis"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Diskas"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Jūsų kompiuterio operacinė sistema naudoja „mainų“ sritį\n"
+"kai ima trūkti atminties."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Jūsų kompiuteryje „įkėlimo“ sritis yra vieta, kur laikomi\n"
+"failai, reikalingi operacinei sistemai paleisti."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"Jūsų kompiuteryje „šakninė“ sritis yra vieta, kur laikomi\n"
+"pagrindiniai sistemos failai ir programos."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"Jūsų kompiuteryje „namų“ sritis yra vieta, kur saugomi visi jūsų\n"
+"asmeniniai duomenys."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS aparatinėje įrangoje įkėlimui iš GPT skaidytų diskų\n"
+"reikalingas BIOS skirsnis."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PPC platformose PReP įkėlimo skirsnis yra reikalingas\n"
+"kaip įkėliklio konfigūracijos dalis."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Jūsų šakninis skirsnis yra mažiau nei 250 megabaitų, tai yra dažniausiai per "
+"mažai %s diegimui."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Jūs neapibrėžėte šakninio skirsnio (/), kuris yra būtinas %s diegimui tęsti."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Ši platforma reikalauja dedikuoto /boot skirsnio ar loginio tomo.  Jei "
+"nenorite /boot tomo, turite patalpinti / dedikuotame ne LVM skirsnyje."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Jūsų %(mount)s skirsnis yra mažiau nei %(size)s megabaitų, tai yra mažiau, "
+"nei rekomenduojama normaliam %(productName)s diegimui."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Jūsų %(mount)s skirsnis yra per mažas %(format)s formatavimui (leidžiamas "
+"dydis yra nuo %(minSize)d MB iki %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Jūsų %(mount)s skirsnis yra per didelis %(format)s formatavimui (leidžiamas "
+"dydis yra nuo %(minSize)d MB iki %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+"Nepavyko pridėti naujo įrenginio. Paspaudę gausite daugiau informacijos."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Jūs nesukūrėte įkėlimo skirsnio."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Jūsų BIOS pagrindo sistema reikalauja specialaus skirsnio įkėlimui su %s "
+"nauju disko etiketės formatu (GPT). Tęsimui sukurkite 1MB „BIOS Boot“ tipo "
+"skirsnį."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Jūs nenurodėte mainų skirsnio.  %(requiredMem)s MB atminties yra būtina "
+"tęsti diegimą be mainų srities, bet jūs turite tik %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Jūs nenurodėte mainų skirsnio.  Nors tai nėra griežtai reikalaujama visais "
+"atvejais, tai reikšmingai padidins našumą daugelyje įdiegčių."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Bent vienas iš jūsų mainų įrenginių neturi UUID, tai yra dažna mainų sritis, "
+"sukurta naudojant senesnes mkswap versijas. Į šiuos įrenginius bus "
+"kreipiamasi pagal įrenginio kelią iš /etc/fstab, o tai nėra idealu, kadangi "
+"įrenginių keliai gali keistis dėl įvairių priežasčių."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Šis prijungimo taškas yra netinkamas.  %s katalogas turi būti / failų "
+"sistemoje."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Prijungimo taškas %s turi būti linux failų sistemoje."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Slaptažodis:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -597,53 +1369,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Pateiktas VNC slaptažodis nebuvo bent 6 simbolių ilgio.\n"
 "Įveskite naują.  Palikite tuščia, jei nenorite slaptažodžio."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Nepavyko nustatyti diegimo šaltinio"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Klaida parsiunčiant paketų metaduomenis..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Nėra prieinamo diegimo šaltinio"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Diegiama programinė įranga"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Pradedamas paketų diegimo procesas"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Jums reikia daugiau vietos šiose failų sistemose:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Ruošiama tranzakcija iš diegimo šaltinio"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Diegiama"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Parsiunčiami paketų metaduomenys..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Diegiama"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Ruošiamasi diegti"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Tikrinama saugyklos konfigūracija..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "NUMATYTASIS PAVADINIMAS"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALIZAVIMAS"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALIZAVIMAS"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "pROGRAMINĖ ĮRANGA"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "NAUDOTOJO NUSTATYMAI"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -652,34 +1509,102 @@ msgstr ""
 "Nepakanka vietos failų sistemoms dabartiniam programinės įrangos "
 "pasirinkimui. Reikia papildomų %s."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Diegimo sąranka"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Paleidžiamas automatinis diegimas"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Negalima turėti klausimų komandų eilutės veiksenoje!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  Pasirinkite iš aukščiau [„q“ išėjimui | „c“ tęsimui]:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Užbaikite visas frazes prieš tęsdami"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Numatytasis sąrankos pavadinimas"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Užbaikite visas frazes prieš tęsdami"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Klaida"
 
@@ -703,32 +1628,35 @@ msgstr "taip"
 msgid "no"
 msgstr "ne"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Ar tikrai norite išeiti?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  Pasirinkite iš aukščiau [„q“ išėjimui | „c“ tęsimui]:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -743,219 +1671,258 @@ msgstr ""
 "prie šio kompiuterio iš kito ir vykdyti grafinį diegimą ar norite tęsti "
 "tekstinėje diegimo veiksenoje?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC slaptažodis"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Pateikite VNC slaptažodį. Reikės jį įvesti du kartus. \n"
 "Palikite tuščią, jei nenorite slaptažodžio"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Slaptažodis (patvirtinimas):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Slaptažodžiai nesutampa!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Slaptažodis turi būti bent šešių simbolių ilgio."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Slaptažodis turi būti bent šešių simbolių ilgio."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Laiko juosto nustatymai"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Laiko juosta nenustatyta."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Galimi regionai"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Galimi regionai"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Rašoma tinklo konfigūracija"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Laidinis (%s) prijungtas"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Laidinis (%s) prijungtas"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Kompiuterio vardas:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Serverio vardas"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Serverio vardas"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Kompiuterio vardas netinkamas: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Baigti konfigūravimą"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Tinklų sietuvas"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "failų sistemos konfigūracijai trūksta tipo"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Konfigūruojamas įdiegta sistema"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root slaptažodis:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Slaptažodis nustatytas."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root paskyra išjungta."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Slaptažodis nenustatytas."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Pasirinkite naują root slaptažodį. Reikės jį įvesti dukart."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Naudoti visą vietą"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Pakeisti esamą Linux sistemą (-as)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Naudoti laisvą vietą"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Diegimo paskirtis"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nepasirinkti diskai"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Klaida tikrinant saugyklos konfigūraciją"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Klaida tikrinant saugyklos konfigūraciją"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Pasirinktas automatinis skaidymas skirsniais"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Pasirinktas pasirinktinis skaidymas skirsniais"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -963,38 +1930,60 @@ msgstr ""
 "Neaptikta diskų.  Išjunkite kompiuterį, prijunkite bent vieną diską ir iš "
 "naujo paleiskite diegimui užbaigti."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Nepasirinkta diskų; pasirinkite bent vieną diską diegimui."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Tikrinama saugykla..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "Pa_sirinkti"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Generuojama atnaujinta saugyklos konfigūracija"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "saugyklo konfigūracija nepavyko: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Tikrinama saugyklos konfigūracija..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Automatinio skaidymo skirsniais parinktys"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1003,41 +1992,41 @@ msgstr ""
 "Diegimas reikalauja kietojo disko skaidymo skirsniais.  Pasirinkite,  kurią "
 "vietą norite naudoti kaip diegimo paskirtį."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Skirsnių schemos konfigūracija"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Skirsnių schemos konfigūracija"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Laiko juosto nustatymai"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s laiko juosta"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Laiko juosta nenustatyta."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Regione galimos laiko juostos %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Galimi regionai"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1046,178 +2035,196 @@ msgstr ""
 "Naudokite skaitmenis arba tiesiogiai įveskite pavadinimus [b regionų "
 "sąrašui, q išėjimui]:"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Paleisti VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Diegimo progresas"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Artimiausias veidrodis"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS serveris %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Klaida nustatant programinės įrangos šaltinį"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Nieko nepasirinkta"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Jungiamasi..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD diskas"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO failas:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Tinklo laikas"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Nėra prieinamo diegimo šaltinio"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Nepavyko nustatyti diegimo šaltinio"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Klaida parsiunčiant paketų metaduomenis..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Nėra prieinamo diegimo šaltinio"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS serveris %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS prijungimo parinktys:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Nepavyko nustatyti diegimo šaltinio, patikrinkite saugyklos url"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "įrenginys turintis /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Nepavyko nustatyti diegimo šaltinio"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Keisti programinės įrangos pasirinkimą"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Klaida tikrinant programinės įrangos pasirinkimą"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Diegimo šaltinis nenustatytas"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Šaltinis pasikeitė - patikrinkite"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Pasirinkta programinės įrangos"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Diegimo šaltinis nenustatytas"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Pasirinkite aplinką"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "Na_udoti tapatybės patvirtinimą"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Turite pateikti ir patvirtinti slaptažodį."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Įspėjimas"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1233,36 +2240,36 @@ msgstr "Eigoje"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tDiegimas baigtas.  Spauskite grįžti išėjimui"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Numatytasis frazės pavadinimas"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "testavimo būsena..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Naujas įrenginys"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Slaptažodis (patvirtinimas):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1271,7 +2278,7 @@ msgstr ""
 "Jūs pateikėte silpną slaptažodį: %s.  Spauskite Atlikta, jei norite vistiek "
 "jį naudoti."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1280,63 +2287,47 @@ msgstr ""
 "Jūs pateikėte silpną slaptažodį: %s.  Spauskite Atlikta, jei norite vistiek "
 "jį naudoti."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Slaptažodis nustatytas."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Iš_eiti iš diegyklės"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Žinynas"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Ne"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Taip"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "NUMATYTASIS PAVADINIMAS"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALIZAVIMAS"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALIZAVIMAS"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "pROGRAMINĖ ĮRANGA"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SISTEMA"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "NAUDOTOJO NUSTATYMAI"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1344,7 +2335,11 @@ msgstr ""
 "Užbaikite šia piktograma pažymėtus elementus prieš pereidami prie kito "
 "žingsnio."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Užbaigta!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1353,170 +2348,69 @@ msgstr ""
 "%s sėkmingai įdiegta jūsų sistemoje ir paruošta naudojimui!\n"
 "Įkelkite iš naujo ir pradėkite ja naudotis!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Užbaigta!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Išeiti"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Naujas %s %s diegimas"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s sėkmingai įdiegta jūsų sistemoje, bet dar reikia atlikti šiek tiek "
+"konfigūracijos.\n"
+"Užbaikite ją ir paspauskite mygtuką Baigti konfigūravimą."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s sėkmingai įdiegta jūsų sistemoje ir paruošta naudojimui!\n"
+"Įkelkite iš naujo ir pradėkite ja naudotis!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Sukurti naują tomų grupę ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
 msgstr ""
+"Įrenginio perkonfigūravimas nepavyko. Paspaudę gausite daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Sukurkite pavadinimą tomų grupei ir žemiau pasirinkite bent vieną diską."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Tomų grupė:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "stulpelis"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Saugyklos konfigūracija atstatyta dėl neatstatomos klaidos. Paspaudę gausite "
 "daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr ""
-"Įrenginio perkonfigūravimas nepavyko. Paspaudę gausite daugiau informacijos."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Įveskite tinkamą prijungimo tašką."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Šis prijungimo taškas yra netinkamas. Mėginsite kitą?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Šis prijungimo taškas jau naudojamas. Mėginsite kitą?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Jūsų pasirinktas RAID lygis reikalauja daugiau diskų, nei esate pasirinkęs."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Įveskite tinkamą prijungimo tašką."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Šis prijungimo taškas yra netinkamas. Mėginsite kitą?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standartinis skirsnis"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Diskas"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Joks"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Taip pat ištrinti visas failų sistema %s šaknyje."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Ar tikrai norite ištrinti visus %s duomenis?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Ar tikrai norite ištrinti visus %s duomenis?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "PSIRINKTINIS SKAIDYMAS SKIRSNIAIS"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "Pasirinktas %d saugyklos įrenginys"
 msgstr[1] "Pasirinkti %d saugyklos įrenginiai"
 msgstr[2] "Pasirinkta %d saugyklos įrenginių"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1525,133 +2419,119 @@ msgstr ""
 "Kai sukuriate prijungimo taškus savo %s %s diegimui,\n"
 "jų detales matysite čia."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Jūsų kompiuterio operacinė sistema naudoja „mainų“ sritį\n"
-"kai ima trūkti atminties."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Jūsų kompiuteryje „įkėlimo“ sritis yra vieta, kur laikomi\n"
-"failai, reikalingi operacinei sistemai paleisti."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"Jūsų kompiuteryje „šakninė“ sritis yra vieta, kur laikomi\n"
-"pagrindiniai sistemos failai ir programos."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"Jūsų kompiuteryje „namų“ sritis yra vieta, kur saugomi visi jūsų\n"
-"asmeniniai duomenys."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS aparatinėje įrangoje įkėlimui iš GPT skaidytų diskų\n"
-"reikalingas BIOS skirsnis."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PPC platformose PReP įkėlimo skirsnis yra reikalingas\n"
-"kaip įkėliklio konfigūracijos dalis."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi turi būti %s tipo įrenginyje"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s turi būti %s tipo įrenginyje"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s negali būti šifruotas"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Turite sukurti naują failų sistemą šakniniame įrenginyje."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "%s tipo įrenginiai reikalauja teisingo RAID lygio pasirinkimo."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Įrenginio dydžio keitimas nepavyko. Paspaudę gausite daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Įrenginio performatavimas nepavyko. Paspaudę gausite daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Nurodytas pavadinimas %s nau naudojamas."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Failų sistema nepalaiko etikečių."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nepasirinkti diskai"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Failų sistemos dydis negali būti keičiamas."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Klaida tikrinant saugyklos konfigūraciją.  Paspaudę gausite daugiau "
+"informacijos."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Klaida tikrinant saugyklos konfigūraciją.  Paspaudę gausite daugiau "
+"informacijos."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Pridėtas naujas %s prie esamo konteinerio %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 "Nepavyko pridėti naujo įrenginio. Paspaudę gausite daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "Nustatytas netinkamas skirsnio dydis. Naudokite tinkamą sveiką skaičių."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Įrenginio pašalinimas nepavyko. Paspaudę gausite daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Tomų grupės pavadinimas %s jau naudojamas. Pakeitimai nesaugomi."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs laisva"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1660,7 +2540,7 @@ msgstr ""
 "Programiniam RAID masyvui trūksta %d iš %d skirsnių narių. Galite jį "
 "pašalinti arba pasirinkti kitą įrenginį."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1669,288 +2549,148 @@ msgstr ""
 "Šiai LVM tomų grupei trūksta %d iš %d fizinių tomų. Galite ją pašalinti arba "
 "pasirinkti kitą įrenginį."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nepasirinkta diskų."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Pasirinktuose diskuose nepakanka vietos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 "Automatinis skaidymas skirsniais nepavyko. Paspaudę gausite daugiau "
 "informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Keisti programinės įrangos pasirinkimą"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Nepavyko atrakinti šifruoto blokinio įrenginio. Paspaudę gausite daugiau "
 "informacijos."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Pasirinkote rankiniu būdu nustatyti failų sistemas jūsų naujai "
-"%(productName)s įdiegčiai. Prieš pradėdami galite peržiūrėti, kur kas. "
-"Nemažai pasikeitė.\n"
-"\n"
-"Svarbiausias pasikeitimas yra tas, kad naujų failų sistemų kūrimas tapo "
-"nuoseklus. Jūs daugiau nekuriate sudėtingų įrenginių, tokių kaip LVM "
-"loginiai tomai, etapais (fizinis tomas, tuomet tomų grupė, tuomet loginis "
-"tomas) -- dabar jūs tiesiog kuriate loginį tomą, o mes susitvarkysime su jam "
-"reikalingais fiziniais tomais ir tomų grupėmis. Mes taip pat apdorosime tomų "
-"grupės priderinimą, kai pridėsite, pašalinsite ar pakeisite loginio tomo "
-"dydį, kad jūms nereikėtų rūpintis nuobodžiomis detalėmis.\n"
-"\n"
-"\n"
-"Ekrano išdėstymas\n"
-"\n"
-"Kairėje ekrano pusėje rodomos OS įdiegtys, kurias mums pavyko rasti šiame "
-"kompiuteryje. Nauja %(productName)s įdiegtis yra sąrašo viršuje. Galite "
-"spausti ant įdiegčių pavadinimų, jei norite pamatyti, kurias failų sistemas "
-"jos įtraukia.\n"
-"\n"
-"Žemiau įvairių įdiegčių ir prijungimo taškų kairėje pusėje yra mygtukai "
-"failų sistemai pridėti, pašalinti ar konfigūruoti.\n"
-"\n"
-"Ekrano dešinė pusė yra vieta, kur galite nustatyti šiuo metu pasirinktą "
-"priungimo tašką.\n"
-"\n"
-"Apačioje kairėje matysite diegimui pasirinktų diskų santrauką. Galite "
-"spausti ant mėlyno teksto detalesnei informacijai apie pasirinktus diskus.\n"
-"\n"
-"\n"
-"Kai sukurti naują failų sistemą naujame įrenginyje\n"
-"\n"
-"1. Spauskite mygtuką +.\n"
-"2. Įveskite prijungimo tašką ir dydį. (Patarimas: užveskite rodyklę virš bet "
-"kurio tekstinio lauką pagalbai gauti.)\n"
-"3. Pasirinkite naują prijungimo tašką skiltyje „Nauja %(productName)s "
-"įdiegtis“ kairėje ekrano pusėje ir pritaikykite ją savo poreikiams.\n"
-"\n"
-"\n"
-"Kaip performatuoti įrenginį/failų sistemą, kuri jau yra diske\n"
-"\n"
-"1. Pasirinkite failų sistemą kairėje ekrano pusėje.\n"
-"2. Spauskite išskleidėją „Tinkinti“ prijungimo taško pritaikymo srityje "
-"dešinėje ekrano pusėje.\n"
-"3. Pažymėkite žymimąjį langelį „Performatuoti“, pasirinkite failų sistemą "
-"ir, jei taikoma, įveskite prijungimo tašką aukščiau tekstiniame lauke "
-"„Prijungimo taškas“.\n"
-"4. Spauskite „Pritaikyti pakeitimus“\n"
-"\n"
-"\n"
-"Kaip nustatyti prijungimo tašką failų sistemai, kur jau yra diske\n"
-"\n"
-"1. Pasirinkite failų sistemą kairėje ekrano pusėje.\n"
-"2. Įveskite prijungimo tašką tekstiniame lauke „Prijungimo taškas“ "
-"prijungimo taško pritaikymo srityje.\n"
-"3. Spauskite „Pritaikyti pakeitimus“\n"
-"\n"
-"\n"
-"Kaip pašalinti esamas failų sistemas iš diskų\n"
-"\n"
-"1. Kairėje ekrano pusėje pasirinkite failų sistemą, kurią norite pašalinti.\n"
-"2. Spauskite mygtuką -.\n"
-"\n"
-"Patarimas: esamo įrenginio diske pašalinimas iš „Nauja %(productName)s "
-"diegtis“ nepašalina jo iš disko. Tai tik atstato įrenginį į jo pradinę "
-"būseną. Esamam disko įrenginiui pašalinti turite jį pasirinkti bet kurioje "
-"iš kitų įdiegčių (arba „Nežinoma“) ir paspausti mygtuką -.\n"
-"\n"
-"\n"
-"Patarimai\n"
-"\n"
-"Galite įvesti naujoms failų sistemoms dydžius, kurie yra dedesni nei visa "
-"laisva vieta. Diegėjas priartės kiek įmanoma prie jūsų prašomų dydžių.\n"
-"\n"
-"Numatytai nauji įrenginiai naudoja bet kuriuos/visus jūsų pasirinktus "
-"diskus.\n"
-"\n"
-"Galite pakeisti, kuriame diske naujas įrenginys bus išskirtas paspausdami "
-"konfigūravimo mygtuką (su įrankių grafika), kol įrenginys yra pažymėtas.\n"
-"\n"
-"Pridedant naują prijungimo tašką paspaudus mygtuką +, palikite dydžio lauką "
-"tuščią visai laisvai vietai naudoti.\n"
-"\n"
-"Kai pašalinsite paskutinį įrenginį iš konteinerio įrenginio, tokio kaip LVM "
-"tomų grupė, mes automatiškai pašalinsime šį konteinerio įrenginį, padarydami "
-"vietos naujiems įrenginiams.\n"
-"\n"
-"Kai paskutinis skirsnis yra pašalinamas iš disko, šis diskas gali būti "
-"perinicializuotas su nauja skirsnių lentele, jei mes manome, kad yra labiau "
-"tinkamas tipas tam diskui.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATA ir LAIKAS"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Netinkama laiko juosta"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "Dien"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Jums reikia pirma nustatyti tinklą, jei norite naudoti NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Neturite sukonfigūruoto veikiančio NTP serverio"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "DIEGIMO PASKIRTIS"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "Pasirinktas %d saugyklos įrenginys"
+msgstr[1] "Pasirinkti %d saugyklos įrenginiai"
+msgstr[2] "Pasirinkta %d saugyklos įrenginių"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s išdėstymams keisti."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KLAVIATŪRA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Neprieinamas išdėstymų konfigūracijos testavimas."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "testavimo būsena..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Išdėstymų keitimas nesukonfigūruotas."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "KALBA"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Būsena nežinoma (trūkstama)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Būsena nežinoma"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Nevaldoma"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Neprieinama"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Trūksta aparatinės programinės įrangos"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kabelis neįjungtas"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Neprieinama"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Atsijungta"
@@ -1975,155 +2715,171 @@ msgstr "Atsijungiama"
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "neįjungta"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Laidinis"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Belaidis"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "neįjungta"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 adresas"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 adresas"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP adresas"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Kompanijos"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Joks"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Reikia patvirtinti tapatybę"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "TINKLO KONFIGŪRACIJA"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT SLAPTAŽODIS"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Slaptažodis nustatytas."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root slaptažodis nustatytas"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root paskyra išjungta"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root slaptažodis nenustatytas"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "PROGRAMINĖS ĮRANGOS PASIRINKIMAS"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Tikrinamos programinės įrangos priklausomybės..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Klaida tikrinant programinės įrangos priklausomybes"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Parsiunčiami paketų metaduomenys..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Parsiunčiami grupės metaduomenys..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Tikrinamos programinės įrangos priklausomybės..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Klaida tikrinant programinės įrangos priklausomybes"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Klaida tikrinant programinės įrangos priklausomybes.  Paspaudę gausite "
 "daugiau informacijos."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Ši pažymėta diegimui programinė įranga turi klaidų.  Tai greičiausiai sukėlė "
 "klaida su diegimo\n"
@@ -2131,46 +2887,77 @@ msgstr ""
 "diegimo šaltinį arba\n"
 "išeiti iš diegimo."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Atsisakyti"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Išeiti"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Keisti šaltinį"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Keisti programinės įrangos pasirinkimą"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Nustatomas diegimo šaltinis..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Klaida parsiunčiant paketų metaduomenis..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Reikia patvirtinti tapatybę"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Laikmena yra tinkama diegimui."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Laikmena yra netinkama diegimui."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "DIEGIMO ŠALTINIS"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Nepavyko nustatyti diegimo šaltinio, patikrinkite saugyklos url"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Klaida nustatant saugyklą"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Klaida nustatant programinės įrangos šaltinį"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2178,98 +2965,80 @@ msgstr ""
 "Nepavyko nustatyti diegimo šaltinio, patikrinkite saugyklos url ir tarpinio "
 "serverio nustatymus"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Klaida nustatant saugyklą"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Klaida nustatant programinės įrangos šaltinį"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Įrenginys:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS serveris %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Netinkama laiko juosta"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Netinkama laiko juosta"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Netinkama laiko juosta"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Palaukite... programinės įrangos laikmena vis dar įkeliama."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Jūsų pasirinkti diskai turi tiek laisvos vietos:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Palaukite... programinės įrangos laikmena vis dar įkeliama."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2279,7 +3048,7 @@ msgstr ""
 "<b>Jūs neturite pakankama vietos %s diegimui</b>, bet galime jums padėti\n"
 "atgauti vietos sumažinant arba pašalinant esamus skirsnius."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2290,7 +3059,7 @@ msgstr ""
 "laisvą vietą\n"
 "pasirinktuose diskuose."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2304,39 +3073,46 @@ msgstr ""
 "jūsų programinės\n"
 "įrangos pasirinkimą į mažesnę <b>%s</b> versiją arba išeiti iš diegyklės."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "DIEGIMO PASKIRTIS"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Įrašoma saugyklos konfigūracija..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Nepavyko įrašyti saugyklos konfigūracijos..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatuojamas DASD įrenginys"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Klaida tikrinant saugyklos konfigūraciją.  Paspaudę gausite daugiau "
 "informacijos."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Klaida tikrinant saugyklos konfigūraciją.  Paspaudę gausite daugiau "
 "informacijos."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs laisva"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2344,14 +3120,18 @@ msgstr[0] "Pasirinktas %d diskas; talpa %s; laisva %s"
 msgstr[1] "Pasirinkti %d diskai; talpa %s; laisva %s"
 msgstr[2] "Pasirinkta %d diskų; talpa %s; laisva %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 "Pasirinkote praleisti įkėliklio įdiegį.  Jūsų sistemą gali būti neįkeliama."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2360,11 +3140,19 @@ msgstr ""
 "Kilo šios klaidos tikrinant saugyklos konfigūraciją.  Galite pakeisti "
 "saugyklos išdėstymą arba išeiti iš diegyklės."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Išeiti"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Keisti saugyklos išdėstymą"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2374,76 +3162,80 @@ msgstr ""
 "Kilo šios klaidos tikrinant saugyklos konfigūraciją.  Galite pakeisti "
 "saugyklos išdėstymą arba išeiti iš diegyklės."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "NAUDOTOJO NUSTATYMAI"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Netinkama laiko juosta"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "SVEIKI ATVYKĘ Į %s %s"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DUOMENYS"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Jūs dar nesukūrėte jokių prijungimo taškų %s %s diegimui:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Spauskite čia jiems automatiškai sukurti."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Arba sukurkite naujus prijungimo taškus žemiau su „+“ piktograma."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2461,55 +3253,161 @@ msgstr[2] ""
 "<b>%d diskų; talpa %s; %s laisvos vietos</b> (nepaskirstyta ir failų "
 "sistemose)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "Neį_diegti įkėliklio"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Nustatyti įkėlimo įrenginį"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Jūsų pasirinktas RAID lygis reikalauja daugiau diskų, nei esate pasirinkęs."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Sukurkite pavadinimą tomų grupei ir žemiau pasirinkite bent vieną diską."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Tomų grupė:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "stulpelis"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Prijungimo taškas %s turi būti linux failų sistemoje."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Šis prijungimo taškas jau naudojamas. Mėginsite kitą?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Įveskite tinkamą prijungimo tašką."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Šis prijungimo taškas yra netinkamas. Mėginsite kitą?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Taip pat ištrinti visas failų sistema %s šaknyje."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Ar tikrai norite ištrinti visus %s duomenis?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Ar tikrai norite ištrinti visus %s duomenis?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Netinkama laiko juosta"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Išeiti"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Pateikėte silpną slaptažodį: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Slaptažodžiai nesutampa."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Išlaikyti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Sumažinti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Šis įrenginys turi įdiegimo šaltinį."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Kuriama %(type)s įrenginyje %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Nepasiruošęs"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Naudoti laisvą vietą"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2522,14 +3420,14 @@ msgstr ""
 "daugiau nebereikia.  Failų sistemos pašalinimas negrįžtamai ištrins visus "
 "jos duomenis."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2538,353 +3436,762 @@ msgstr[0] "<b>%s diskas; %s atkovojamos vietos</b> (failų sistemose)"
 msgstr[1] "<b>%s diskai; %s atkovojamos vietos</b> (failų sistemose)"
 msgstr[2] "<b>%s diskų; %s atkovojamos vietos</b> (failų sistemose)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Iš viso pasirinkta atkovoti vietos: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Ištrinti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Išlaikyti"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "DISTRIBUCIJOS DIEGIMAS"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "FRAZĖS PAVADINIMAS"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "NEIŠLEISDA / TESTUOJAMA"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Naujas įrenginys"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Naujas žymeklis"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Atlikta"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Tęsti"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Pritaikyti pakeitimus"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "TINKLO KONFIGŪRACIJA"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Grupės pavadinimas"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATA ir LAIKAS"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "Dien"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Pridėti ir pažymėti naudojamais NTP serverius"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Žiniatinklio serveris"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Dirbama"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Naudoti"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfigūruoti..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATA ir LAIKAS"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Regionas:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Regionas:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Miestas:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Miestas:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Ti_nklo pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Tinklo pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "Nakt/Dien"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "Nakt/Dien"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-valandų"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "Nakt/Dien"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "DIEGIMO PASKIRTIS"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Talpa"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Neprisijungta"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Pasirinktas įrenginys"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Nieko nepasirinkta"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etiketė:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Trūksta aparatinės programinės įrangos"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Ne"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN tipas"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Pasirinktas įrenginys"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "santrauka"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID Įrenginys"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Pridėti"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Numatytasis kelias"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Potinklio kaukė"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Greitis"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Aparatinis adresas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfigūruoti..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Saugumas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Ti_nklo pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Tinklo pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Saugos raktas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "Na_udoti kaip prieigos tašką..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Stabdyti prieigos tašką..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfigūruoti..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Tiekėjas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfigūruoti..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN tipas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Tinklų sietuvas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Grupės pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Grupės slaptažodis"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Naudotojo vardas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfigūruoti..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metodas"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Konfigūracijos URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP tarpinis serveris"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS tarpinis serveris"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP tarpinis serveris"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks serveris"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Rašoma tinklo konfigūracija"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Atrakinti"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Skr_ydžio veiksena"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Rašoma tinklo konfigūracija"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Kompiuterio vardas:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "TINKLO KONFIGŪRACIJA"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2894,283 +4201,205 @@ msgstr ""
 "įrangos atnaujinimams\n"
 "padaryti prieinamiems."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Numatytasis kelias"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Potinklio kaukė"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Greitis"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Aparatinis adresas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfigūruoti..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Saugumas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "Ti_nklo pavadinimas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Tinklo pavadinimas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Saugos raktas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "Na_udoti kaip prieigos tašką..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Stabdyti prieigos tašką..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfigūruoti..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Tiekėjas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN tipas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Tinklų sietuvas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Grupės pavadinimas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Grupės slaptažodis"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Naudotojo vardas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metodas"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Konfigūracijos URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP tarpinis serveris"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS tarpinis serveris"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP tarpinis serveris"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks serveris"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Atrakinti"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Skr_ydžio veiksena"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Kompiuterio vardas:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "Na_udoti tapatybės patvirtinimą"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Reikia patvirtinti tapatybę"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Prisijungta"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "PROGRAMINĖS ĮRANGOS PASIRINKIMAS"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Pasirinkite aplinką"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "stulpelis"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Atsisakyti ir _pridėti daugiau diskų"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "DIEGIMO PARINKTYS"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Skirsnio tipas:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Šifruoti mano duomenis. Aš vėliau nustatysiu slaptažodį."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Pasirinktas pasirinktinis skaidymas skirsniais"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Atkovoti vietą"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "DIEGIMO PARINKTYS"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 "Čia aprašysime, kiek vietos reikia esamam programinės įrangos pasirinkimui."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "diske laisva"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Laisvos vietos naudojimui."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs laisva"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "Laisvos vietos neprieinama, bet atkovojama iš esamų skirsnių."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Čia aprašysime, kokios yra jūsų parinktys."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Naudoti laisvą vietą"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Išeiti iš diegyklės"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Įrenginio aprašymas"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Vietiniai standartiniai diskai"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Baigtas skaidymas skirsniais"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Šifruoti"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Pasirinktas automatinis skaidymas skirsniais"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Baigtas skaidymas skirsniais"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Šifruoti"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Šifruoti mano duomenis. Aš vėliau nustatysiu slaptažodį."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Automatinio skaidymo skirsniais parinktys"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "santrauka"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Visa disko santrauka ir parinktys..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "PRIDĖTI KLAVIATŪROS IŠDĖSTYMĄ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Galite pridėti klaviatūros išdėstymą jį pasirinkę žemiau:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Pavadinimas"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "KLAVIATŪROS IŠDĖSTYMAS"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3178,7 +4407,7 @@ msgstr ""
 "Kuriuos klaviatūros išdėstymus norite naudoti šioje sistemoje?  Galite "
 "perkelti bet kurį išdėstymą į sąrašo viršų jį padarydami numatytuoju."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3186,118 +4415,200 @@ msgstr ""
 "Pakeitimai čia bus pritaikyti tik įdiegtai sistemai. Naudokite darbastalio "
 "įrankį diegimo proceso klaviatūrai nustatyti."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "pavadinimas"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Pridėti išdėstymą"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Pašalinti išdėstymą"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Perkelti pasirinktą išdėstymą aukštyn"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Pridėti išdėstymą"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Pašalinti išdėstymą"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Perkelti pasirinktą išdėstymą aukštyn"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Perkelti pasirinktą išdėstymą žemyn"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Išdėstymo peržiūra"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Neprieinamas išdėstymų konfigūracijos testavimas."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Lyg2 išdėstymams keisti."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Parinktys"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Pridėti"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "PRIDĖTI KLAVIATŪROS IŠDĖSTYMĄ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Galite pridėti klaviatūros išdėstymą jį pasirinkę žemiau:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Galimi regionai"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Pridėti išdėstymą"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "IŠDĖSTYMŲ KEITIMO PARINKTYS"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Jūsų pageidaujama(os) kombinacija(os) persijungimui tarp klaviatūros "
 "išdėstymų?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "naudoti"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "aprašymas"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS prijungimo parinktys:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "KALBA"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "gimtasisVardas"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "anliškasVardas"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Nieko nepasirinkta"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT SLAPTAŽODIS"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root slaptažodis:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Patvirtinti:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC slaptažodis"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Nustatyti root slaptažodį"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3305,237 +4616,285 @@ msgstr ""
 "root paskyra yra naudojama sistemos administravimui.  Įveskite root "
 "naudotojo slaptažodį."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Atlikta"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "LAIKMENOS TIKRINIMAS"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Tikrinama laikmena, palaukite..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Pridėti"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "Į_jungti HTTP tarpinį serverį"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Tarpinio serverio URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Pavyzdys:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "Na_udoti tapatybės patvirtinimą"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Naudotojo vardas</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Naudotojo vardas"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Slaptažodis</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "DIEGIMO ŠALTINIS"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Kurį įdiegties šaltinį norite naudoti?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Automatiškai aptikta diegimo laikmena:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Įrenginys:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etiketė:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Tikrinti"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO failas:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Įrenginys:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Pasirinkite ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Ti_nkle:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Tar_pinio serverio nustatymas..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Šis URL nurodo į _veidrožių sąrašą."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS prijungimo parinktys:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Laukas yra nebūtinas."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People saugyklos"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Pridėti naują prijungimo tašką."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Pridėti"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Pašalinti pasirinktą prijungimo tašką(-us)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Pa_šalinti"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Vykdymo klaida."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Nustatyti root slaptažodį"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Šis URL nurodo į _veidrožių sąrašą."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Pavadinimas:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Tarpinio serverio URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Naudotojo vardas"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Šis prijungimo taškas yra netinkamas. Mėginsite kitą?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Išeiti iš čia!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "Sutinku su _rizika."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Tai nestabili, neišleista programinė įranga."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3546,203 +4905,264 @@ msgstr ""
 "yra klaidų.  Klaidų visur.  Klaidų, su kuriomis turite gyventi.  Ši ateities "
 "OS nėra stabili OS, kuria galėtumėt pasitikėti.  Ji skirta tik testavimui."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "SVEIKI ATVYKĘ Į %s %s"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Kokios kalbos pageidaujate instaliacijos metu?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Išeiti"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Tęsti"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Naudotojo vardas"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Grupės pavadinimas"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC slaptažodis"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Pridėti prijungimo tašką"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Pageidaujama talpa:</b>"
+msgid "Add a new mount point."
+msgstr "Pridėti naują prijungimo tašką."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Prijungimo taškas:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Pridėti"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "PRIDĖTI NAUJĄ PRIJUNGIMO TAŠKĄ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Daugiau tinkinimo parinkčių yra pasiekiamos\n"
-"po prijungimo taško sukūrimo."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Šis prijungimo taškas jau\n"
-"naudojamas.  Mėginti kitą?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "pvz: „20 GB“, „500mb“ (be kabučių)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Ištrinti"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Įrašyti"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "KONFIGŪRUOTI PRIJUNGIMO TAŠKĄ"
+msgid "Remove the selected mount point(s)."
+msgstr "Pašalinti pasirinktą prijungimo tašką(-us)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Sukurkite pavadinimą tomų grupei ir žemiau pasirinkite bent vieną diską."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Pa_šalinti"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Laisva"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID Įrenginys"
+msgid "Reload storage configuration from disk."
+msgstr "saugyklo konfigūracija nepavyko: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Šifruoti"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Pasirinktas įrenginys"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Įrenginio aprašymas"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Prijungimo taškas:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Pageidaujama talpa:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etiketė:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Įrenginio tipas:</b>"
+msgid "Device(s):"
+msgstr "Įrenginys:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Failų sistema:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Šifruoti"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Performatuoti"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Tomų grupė:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Keisti ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Pavadinimas:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Įrenginio tipas:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Šifruoti"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Failų sistema"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Performatuoti"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Tomų grupė:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Keisti ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID Įrenginys"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3750,17 +5170,19 @@ msgstr ""
 "Šis įrenginys yra šifruotas ir negali būti perskaitytas be teisingo "
 "slaptažodžio. Galite jį atrakinti žemiau."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Slaptažodis:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Atrakinti"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3768,295 +5190,571 @@ msgstr ""
 "Šis įrenginys negali būti tiesiogiai pakeistas. Galite jį pašalinti arba "
 "pasirinkti kitą įrenginį."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Pridėti naują prijungimo tašką."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Pašalinti pasirinktą prijungimo tašką(-us)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Konfigūruoti pasirinktą prijungimo tašką."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigūruoti..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "saugyklo konfigūracija nepavyko: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Spauskite pagalbai"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Žinynas"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">PRIEINAMA VIETOS</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">IŠ VISO VIETOS</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "Pa_sirinkti"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "KONFIGŪRUOTI PRIJUNGIMO TAŠKĄ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Pasirinkite bent vieną diską šiam įrenginiui."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP adresas"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Turite pateikti iSCSI iniciatoriaus pavadinimą"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "Na_udoti tapatybės patvirtinimą"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Pavyzdys:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Naudotojo vardas"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC slaptažodis"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Naudotojo vardas"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC slaptažodis"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Naudotojo vardas"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC slaptažodis"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Tinklo pavadinimas"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "Na_udoti tapatybės patvirtinimą"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Naudotojo vardas"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC slaptažodis"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Naudotojo vardas"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC slaptažodis"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Naudotojo vardas"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC slaptažodis"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Prisijungti nepavyko"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Įrenginys:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "PASIRINKTI DISKAI"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Užverti"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Įkelti"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Aprašymas"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Laisva"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "Pa_šalinti"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Disko santrauka bus čia"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Ištrinti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Pa_sirinkti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "KONFIGŪRUOTI PRIJUNGIMO TAŠKĄ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Pasirinkite bent vieną diską šiam įrenginiui."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Pridėti prijungimo tašką"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Pageidaujama talpa:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Prijungimo taškas:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "PRIDĖTI NAUJĄ PRIJUNGIMO TAŠKĄ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Daugiau tinkinimo parinkčių yra pasiekiamos\n"
+"po prijungimo taško sukūrimo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Šis prijungimo taškas jau\n"
+"naudojamas.  Mėginti kitą?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "pvz: „20 GB“, „500mb“ (be kabučių)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Įrašyti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "KONFIGŪRUOTI PRIJUNGIMO TAŠKĄ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Sukurkite pavadinimą tomų grupei ir žemiau pasirinkite bent vieną diską."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Pavadinimas:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID Įrenginys"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Šifruoti"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Įveskite tinkamą prijungimo tašką."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formatuojamas DASD įrenginys"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Diegimo metu kilo nežinoma klaida.  Detalės žemiau."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "DISKO ŠIFRAVIMO SLAPTAŽODIS"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Įrašyti slaptažodį"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "DISKO ŠIFRAVIMO SLAPTAŽODIS"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4065,7 +5763,19 @@ msgstr ""
 "Jūs pasirinkote šifruoti dalį savo duomenų. Jums reikės sukurti slaptažodį, "
 "kurį naudosite priėjimui prie duomenų, kai paleidžiate kompiuterį."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Slaptažodis:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Patvirtinti:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4075,117 +5785,172 @@ msgstr ""
 "pakeisite klaviatūros išdėstymą, galite nebegalėti dešifruoti diskų po "
 "įdiegimo."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ATKOVOTI DISKO VIETĄ"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Atsisakyti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Atkovoti vietą"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ATKOVOTI DISKO VIETĄ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Čia bus aprašymas."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Failų sistema"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Atkovojama vieta"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Veiksmas"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Išlaikyti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Ištrinti"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Sumažinti"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Pasirinktas pasirinktinis skaidymas skirsniais"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Pritaikyti pakeitimus"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Įrenginys:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Pridėti prijungimo tašką"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Iš_eiti iš diegyklės"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Ne"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Taip"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4193,51 +5958,50 @@ msgstr ""
 "Ar tikrai norite išeiti iš diegimo\n"
 "proceso?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Išeiti"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ĮDIEGTIES SANTRAUKA"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Išeiti"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Pradėti diegimą"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGŪRACIJA"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Ruošiamasi diegti"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s sėkmingai įdiegta jūsų sistemoje, bet dar reikia atlikti šiek tiek "
-"konfigūracijos.\n"
-"Užbaikite ją ir paspauskite mygtuką Baigti konfigūravimą."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Baigti konfigūravimą"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s sėkmingai įdiegta jūsų sistemoje ir paruošta naudojimui!\n"
-"Įkelkite iš naujo ir pradėkite ja naudotis!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "Įkelti iš _naujo"
 
@@ -4253,16 +6017,16 @@ msgstr "Diegti"
 msgid "Install the live CD to your hard disk"
 msgstr "Įdiegti tiesiogiai paleidžiamą CD jūsų kietajame diske"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Pradedama diegti į kietąjį diską"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Sveiki pradėję naudoti Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4271,25 +6035,26 @@ msgstr ""
 "%s reikalauja %s MB atminties įdiegimui, bet jūs turite tik %s MB šiame "
 "kompiuteryje.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s grafinis diegyklė reikalauja %s MB atminties, bet jūs turite tik %s MB"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nepakanka RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4303,24 +6068,24 @@ msgstr ""
 "\n"
 " iš root terminalo."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Paleidžiama tekstinė veiksena."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Klaida"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY kintamasis nenustatytas. Paleidžiama tekstinė veiksena."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafinė diegti neprieinama. Paleidžiama tekstinė veiksena."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4331,20 +6096,20 @@ msgstr ""
 "nurodyti jūsų pačių skirsnių išdėstymo ar paketų pasirinkimo. Ar nore vietoj "
 "jos naudoti VNC veikseną?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Diegimui pradėti įvykdykite ssh install@%s"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Diegimui tęsti įvykdykite ssh install@<host>."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Bandyti Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4354,7 +6119,7 @@ msgstr ""
 "Galite dabar įdiegti Fedora arba pasirinkti „Įdiegti į kietąjį diską- iš "
 "veiklų apžvalgos bet kada vėliau."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4362,10 +6127,287 @@ msgstr ""
 "Galite pasirinkti „Įdiegti į kietąjį diską“\n"
 "veiklų apžvalgoje bet kuriuo metu."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Užverti"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Kompiuterio vardas turi prasidėti tinkamu simbolių iš rėžių „a-z“, „A-Z“ "
+#~ "arba „0-9“"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Jums reikia daugiau vietos šiose failų sistemose:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Negalima turėti klausimų komandų eilutės veiksenoje!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Šis prijungimo taškas yra netinkamas. Mėginsite kitą?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Pasirinkote rankiniu būdu nustatyti failų sistemas jūsų naujai "
+#~ "%(productName)s įdiegčiai. Prieš pradėdami galite peržiūrėti, kur kas. "
+#~ "Nemažai pasikeitė.\n"
+#~ "\n"
+#~ "Svarbiausias pasikeitimas yra tas, kad naujų failų sistemų kūrimas tapo "
+#~ "nuoseklus. Jūs daugiau nekuriate sudėtingų įrenginių, tokių kaip LVM "
+#~ "loginiai tomai, etapais (fizinis tomas, tuomet tomų grupė, tuomet loginis "
+#~ "tomas) -- dabar jūs tiesiog kuriate loginį tomą, o mes susitvarkysime su "
+#~ "jam reikalingais fiziniais tomais ir tomų grupėmis. Mes taip pat "
+#~ "apdorosime tomų grupės priderinimą, kai pridėsite, pašalinsite ar "
+#~ "pakeisite loginio tomo dydį, kad jūms nereikėtų rūpintis nuobodžiomis "
+#~ "detalėmis.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ekrano išdėstymas\n"
+#~ "\n"
+#~ "Kairėje ekrano pusėje rodomos OS įdiegtys, kurias mums pavyko rasti šiame "
+#~ "kompiuteryje. Nauja %(productName)s įdiegtis yra sąrašo viršuje. Galite "
+#~ "spausti ant įdiegčių pavadinimų, jei norite pamatyti, kurias failų "
+#~ "sistemas jos įtraukia.\n"
+#~ "\n"
+#~ "Žemiau įvairių įdiegčių ir prijungimo taškų kairėje pusėje yra mygtukai "
+#~ "failų sistemai pridėti, pašalinti ar konfigūruoti.\n"
+#~ "\n"
+#~ "Ekrano dešinė pusė yra vieta, kur galite nustatyti šiuo metu pasirinktą "
+#~ "priungimo tašką.\n"
+#~ "\n"
+#~ "Apačioje kairėje matysite diegimui pasirinktų diskų santrauką. Galite "
+#~ "spausti ant mėlyno teksto detalesnei informacijai apie pasirinktus "
+#~ "diskus.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kai sukurti naują failų sistemą naujame įrenginyje\n"
+#~ "\n"
+#~ "1. Spauskite mygtuką +.\n"
+#~ "2. Įveskite prijungimo tašką ir dydį. (Patarimas: užveskite rodyklę virš "
+#~ "bet kurio tekstinio lauką pagalbai gauti.)\n"
+#~ "3. Pasirinkite naują prijungimo tašką skiltyje „Nauja %(productName)s "
+#~ "įdiegtis“ kairėje ekrano pusėje ir pritaikykite ją savo poreikiams.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaip performatuoti įrenginį/failų sistemą, kuri jau yra diske\n"
+#~ "\n"
+#~ "1. Pasirinkite failų sistemą kairėje ekrano pusėje.\n"
+#~ "2. Spauskite išskleidėją „Tinkinti“ prijungimo taško pritaikymo srityje "
+#~ "dešinėje ekrano pusėje.\n"
+#~ "3. Pažymėkite žymimąjį langelį „Performatuoti“, pasirinkite failų sistemą "
+#~ "ir, jei taikoma, įveskite prijungimo tašką aukščiau tekstiniame lauke "
+#~ "„Prijungimo taškas“.\n"
+#~ "4. Spauskite „Pritaikyti pakeitimus“\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaip nustatyti prijungimo tašką failų sistemai, kur jau yra diske\n"
+#~ "\n"
+#~ "1. Pasirinkite failų sistemą kairėje ekrano pusėje.\n"
+#~ "2. Įveskite prijungimo tašką tekstiniame lauke „Prijungimo taškas“ "
+#~ "prijungimo taško pritaikymo srityje.\n"
+#~ "3. Spauskite „Pritaikyti pakeitimus“\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaip pašalinti esamas failų sistemas iš diskų\n"
+#~ "\n"
+#~ "1. Kairėje ekrano pusėje pasirinkite failų sistemą, kurią norite "
+#~ "pašalinti.\n"
+#~ "2. Spauskite mygtuką -.\n"
+#~ "\n"
+#~ "Patarimas: esamo įrenginio diske pašalinimas iš „Nauja %(productName)s "
+#~ "diegtis“ nepašalina jo iš disko. Tai tik atstato įrenginį į jo pradinę "
+#~ "būseną. Esamam disko įrenginiui pašalinti turite jį pasirinkti bet "
+#~ "kurioje iš kitų įdiegčių (arba „Nežinoma“) ir paspausti mygtuką -.\n"
+#~ "\n"
+#~ "\n"
+#~ "Patarimai\n"
+#~ "\n"
+#~ "Galite įvesti naujoms failų sistemoms dydžius, kurie yra dedesni nei visa "
+#~ "laisva vieta. Diegėjas priartės kiek įmanoma prie jūsų prašomų dydžių.\n"
+#~ "\n"
+#~ "Numatytai nauji įrenginiai naudoja bet kuriuos/visus jūsų pasirinktus "
+#~ "diskus.\n"
+#~ "\n"
+#~ "Galite pakeisti, kuriame diske naujas įrenginys bus išskirtas paspausdami "
+#~ "konfigūravimo mygtuką (su įrankių grafika), kol įrenginys yra pažymėtas.\n"
+#~ "\n"
+#~ "Pridedant naują prijungimo tašką paspaudus mygtuką +, palikite dydžio "
+#~ "lauką tuščią visai laisvai vietai naudoti.\n"
+#~ "\n"
+#~ "Kai pašalinsite paskutinį įrenginį iš konteinerio įrenginio, tokio kaip "
+#~ "LVM tomų grupė, mes automatiškai pašalinsime šį konteinerio įrenginį, "
+#~ "padarydami vietos naujiems įrenginiams.\n"
+#~ "\n"
+#~ "Kai paskutinis skirsnis yra pašalinamas iš disko, šis diskas gali būti "
+#~ "perinicializuotas su nauja skirsnių lentele, jei mes manome, kad yra "
+#~ "labiau tinkamas tipas tam diskui.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "TINKLO KONFIGŪRACIJA"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Klaida parsiunčiant paketų metaduomenis..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Nieko nepasirinkta"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Trūksta aparatinės programinės įrangos"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Reikia patvirtinti tapatybę"
+
+#~ msgid "column"
+#~ msgstr "stulpelis"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Skirsnio tipas:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Tarpinio serverio URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Naudotojo vardas</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Slaptažodis</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Šis prijungimo taškas yra netinkamas. Mėginsite kitą?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etiketė:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Failų sistema:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID Įrenginys"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Konfigūruoti pasirinktą prijungimo tašką."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Spauskite pagalbai"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">PRIEINAMA VIETOS</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">IŠ VISO VIETOS</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Atlikta"
 
@@ -4418,41 +6460,9 @@ msgstr "Užverti"
 #~ msgid "Install on System"
 #~ msgstr "Instaliuoti į Sistemą"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Kilo ši klaida nustatant diegimo saugyklą\"\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Diegimo negalima tęsti."
-
 #~ msgid "Exit installer"
 #~ msgstr "Išeinama iš diegyklės"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Diegimas buvo sustabdytas, kadangi atrodo yra problema su technine "
-#~ "įranga. Tikslus klaidos pranešimas:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Diegyklė dabar baigs darbą."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Aptikta techninės įrangos klaida"
-
 #~ msgid "_Exit installer"
 #~ msgstr "Iš_eiti iš diegyklės"
 
@@ -4745,9 +6755,6 @@ msgstr "Užverti"
 #~ msgid "Software Development"
 #~ msgstr "Programinės įrangos kūrimas"
 
-#~ msgid "Web Server"
-#~ msgstr "Žiniatinklio serveris"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimalus"
 
@@ -4791,49 +6798,6 @@ msgstr "Užverti"
 #~ "kurių negalima ištrinti:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Jūs neapibrėžėte šakninio skirsnio (/), kuris yra būtinas %s diegimui "
-#~ "tęsti."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Jūsų šakninis skirsnis yra mažiau nei 250 megabaitų, tai yra dažniausiai "
-#~ "per mažai %s diegimui."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Ši platforma reikalauja dedikuoto /boot skirsnio ar loginio tomo.  Jei "
-#~ "nenorite /boot tomo, turite patalpinti / dedikuotame ne LVM skirsnyje."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Jūsų %(mount)s skirsnis yra mažiau nei %(size)s megabaitų, tai yra "
-#~ "mažiau, nei rekomenduojama normaliam %(productName)s diegimui."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Jūsų %(mount)s skirsnis yra per mažas %(format)s formatavimui (leidžiamas "
-#~ "dydis yra nuo %(minSize)d MB iki %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Jūsų %(mount)s skirsnis yra per didelis %(format)s formatavimui "
-#~ "(leidžiamas dydis yra nuo %(minSize)d MB iki %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "Diegiama USB įrenginyje.  Tai nebūtinai sukurs veikiančią sistemą."
@@ -4847,55 +6811,6 @@ msgstr "Užverti"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "jūs nesukūrėte įkėliklio pirmojo etapo tikslo įrenginio"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Jūs nesukūrėte įkėlimo skirsnio."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Jūsų BIOS pagrindo sistema reikalauja specialaus skirsnio įkėlimui su %s "
-#~ "nauju disko etiketės formatu (GPT). Tęsimui sukurkite 1MB „BIOS Boot“ "
-#~ "tipo skirsnį."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Jūs nenurodėte mainų skirsnio.  %(requiredMem)s MB atminties yra būtina "
-#~ "tęsti diegimą be mainų srities, bet jūs turite tik %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Jūs nenurodėte mainų skirsnio.  Nors tai nėra griežtai reikalaujama "
-#~ "visais atvejais, tai reikšmingai padidins našumą daugelyje įdiegčių."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Bent vienas iš jūsų mainų įrenginių neturi UUID, tai yra dažna mainų "
-#~ "sritis, sukurta naudojant senesnes mkswap versijas. Į šiuos įrenginius "
-#~ "bus kreipiamasi pagal įrenginio kelią iš /etc/fstab, o tai nėra idealu, "
-#~ "kadangi įrenginių keliai gali keistis dėl įvairių priežasčių."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Šis prijungimo taškas yra netinkamas.  %s katalogas turi būti / failų "
-#~ "sistemoje."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Prijungimo taškas %s turi būti linux failų sistemoje."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux vietoje %s"
 
@@ -4905,12 +6820,6 @@ msgstr "Užverti"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s architektūrai %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatuojamas DASD įrenginys"
-#~ msgstr[1] "Formatuojami DASD įrenginiai"
-#~ msgstr[2] "Formatuojami DASD įrenginiai"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Ruošiamas %d DASD įrenginys naudojimui su Linux..."
@@ -5183,9 +7092,6 @@ msgstr "Užverti"
 #~ msgid "Error setting root password"
 #~ msgstr "Klaida nustatant root slaptažodį"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Turite pateikti ir patvirtinti slaptažodį."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Pašalinti paketus"
 
@@ -5219,24 +7125,12 @@ msgstr "Užverti"
 #~ msgid "%s of %s"
 #~ msgstr "%s ir %s"
 
-#~ msgid "Region:"
-#~ msgstr "Regionas:"
-
-#~ msgid "City:"
-#~ msgstr "Miestas:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-valandų"
-
-#~ msgid "AM/PM"
-#~ msgstr "Nakt/Dien"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Pasirinkite priedus"
 
@@ -5323,9 +7217,6 @@ msgstr "Užverti"
 #~ msgid "configureButton"
 #~ msgstr "configurebutton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Baigtas skaidymas skirsniais"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "KONFIGŪRUOTI TOMŲ GRUPĘ"
 
diff --git a/anaconda/po/lv.po b/anaconda/po/lv.po
index 380dc85..db8a5d5 100644
--- a/anaconda/po/lv.po
+++ b/anaconda/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/fedora/language/"
@@ -23,211 +23,445 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Palaist VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Izmantot teksta režīmu"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Labi"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Palaiž pirmsinstalēšanas skriptus"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Sāk instalēšanas procesu"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Veic pēc-instalēšanas konfigurēšanu"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -236,87 +470,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Palaiž pirmsinstalēšanas skriptus"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Datora nosaukumam jābūt ar 255 vai mazāk rakstzīmēm."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Datora nosaukumam jāsākas ar derīgu rakstzīmi apgabalā 'a-z', 'A-Z', vai "
-"'0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -325,7 +849,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s instalācija"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Palaidiet %s, lai atmontētu sistēmu, kad būsiet beidzis."
@@ -338,8 +867,8 @@ msgstr "Pēc pabeigšanas izejiet no čaulas (shell) un sistēma tiks pārstart
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Nevar atrast /bin/sh !  Čaula netiks palaista"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Glābt"
 
@@ -377,28 +906,22 @@ msgstr "Sistēmas glābšana"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Kurā ierīcē ir jūsu instalācijas saknes sadaļa?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Labi"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Iziet"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Pēc iziešanas no čaulas, sistēma tiks pārstartēta automātiski."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -411,7 +934,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -420,28 +943,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nav Linux sadaļu. Pārstartējas.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Pēc iziešanas no čaulas, sistēma tiks pārstartēta automātiski."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Glābšanas režīms"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "Nav Linux sadaļu. Spiediet taustiņu 'enter', lai tiktu pie čaulas.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Jūsu sistēma ir piemontēta %s mapē."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Jūsu norādītā saknes sadaļā ir mazāka par 250 megabaitiem, kas ir par maz, "
+"lai instalētu %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Jūs neesat norādījis saknes sadaļu (/), kas ir nepieciešama, lai turpinātu "
+"%s instalēšanu."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Jūsu norādītā saknes sadaļā ir mazāka par 250 megabaitiem, kas ir par maz, "
+"lai instalētu %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Jūs neesat izveidojis ielādējamu sadaļu."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Jūs neesat norādījis maiņvietas sadaļu. Vairumā gadījumu maiņvietas sadaļas "
+"esamība var būtiski paātrināt sistēmas darbību."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -541,84 +1243,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Kļūda, instalējot pakotni"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Nepieciešams vairāk vietas sekojošās datņu sistēmās:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Kļūda, instalējot pakotni"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Pēc-instalēšanas"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Gatavojas instalēt"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Pēc-instalēšanas"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Nav iespējams uzdot jautājumu komandrindas režīmā!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Kļūda"
 
@@ -642,31 +1492,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -681,451 +1533,523 @@ msgstr ""
 "savienotos ar šo datoru no cita datora un sāktu grafisku instalēšanu vai arī "
 "turpināsiet instalēšanu teksta režīmā?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Parolei jāsatur vismaz sešas rakstzīmes."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Parolei jāsatur vismaz sešas rakstzīmes."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "failu sistēmas konfigurācijai pietrūkst tipa"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Instalēšanas sākas"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Veic pēc-uzlabošanas konfigurēšanu"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Palaist VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Instalēšanas progress"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Kļūda, instalējot pakotni"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "ierīce, kas satur /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Programmatūras izstrāde"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Brīdinājums"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1141,581 +2065,408 @@ msgstr "Tiek izpildīts"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s instalācija"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Jums jāizveido jauna failu sistēma uz saknes ierīces."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Jums jāizveido jauna failu sistēma uz saknes ierīces."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Programmatūras izstrāde"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1742,279 +2493,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 adrese"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 adrese"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "At_celt"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Programmatūras izstrāde"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Kļūda, iestatot krātuvi"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Kļūda, iestatot krātuvi"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2022,14 +2797,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2038,33 +2813,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2072,95 +2853,109 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Labi"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2172,68 +2967,164 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Jums jāizveido jauna failu sistēma uz saknes ierīces."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Izveido %(type)s uz %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2242,951 +3133,1372 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Turpināt"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "At_celt"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Labi"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Tīmekļa serveris"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Apstiprināt"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Nav pieejamu tīklu"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Izmantot teksta režīmu"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Ietilpība"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ierīce"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Apstiprināt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Nav pieejamu tīklu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Apstiprināt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Apstiprināt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Apstiprināt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Lietotājvārds"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Savienojums sekmīgs!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI sistēmas sadaļa"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "Izi_et no instalatora"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI sistēmas sadaļa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Šifrēts"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI sistēmas sadaļa"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Labi"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Apstiprināt"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Pievienot"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Labi"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID ierīce"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Pievienot"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Darbības kļūda."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Darbības kļūda."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3194,648 +4506,1038 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Kādu valodu vēlaties izmantot sistēmas instalēšanas procesā?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Turpināt"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Apstiprināt"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Brīvs"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ierīce"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Pievienot"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Šifrēts"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Ietilpība"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID ierīce"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID ierīce"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Šifrēts"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID ierīce"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Apstiprināt"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "At_celt"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Labi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 adrese"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Lietotājvārds"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Labi"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID ierīce"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Brīvs"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Ietilpība"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Lietotājvārds"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ierīce"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Šifrēts"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Labi"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Apstiprināt"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Labi"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI sistēmas sadaļa"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Pēc-instalēšanas"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Gatavojas instalēt"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Veic pēc-uzlabošanas konfigurēšanu"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Pā_rstartēt"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3849,40 +5551,41 @@ msgstr "Instalēt"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalēt dzīvo CD uz cietā diska"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Sāk instalēšanu uz cietā diska"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nepietiek RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3891,60 +5594,81 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Palaiž teksta režīmu."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Kļūda"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Datora nosaukumam jāsākas ar derīgu rakstzīmi apgabalā 'a-z', 'A-Z', vai "
+#~ "'0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Nepieciešams vairāk vietas sekojošās datņu sistēmās:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Nav iespējams uzdot jautājumu komandrindas režīmā!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Lietotājvārds"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ierīce"
+
 #~ msgid "Completed"
 #~ msgstr "Izpildīts"
 
@@ -3954,9 +5678,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Iziet no instalatora"
 
-#~ msgid "_Exit installer"
-#~ msgstr "Izi_et no instalatora"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Trūkst IP adrese."
 
@@ -3996,12 +5717,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "Tas nav pareizais %s disks."
 
-#~ msgid "No Network Available"
-#~ msgstr "Nav pieejamu tīklu"
-
-#~ msgid "Re_boot"
-#~ msgstr "Pā_rstartēt"
-
 #~ msgid "_Eject"
 #~ msgstr "_Izgrūst"
 
@@ -4065,9 +5780,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Grafiska darbvirsma"
 
-#~ msgid "Web Server"
-#~ msgstr "Tīmekļa serveris"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimāla"
 
@@ -4089,20 +5801,6 @@ msgstr ""
 #~ msgid "This device is part of a LVM volume group."
 #~ msgstr "Šī ierīce ir daļa no LVM sējuma grupas."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Jūs neesat norādījis saknes sadaļu (/), kas ir nepieciešama, lai "
-#~ "turpinātu %s instalēšanu."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Jūsu norādītā saknes sadaļā ir mazāka par 250 megabaitiem, kas ir par "
-#~ "maz, lai instalētu %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "Instalē uz USB ierīces. Tas var nebeigties ar strādājošu sistēmu."
@@ -4113,17 +5811,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Instalē uz FireWire ierīces. Tas var nebeigties ar strādājošu sistēmu."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Jūs neesat izveidojis ielādējamu sadaļu."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Jūs neesat norādījis maiņvietas sadaļu. Vairumā gadījumu maiņvietas "
-#~ "sadaļas esamība var būtiski paātrināt sistēmas darbību."
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo neizdevās %s"
 
diff --git a/anaconda/po/mai.po b/anaconda/po/mai.po
index 648e6a9..0992bc0 100644
--- a/anaconda/po/mai.po
+++ b/anaconda/po/mai.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Maithili (http://www.transifex.com/projects/p/fedora/language/"
@@ -22,211 +22,444 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC प्रारंभ करू"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "पाठ मोडक उपयोग करू"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "बेस"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "पूर्व संस्थापित स्क्रिप्ट चलाए रहल अछि"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "संस्थापन प्रक्रिया आरंभ कए रहल अछि"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "उत्तर संस्थापन विन्यास चलाए रहल अछि"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -235,87 +468,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "पूर्व संस्थापित स्क्रिप्ट चलाए रहल अछि"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "मेजबाननाम 255 अथवा एकरासँ कम अक्षर नमाइ क' होबा चाही."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"मेजबाननाम केँ 'a-z' अथवा 'A-Z' अथवा '0-9' सीमा मे एकटा उचित अक्षर सँ अवश्य प्रारंभ "
-"होबा चाही"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -324,7 +847,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -337,8 +865,8 @@ msgstr "जखन समाप्त हुए, कृप्या शैल स
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "/bin/sh केँ चलाबै क' लेल पाबै मे असमर्थ!  शेल आरंभ करबा मे असमर्थ"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "बचाव"
 
@@ -376,28 +904,22 @@ msgstr "बचाबै क' लेल सिस्टम"
 msgid "Which device holds the root partition of your installation?"
 msgstr "कओन सँ विभाजन अहाँक संस्थापनक रूट विभाजन केँ पकड़ने अछि?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "बेस"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "निकास"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -410,7 +932,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -419,28 +941,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "अहाँक पास कोनो Linux विभाजन नहि अछि.  फेर बूट कए रहल अछि.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "बचाव प्रकार"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "%s निर्देशिका क' अंतर्गत अहाँक सिस्टम आरोहित अछि."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"अहाँक रूट विभाजन 250मेगाबाइट सँ कम अछि जे %s क' संस्थापन क' लेल एतबा छोट अछि जे "
+"संस्थापन नहि भ' सकैछ."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"अहाँ एकटा रूट विभाजन (/)केँ परिभाषित नहि कएने अछि. जे %s क' संस्थापन क' जारी करबा क' "
+"लेल आवश्यक अछि."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"अहाँक रूट विभाजन 250मेगाबाइट सँ कम अछि जे %s क' संस्थापन क' लेल एतबा छोट अछि जे "
+"संस्थापन नहि भ' सकैछ."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "अहाँ एकटा बूट हएबला विभाजन नहि बनैने छी."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"अहाँ एकटा स्वैप विभाजन निर्दिष्ट नहि कएने अछि. यद्यपि सबहि स्थितिसभमे जरूरी नहि छी, "
+"बेसी संस्थापन क' लेल ई उत्पादकता बढ़ाए देत अछि."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "ई आरोह बिंदु अमान्य अछि. / फाइल सिस्टम पर %s निर्देशिका केँ अवश्य होनाए अछि."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s आरोह बिंदु केँ जरूर एकटा लिनक्स फाइल सिस्टम होएबा चाही."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -552,84 +1253,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "संस्थापन श्रोत सँ विनिमय क' लेल तैआर कए रहल अछि"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "संकुलसभक संस्थापनमे त्रुटि"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "निम्न फाइल सिस्टम पर अहाँक बेसी स्थान क' जरूरत अछि:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "संस्थापन श्रोत सँ विनिमय क' लेल तैआर कए रहल अछि"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "संकुलसभक संस्थापनमे त्रुटि"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "उत्तर संस्थापन"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "संस्थापित करबाक लेल तैआर कए रहल अछि"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "उत्तर संस्थापन"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "कमांड लाइन प्रकारमे कोनो प्रश्न नहि राखि सकैत छी!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -653,31 +1502,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -692,451 +1543,522 @@ msgstr ""
 "आरंभ कएनाइ चाहब आओर आरेखीय संस्थापन सँ कार्य निष्पादन करब अथवा पाठ मोड संस्थापनकेँ जारी "
 "राखब?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "गुड़किल्ली कम सँ कम छह अक्षर क' जरूर होनाइ चाही."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "गुड़किल्ली कम सँ कम छह अक्षर क' जरूर होनाइ चाही."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "फाइल सिस्टम विन्यास क एकटा प्रकार अनुपस्थित अछि"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "संस्थापन प्रारंभ भ' रहल अछि"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "उत्तर संस्थापन विन्यास चलाए रहल अछि"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC प्रारंभ करू"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "संस्थापन प्रगति"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "संस्थापन श्रोत सँ विनिमय क' लेल तैआर कए रहल अछि"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "संकुलसभक संस्थापनमे त्रुटि"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "साफ्टवेयर विकास"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "चेतावनी"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1152,580 +2074,405 @@ msgstr "प्रगतिमे"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "साफ्टवेयर विकास"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1752,279 +2499,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "साफ्टवेयर विकास"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "रिपाजिटरी केँ सेट करबा मे त्रुटि"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "रिपाजिटरी केँ सेट करबा मे त्रुटि"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2032,14 +2803,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2048,128 +2819,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "बेस"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2180,68 +2971,164 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s आरोह बिंदु केँ जरूर एकटा लिनक्स फाइल सिस्टम होएबा चाही."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2249,947 +3136,1356 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "जारी राखू (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "बेस"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "वेब सर्वर"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "संपुष्ट करू"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "कोनो संजाल मोजुद नहि"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "पाठ मोडक उपयोग करू"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID युक्ति"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "जोड़ू (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "संपुष्ट करू"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "कोनो संजाल मोजुद नहि"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "संपुष्ट करू"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "संपुष्ट करू"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "संपुष्ट करू"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "जुड़ि गेल!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI सिस्टम विभाजन"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "संस्थापक छोड़ू (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI सिस्टम विभाजन"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI सिस्टम विभाजन"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "जोड़ू (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "बेस"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "संपुष्ट करू"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "जोड़ू (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "बेस"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID युक्ति"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "जोड़ू (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3197,645 +4493,1011 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "संस्थापन प्रक्रिया क' समय अहाँ कओन भाषाक प्रयोग कएनाइ चाहैत छी?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "जारी राखू (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "संपुष्ट करू"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "मुक्त"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID युक्ति"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "जोड़ू (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID युक्ति"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID युक्ति"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID युक्ति"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "संपुष्ट करू"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "बेस"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "कोनो आरंभकर्ताक नाम सेट नहि"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "बेस"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID युक्ति"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "मुक्त"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID युक्ति"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "बेस"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "संपुष्ट करू"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "बेस"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI सिस्टम विभाजन"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "उत्तर संस्थापन"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "संस्थापित करबाक लेल तैआर कए रहल अछि"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "उत्तर संस्थापन विन्यास चलाए रहल अछि"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "रिबूट करू (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3849,40 +5511,41 @@ msgstr "संस्थापित करू"
 msgid "Install the live CD to your hard disk"
 msgstr "अपन हार्ड डिस्कमे लाइव सीडी संस्थापित करू"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3891,60 +5554,77 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "त्रुटि"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "प्रदर्शक मोड चर सेट नहि अछि. पाठ मोड शुरू कए रहल अछि."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "आलेखी संस्थापन मोजुद नहि अछि.  पाठ प्रकार प्रारंभ कए रहल अछि."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "मेजबाननाम केँ 'a-z' अथवा 'A-Z' अथवा '0-9' सीमा मे एकटा उचित अक्षर सँ अवश्य प्रारंभ "
+#~ "होबा चाही"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "निम्न फाइल सिस्टम पर अहाँक बेसी स्थान क' जरूरत अछि:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "कमांड लाइन प्रकारमे कोनो प्रश्न नहि राखि सकैत छी!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID युक्ति"
+
 #~ msgid "Completed"
 #~ msgstr "पूर्ण"
 
@@ -3977,9 +5657,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "संस्थापक छोड़ू"
 
-#~ msgid "_Exit installer"
-#~ msgstr "संस्थापक छोड़ू (_E)"
-
 #~ msgid "IP address is missing."
 #~ msgstr "IP पता गुम भ' रहल अछि"
 
@@ -4012,9 +5689,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "रिपाजिटरी %r विन्यास मे गुम नाम अछि, id क' प्रयोग कए रहल अछि"
 
-#~ msgid "No Network Available"
-#~ msgstr "कोनो संजाल मोजुद नहि"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4022,9 +5696,6 @@ msgstr ""
 #~ "अहाँक किछु सॉफ्टवेयर रिपाजिटरीक लेल संजालनक जरूरत अछि मुदा अहाँक सिस्टम पर संजाल "
 #~ "सक्रिय करबा मे त्रुटि छल."
 
-#~ msgid "Re_boot"
-#~ msgstr "रिबूट करू (_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "बाहर निकालू (_E)"
 
@@ -4144,9 +5815,6 @@ msgstr ""
 #~ msgid "Retrieving installation information for %s."
 #~ msgstr "%s क' लेल संस्थापन सूचना पाबि रहल अछि."
 
-#~ msgid "Web Server"
-#~ msgstr "वेब सर्वर"
-
 #~ msgid "This partition is holding the data for the hard drive install."
 #~ msgstr "हार्ड ड्राइव संस्थापन क' लेल ई विभाजन आंकड़ा राखने अछि."
 
@@ -4174,20 +5842,6 @@ msgstr ""
 #~ "सकैत अछि:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "अहाँ एकटा रूट विभाजन (/)केँ परिभाषित नहि कएने अछि. जे %s क' संस्थापन क' जारी करबा "
-#~ "क' लेल आवश्यक अछि."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "अहाँक रूट विभाजन 250मेगाबाइट सँ कम अछि जे %s क' संस्थापन क' लेल एतबा छोट अछि जे "
-#~ "संस्थापन नहि भ' सकैछ."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4201,25 +5855,6 @@ msgstr ""
 #~ "FireWire युक्ति पर संस्थापित कए रहल अछि.  ई कार्यशील सिस्टम उत्पन्न कए सकैत अछि "
 #~ "अथवा नहियो."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "अहाँ एकटा बूट हएबला विभाजन नहि बनैने छी."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "अहाँ एकटा स्वैप विभाजन निर्दिष्ट नहि कएने अछि. यद्यपि सबहि स्थितिसभमे जरूरी नहि छी, "
-#~ "बेसी संस्थापन क' लेल ई उत्पादकता बढ़ाए देत अछि."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "ई आरोह बिंदु अमान्य अछि. / फाइल सिस्टम पर %s निर्देशिका केँ अवश्य होनाए अछि."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s आरोह बिंदु केँ जरूर एकटा लिनक्स फाइल सिस्टम होएबा चाही."
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo विफल रहल %s कए लेल"
 
diff --git a/anaconda/po/mk.po b/anaconda/po/mk.po
index 5f64aa0..0d4f628 100644
--- a/anaconda/po/mk.po
+++ b/anaconda/po/mk.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,208 +24,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Подигни VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Користи текстуален режим"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Во ред"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -234,85 +467,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -321,7 +846,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -336,8 +866,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Спасување"
 
@@ -375,28 +905,22 @@ msgstr "Систем за спасување"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Во ред"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Излез"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -409,7 +933,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -418,28 +942,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Режим за спасување"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Вашиот систем е монтиран под папката %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Вашата root партиција е помала од 250 мегабајти што е обично премалку за "
+"инсталирање на %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Не ја одредивте root партицијата (/), која што е потребна за инсталацијата "
+"на %s да продолжи."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Вашата root партиција е помала од 250 мегабајти што е обично премалку за "
+"инсталирање на %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Не одредивте swap партиција.  Иако не се бара строго во сите случаи, "
+"значително ќе го подобри извршувањето на повеќето инсталации."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -532,84 +1235,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Потребен Ви е поголем простор на следниве податочни системи:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "постар пакет/и"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Инсталирај"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Инсталирај"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Не може да прашувате во командно-линиски режим!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Грешка"
 
@@ -633,31 +1482,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -672,447 +1523,520 @@ msgstr ""
 "за да се врзете на овој компјутер од друг компјутер и да спроведете графичка "
 "инсталација, или пак сакате да продолжите во тексутален режим?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Лозинката мора да содржи најмалку шест карактери."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Лозинката мора да содржи најмалку шест карактери."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Напредок на инсталацијата"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Подигни VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Напредок на инсталацијата"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Развој на софтвер"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Предупредување"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1127,580 +2051,405 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Развој на софтвер"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1727,277 +2476,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Развој на софтвер"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2005,14 +2778,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2021,128 +2794,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Во ред"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2153,68 +2946,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2222,945 +3110,1349 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Продолжи"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Во ред"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Користи текстуален режим"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID уред"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Додај"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Продолжи"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Продолжи"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Продолжи"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Поврзано!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Излези од инсталерот"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Предупредување"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Додај"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Во ред"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Додај"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Во ред"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID уред"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Додај"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3168,643 +4460,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Кој јазик сакате да го користите при инсталацијата?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Продолжи"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Слободни"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID уред"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Додај"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID уред"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID уред"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID уред"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Во ред"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Во ред"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID уред"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Слободни"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID уред"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Во ред"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Во ред"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Инсталирај"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Ре_стартирај"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3818,40 +5473,41 @@ msgstr "Инсталирај"
 msgid "Install the live CD to your hard disk"
 msgstr "Инсталирајте го живиот диск на Вашиот тврд диск"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3860,60 +5516,70 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Грешка"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Потребен Ви е поголем простор на следниве податочни системи:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Не може да прашувате во командно-линиски режим!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID уред"
+
 #~ msgid "Completed"
 #~ msgstr "Завршено"
 
@@ -3923,9 +5589,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Излези од инсталерот"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Излези од инсталерот"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Недостасува IP адреса."
 
@@ -3962,9 +5625,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "Тоа не е точниот %s диск."
 
-#~ msgid "Re_boot"
-#~ msgstr "Ре_стартирај"
-
 #~ msgid "_Retry"
 #~ msgstr "_Пробај пак"
 
@@ -3974,9 +5634,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "конфликт помеѓу датотеки"
 
-#~ msgid "older package(s)"
-#~ msgstr "постар пакет/и"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "недоволен простор на дискот"
 
@@ -4029,20 +5686,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Не можете да избришите партиција од LDL форматиран DASD."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Не ја одредивте root партицијата (/), која што е потребна за "
-#~ "инсталацијата на %s да продолжи."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Вашата root партиција е помала од 250 мегабајти што е обично премалку за "
-#~ "инсталирање на %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4056,14 +5699,6 @@ msgstr ""
 #~ "Инсталирање на „FireWire“ уред.  Ова може но можеби и нема да може да "
 #~ "продуцира систем за работа."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Не одредивте swap партиција.  Иако не се бара строго во сите случаи, "
-#~ "значително ќе го подобри извршувањето на повеќето инсталации."
-
 #~ msgid "Back"
 #~ msgstr "Назад"
 
diff --git a/anaconda/po/ml.po b/anaconda/po/ml.po
index 8cef2d2..83a180c 100644
--- a/anaconda/po/ml.po
+++ b/anaconda/po/ml.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
@@ -20,211 +20,445 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC ആരംഭിക്കുക"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "ടെക്സ്റ്റ് മോഡ് ഉപയോഗിക്കുക"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ശരി"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "പ്രീ-ഇന്‍സ്റ്റലേഷന്‍ സ്ക്രി്‍സ്ക്ക്രിപ്റ്റുകള്‍ പ്രവര്‍ത്തിക്കുന്നു"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ഇന്‍സ്റ്റലേഷന്‍ പ്രക്രിയ ആരംഭിക്കുന്നു"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "പോസ്റ്റ് ഇന്‍സ്റ്റലേഷന്‍ ക്രമീകരണം നടത്തുന്നു"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -233,87 +467,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "പ്രീ-ഇന്‍സ്റ്റലേഷന്‍ സ്ക്രി്‍സ്ക്ക്രിപ്റ്റുകള്‍ പ്രവര്‍ത്തിക്കുന്നു"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ഹോസ്റ്റിന്റെ നാമത്തില്‍ 255 അല്ലെങ്കില്‍ അതില്‍ കുറഞ്ഞ അക്കങ്ങളോ അക്ഷരങ്ങളോ പാടുളളൂ."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"ഹോസ്റ്റനെയിം തുടങ്ങുന്നതു് 'a-z', 'A-Z' അല്ലെങ്കില്‍ '0-9' എന്ന പരിധിയിലുളള "
-"അക്ഷരത്തിലായിരിക്കണം"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -322,7 +846,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s ഇന്‍സ്റ്റലേഷന്‍"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -337,8 +866,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "പ്രവര്‍ത്തനത്തിനായി /bin/sh ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല!  അതിനാല്‍ ഷെല്‍ ആരംഭിക്കുന്നതല്ല"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "രക്ഷപ്പെടുത്തുക(റെസ്ക്യൂ)"
 
@@ -376,28 +905,22 @@ msgstr "കംപ്യൂട്ടര്‍ രക്ഷപ്പെടുത
 msgid "Which device holds the root partition of your installation?"
 msgstr "നിങ്ങളുടെ ഇന്‍സ്റ്റലേഷന്റെ റൂട്ട് പാര്‍ട്ടീഷന്‍ ഏത് പാര്‍ട്ടീഷനിലാണ്?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ശരി"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "പുറത്ത് പോവുക"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "ഷെല്ലില്‍ നിന്നും പുറത്തു് പോകുമ്പോള്‍ സിസ്റ്റം ഓട്ടോമാറ്റിക്കായി റീബൂട്ട് ചെയ്യപ്പെടുന്നു."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -410,7 +933,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -419,28 +942,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "നിങ്ങള്‍ക്ക് ലിനക്സ് പാര്‍ട്ടീഷനുകള്‍ ലഭ്യമല്ല.  അതിനാല്‍ റീബൂട്ട് ചെയ്യുന്നു.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "റെസ്ക്യൂ മോഡ്"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "നിങ്ങള്‍ക്ക് ലിനക്സ് പാര്‍ട്ടീഷനുകള്‍ ലഭ്യമല്ല. ഷെല്‍ ലഭിയ്ക്കുന്നതിനായി തിരികെ പോകുക. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "നിങ്ങളുടെ സിസ്റ്റം %s എന്ന ഡയറക്ടറിയില്‍ മൌണ്ട് ചെയ്തിരിക്കുന്നു."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"നിങ്ങളുടെ റൂട്ട് പാര്‍ട്ടീഷന്‍ 250 മെഗബൈറ്റിനേക്കാള്‍ കുറവാണ്, %s ഇന്‍സ്റ്റോള്‍ ചെയ്യുവാന്‍ ഇത് "
+"മതിയാവില്ല."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"നിങ്ങള്‍ റൂട്ട് പാര്‍ട്ടീഷന്‍(/) ഡിഫൈന്‍ ചെയ്തിട്ടില്ല,%s-ന്റെ ഇന്‍സ്റ്റലേഷനുമായി മുന്നോട്ട് പോകുന്നതിന് "
+"ഇത് വളരെ അത്യാവശ്യമാണ്."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"നിങ്ങളുടെ റൂട്ട് പാര്‍ട്ടീഷന്‍ 250 മെഗബൈറ്റിനേക്കാള്‍ കുറവാണ്, %s ഇന്‍സ്റ്റോള്‍ ചെയ്യുവാന്‍ ഇത് "
+"മതിയാവില്ല."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "നിങ്ങള്‍ ഒരു ബൂട്ട് ചെയ്യുവാന്‍ സാധിക്കുന്ന പാര്‍ട്ടീഷന്‍ ഉണ്ടാക്കിയിട്ടില്ല."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"നിങ്ങള്‍ ഒരു സ്വാപ്പ് പാര്‍ട്ടീഷന്‍ നിര്‍ദ്ദേശിച്ചിട്ടില്ല.  എല്ലായ്പ്പോഴും ഇത് ആവശ്യമില്ല എങ്കിലും, "
+"മിക്ക ഇന്‍സ്റ്റലേഷനുകളുടേയും പ്രവര്‍ത്തനശേഷി ഇവ വര്‍ദ്ദിപ്പിക്കുന്നു."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "ഈ മൌണ്ട് പോയിന്റ് അസാധുവാണു്.  %s ഡയറക്ടറി / ഫയല്‍ സിസ്റ്റത്തിലായിരിക്കണം."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s എന്ന മൌണ്ട് പോയിന്റ് ഉപയോഗത്തില്‍ ആണ്, ദയവായി മറ്റൊന്ന് തിരഞ്ഞെടുക്കുക."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -553,84 +1255,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ഇന്‍സ്റ്റലേഷന്‍ സോഴ്സില്‍ നിന്നും ട്രാന്‍സാക്ക്ഷനായി തയ്യാറാകുന്നു"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "പാക്കേജുകള്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്യുന്നതില്‍ പിശക്"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "താഴെ കാണിക്കുന്ന ഫൈല്‍ സിസ്റ്റമുകളില്‍ നിങ്ങള്‍ക്ക് ഇനിയും സ്ഥലം ആവശ്യമുണ്ട്:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ഇന്‍സ്റ്റലേഷന്‍ സോഴ്സില്‍ നിന്നും ട്രാന്‍സാക്ക്ഷനായി തയ്യാറാകുന്നു"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "പാക്കേജുകള്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്യുന്നതില്‍ പിശക്"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "പോസ്റ്റ് ഇന്‍സ്റ്റലേഷന്‍"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്യുന്നതിനായി തയ്യാറാകുന്നു"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "പോസ്റ്റ് ഇന്‍സ്റ്റലേഷന്‍"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "കമാന്‍ഡ് ലൈന്‍ മോഡില്‍ ചോദ്യം പാടില്ല!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "പിശക്"
 
@@ -654,31 +1504,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -693,451 +1545,522 @@ msgstr ""
 "കംപ്യൂട്ടറിലേക്ക് കണക്ട് ചെയ്ത് ഗ്രാഫിക്കല്‍ ഇന്‍സ്റ്റോള്‍ നടത്തുകയോ അല്ലെങ്കില്‍ ടെക്സ്റ്റ് മോഡില്‍ "
 "ഇന്‍സ്റ്റലേഷനുമായി മുന്നോട്ട് നീങ്ങുകയോ ചെയ്യുന്നതിനായി VNC ആരംഭിക്കുവാന്‍ ആഗ്രഹിക്കുന്നുവോ? "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "പാസ്‌വേര്‍ഡില്‍ കുറ‍ഞ്ഞത് ആറ് അക്ഷരങ്ങളോ അക്കങ്ങളോ ഉണ്ടാവണം."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "പാസ്‌വേര്‍ഡില്‍ കുറ‍ഞ്ഞത് ആറ് അക്ഷരങ്ങളോ അക്കങ്ങളോ ഉണ്ടാവണം."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ഫയല്‍സിസ്റ്റം ക്രമീകരണത്തില്‍ തരം ലഭ്യമല്ല"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ഇന്‍സ്റ്റലേഷന്‍ ആരംഭിക്കുന്നു"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "പോസ്റ്റ് അപ്രഗേഡ് ക്രമീകരണം നടത്തുന്നു"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC ആരംഭിക്കുക"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ഇന്‍സ്റ്റോലേഷന്റെ സ്ഥിതി"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ഇന്‍സ്റ്റലേഷന്‍ സോഴ്സില്‍ നിന്നും ട്രാന്‍സാക്ക്ഷനായി തയ്യാറാകുന്നു"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "പാക്കേജുകള്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്യുന്നതില്‍ പിശക്"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "സോഫ്റ്റവയര്‍ ഡവലപ്പ്മെന്റ്"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "മുന്നറിയിപ്പു്"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1153,580 +2076,405 @@ msgstr "പുരോഗമിക്കുന്നു"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s ഇന്‍സ്റ്റലേഷന്‍"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "സോഫ്റ്റവയര്‍ ഡവലപ്പ്മെന്റ്"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1753,279 +2501,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 വിലാസം"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 വിലാസം"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_റദ്ദാക്കുക"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "സോഫ്റ്റവയര്‍ ഡവലപ്പ്മെന്റ്"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "സംഭരണിയില്‍ ക്രമീരിക്കുന്നതില്‍ പിശക്"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "സംഭരണിയില്‍ ക്രമീരിക്കുന്നതില്‍ പിശക്"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2033,14 +2805,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2049,128 +2821,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ശരി"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2181,68 +2973,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s എന്ന മൌണ്ട് പോയിന്റ് ഉപയോഗത്തില്‍ ആണ്, ദയവായി മറ്റൊന്ന് തിരഞ്ഞെടുക്കുക."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2250,951 +3139,1371 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "തുടരുക (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ശരി"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "വെബ് സര്‍വര്‍"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "ഉറപ്പ് വരുത്തുക"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "നെറ്റ്‌വര്‍ക്ക് ലഭ്യമല്ല"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ടെക്സ്റ്റ് മോഡ് ഉപയോഗിക്കുക"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "വ്യാപ്തി"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "റെയ്ഡ് ഡിവൈസ്"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "കൂട്ടുക (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "ഉറപ്പ് വരുത്തുക"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "നെറ്റ്‌വര്‍ക്ക് ലഭ്യമല്ല"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "ഉറപ്പ് വരുത്തുക"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "ഉറപ്പ് വരുത്തുക"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "ഉറപ്പ് വരുത്തുക"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ഉപയോക്തൃനാമം"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "കണക്ഷന്‍ ഇപ്പോള്‍ ലഭ്യമാണ്!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI സിസ്റ്റം പാര്‍ട്ടീഷന്‍"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ഇന്‍സ്റ്റോളറില്‍ നിന്നും പുറത്ത് കടക്കുക (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI സിസ്റ്റം പാര്‍ട്ടീഷന്‍"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI സിസ്റ്റം പാര്‍ട്ടീഷന്‍"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "കൂട്ടുക (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ശരി"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "ഉറപ്പ് വരുത്തുക"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "കൂട്ടുക (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ശരി"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "റെയ്ഡ് ഡിവൈസ്"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "കൂട്ടുക (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "പ്രക്രിയയില്‍ പിശക്."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "പ്രക്രിയയില്‍ പിശക്."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3202,648 +4511,1037 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ഇന്‍സ്റ്റലേഷനുവേണ്ടി നിങ്ങള്‍ ആഗ്രഹിക്കുന്ന ഭാഷ ഏത്?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "തുടരുക (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "ഉറപ്പ് വരുത്തുക"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ഫ്രീ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "റെയ്ഡ് ഡിവൈസ്"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "കൂട്ടുക (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "വ്യാപ്തി"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "റെയ്ഡ് ഡിവൈസ്"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "റെയ്ഡ് ഡിവൈസ്"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "റെയ്ഡ് ഡിവൈസ്"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "ഉറപ്പ് വരുത്തുക"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ശരി"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 വിലാസം"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "ഇനിഷ്യേറ്റര്‍ നെയിം സജ്ജമല്ല"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ഉപയോക്തൃനാമം"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ശരി"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "റെയ്ഡ് ഡിവൈസ്"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ഫ്രീ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "വ്യാപ്തി"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "ഉപയോക്തൃനാമം"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "റെയ്ഡ് ഡിവൈസ്"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ശരി"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "ഉറപ്പ് വരുത്തുക"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ശരി"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI സിസ്റ്റം പാര്‍ട്ടീഷന്‍"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "പോസ്റ്റ് ഇന്‍സ്റ്റലേഷന്‍"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്യുന്നതിനായി തയ്യാറാകുന്നു"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "പോസ്റ്റ് അപ്രഗേഡ് ക്രമീകരണം നടത്തുന്നു"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "റീബൂട്ട് ചെയ്യുക(_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3857,40 +5555,41 @@ msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്യുക"
 msgid "Install the live CD to your hard disk"
 msgstr "നിങ്ങളുടെ ഹാര്‍ഡ് ഡിസ്കിലേക്ക് ലൈവ് CD ഇന്‍സ്റ്റോള്‍ ചെയ്യുക"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "ആവശ്യത്തിനുളള റാം ഇല്ല"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3899,60 +5598,81 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " ടെക്സ്റ്റ് മോഡ് ആരംഭിക്കുന്നു."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "പിശക്"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "അവതരണ നിബന്ധനകള്‍ നിര്‍വചിച്ചിട്ടില്ല. ടെക്സ്റ്റ് മോഡ് ആരംഭിക്കുന്നു."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ഗ്രാഫിക്കല്‍ ഇന്‍സ്റ്റലേഷന്‍ ലഭ്യമല്ല. ടെക്സ്റ്റ് മോഡ് ആരംഭിക്കുന്നു."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "ഹോസ്റ്റനെയിം തുടങ്ങുന്നതു് 'a-z', 'A-Z' അല്ലെങ്കില്‍ '0-9' എന്ന പരിധിയിലുളള "
+#~ "അക്ഷരത്തിലായിരിക്കണം"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "താഴെ കാണിക്കുന്ന ഫൈല്‍ സിസ്റ്റമുകളില്‍ നിങ്ങള്‍ക്ക് ഇനിയും സ്ഥലം ആവശ്യമുണ്ട്:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "കമാന്‍ഡ് ലൈന്‍ മോഡില്‍ ചോദ്യം പാടില്ല!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "ഉപയോക്തൃനാമം"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "റെയ്ഡ് ഡിവൈസ്"
+
 #~ msgid "Completed"
 #~ msgstr "പൂര്‍ണ്ണമായിരിക്കുന്നു"
 
@@ -3986,9 +5706,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "ഇന്‍സ്റ്റോളറില്‍ നിന്നും പുറത്ത് കടക്കുക"
 
-#~ msgid "_Exit installer"
-#~ msgstr "ഇന്‍സ്റ്റോളറില്‍ നിന്നും പുറത്ത് കടക്കുക (_E)"
-
 #~ msgid "IP address is missing."
 #~ msgstr "IP വിലാസം ലഭ്യമല്ല."
 
@@ -4031,9 +5748,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Repository %r is missing name in configuration, using id"
 
-#~ msgid "No Network Available"
-#~ msgstr "നെറ്റ്‌വര്‍ക്ക് ലഭ്യമല്ല"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4041,9 +5755,6 @@ msgstr ""
 #~ "നിങ്ങളുടെ ചില സോഫ്റ്റ്‌വെയര്‍ റിപ്പോസിറ്ററികള്‍ക്ക് നെറ്റ്‌വര്‍ക്കിങ് ആവശ്യമുണ്ടു്. പക്ഷേ, നിങ്ങളുടെ "
 #~ "സിസ്റ്റമില്‍ നെറ്റ്‌വര്‍ക്ക് സജ്ജമാക്കുന്നതില്‍ പിശക് ഉണ്ടായിരിക്കുന്നു."
 
-#~ msgid "Re_boot"
-#~ msgstr "റീബൂട്ട് ചെയ്യുക(_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "ഡിസ്ക് _പുറത്തെടുക്കുക"
 
@@ -4169,9 +5880,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "ഗ്രാഫിക്കല്‍ ഡസ്ക്ടോപ്പ്"
 
-#~ msgid "Web Server"
-#~ msgstr "വെബ് സര്‍വര്‍"
-
 #~ msgid "Minimal"
 #~ msgstr "ഏറ്റവും കുറഞ്ഞതു്"
 
@@ -4202,20 +5910,6 @@ msgstr ""
 #~ "പാര്‍ട്ടീഷനുകള്‍ അടങ്ങുന്നു:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "നിങ്ങള്‍ റൂട്ട് പാര്‍ട്ടീഷന്‍(/) ഡിഫൈന്‍ ചെയ്തിട്ടില്ല,%s-ന്റെ ഇന്‍സ്റ്റലേഷനുമായി മുന്നോട്ട് "
-#~ "പോകുന്നതിന് ഇത് വളരെ അത്യാവശ്യമാണ്."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "നിങ്ങളുടെ റൂട്ട് പാര്‍ട്ടീഷന്‍ 250 മെഗബൈറ്റിനേക്കാള്‍ കുറവാണ്, %s ഇന്‍സ്റ്റോള്‍ ചെയ്യുവാന്‍ ഇത് "
-#~ "മതിയാവില്ല."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4229,25 +5923,6 @@ msgstr ""
 #~ "ഒരു FireWire ഡിവൈസില്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്യപ്പെടുന്നു.  ഒരു പ്രവര്‍ത്തിക്കുന്ന സിസ്റ്റം ഉണ്ടാക്കുവാന്‍ "
 #~ "ഇത് സഹായിക്കുകയോ സഹായിക്കാതെയിരിക്കുകയോ ചെയ്യാം."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "നിങ്ങള്‍ ഒരു ബൂട്ട് ചെയ്യുവാന്‍ സാധിക്കുന്ന പാര്‍ട്ടീഷന്‍ ഉണ്ടാക്കിയിട്ടില്ല."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "നിങ്ങള്‍ ഒരു സ്വാപ്പ് പാര്‍ട്ടീഷന്‍ നിര്‍ദ്ദേശിച്ചിട്ടില്ല.  എല്ലായ്പ്പോഴും ഇത് ആവശ്യമില്ല എങ്കിലും, "
-#~ "മിക്ക ഇന്‍സ്റ്റലേഷനുകളുടേയും പ്രവര്‍ത്തനശേഷി ഇവ വര്‍ദ്ദിപ്പിക്കുന്നു."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "ഈ മൌണ്ട് പോയിന്റ് അസാധുവാണു്.  %s ഡയറക്ടറി / ഫയല്‍ സിസ്റ്റത്തിലായിരിക്കണം."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s എന്ന മൌണ്ട് പോയിന്റ് ഉപയോഗത്തില്‍ ആണ്, ദയവായി മറ്റൊന്ന് തിരഞ്ഞെടുക്കുക."
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "%s-ല്‍ vginfo പരാജയപ്പെട്ടു"
 
diff --git a/anaconda/po/mr.po b/anaconda/po/mr.po
index 0f7f123..ddebd20 100644
--- a/anaconda/po/mr.po
+++ b/anaconda/po/mr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/"
@@ -28,217 +28,485 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot फाइलप्रणाली"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "RAID संच ज्यामध्ये '%s' समाविष्टीत असते त्यामध्ये खालील रैड स्तर पाहिजे: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr "RAID संच ज्यामध्ये '%s' समाविष्टीत असते त्यामध्ये खालील मेटाडेटा आवृत्ती पाहिजे: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "RAID संच ज्यामध्ये '%s' समाविष्टीत असते त्यामध्ये खालील साधन प्रकार पाहिजे: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s कडे खालीलपैकी एक डिस्कलेबल प्रकार पाहिजे: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s प्रकार %s प्रमाणे असणे अशक्य."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s ला %s पैकी एकावर माउंट करणे आवश्यक."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s हे आकारात %d व %d MB अंतर्गत पाहिजे"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s हे %dMB पेक्षा आकारात छोटे नसावे."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s हे %dMB पेक्षा मोठे नसावे."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s हे डिस्कच्या प्रथम %dMB अंतर्गत पाहिजे."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s प्राइमरि विभाजनवर पाहिजे."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s हे एंक्रिप्टेड ब्लॉक साधनवर नसावे."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s प्रकार %s प्रमाणे असणे अशक्य"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s कडे अतिरीक्त जागा नाही grub2 करीता, core.img एम्बेड करण्यासाठी, %s "
 "फाइलप्रणालीचा वापर करतेवेळी, %s वरील"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC सुरू करा"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "पाठय रीत वापरा"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "पासवर्ड ठरवले."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "पासवर्ड जुळत नाही!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "तुम्ही कमजोर पासवर्ड: %s पुरवले आहे.  कसेहिकरून वापरायचे असल्यास पूर्ण झाले दाबा."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "तुम्ही कमजोर पासवर्ड: %s पुरवले आहे.  कसेहिकरून वापरायचे असल्यास पूर्ण झाले दाबा."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "कमजोर"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "सुरेख"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "चांगले"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "मजबूत"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ठिक आहे"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "होय (_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "नाही (_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"प्रतिष्ठापन रेपॉजिटरी सेटअप करतेवेळी खालील त्रुटी आढळली:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"प्रतिष्ठापन पुढे चालू ठेवणे अशक्य."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"प्रतिष्ठापन रेपॉजिटरी सेटअप करतेवेळी खालील त्रुटी आढळली:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"प्रतिष्ठापन पुढे चालू ठेवणे अशक्य."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"प्रतिष्ठापनकरीता खालील चिन्ह लावलेल्या सॉफ्टवेअरमध्ये त्रुटी आहेत.  हे संभाव्यतया\n"
+"प्रतिष्ठापन स्रोत अंतर्गत त्रुटींमुळे आहे.  ह्या संकुलांना प्रतिष्ठापनातून काढून टाकण्याचा प्रयत्न "
+"शक्य आहे.\n"
+"प्रतिष्ठापन स्रोत बदला, किंवा इंस्टॉलरतून बाहेर पडा."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"हार्डवेअरमधील अडचणमुळे प्रतिष्ठापन थांबवले गेले. योग्य त्रुटी संदेश खालील प्रमाणे आहे:\n"
+"\n"
+"%s.\n"
+"\n"
+" इंस्टॉलर आत्ता बंद होईल."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"हार्डवेअरमधील अडचणमुळे प्रतिष्ठापन थांबवले गेले. योग्य त्रुटी संदेश खालील प्रमाणे आहे:\n"
+"\n"
+"%s.\n"
+"\n"
+" इंस्टॉलर आत्ता बंद होईल."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "हार्डवेअर त्रुटी आढळली"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"हार्डवेअरमधील अडचणमुळे प्रतिष्ठापन थांबवले गेले. योग्य त्रुटी संदेश खालील प्रमाणे आहे:\n"
+"\n"
+"%s.\n"
+"\n"
+" इंस्टॉलर आत्ता बंद होईल."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "संरचना URL (_C)"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "पूर्व-प्रतिष्ठापन स्क्रिप्टस् चालवत आहे"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "प्रतिष्ठापन स्रोत सेटअप करत आहे..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "पोस्ट-इंस्टॉल सेटअप कार्ये सुरू करत आहे"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow प्रमाणपत्र %s यास नेवटर्क आवश्यक आहे."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -250,87 +518,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s आढळले नाही. फायरवॉलची मांडणी अशक्य."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s आढळले नाही. फायरवॉलची मांडणी अशक्य."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "हि फाइल प्रणाली लेबल्स्करीता समर्थन पुरवत नाही."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "पूर्व-प्रतिष्ठापन स्क्रिप्टस् चालवत आहे"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "आयोजकनावाची लांबी 255 किंवा त्यापेक्षा कमी अक्षरांची असायला हवी."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"यजमाननावचे प्रारंभ वैध अक्षर क्षेत्र जसे कि 'a-z', 'A-Z', किंवा '0-9'  यानुरूप सुरू व्हायला "
-"हवे"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "जोडणी करत आहे..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "खंडीत करत आहे..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "वायर्ड् (%s) जुळले"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "वायरलेस %s सह जुळलेले आहे"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "जुडले नाही"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "नेटवर्क साधने अनुपलब्ध"
 
@@ -339,7 +897,12 @@ msgstr "नेटवर्क साधने अनुपलब्ध"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "नवीन %s %s प्रतिष्ठापन"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "पूर्ण झाल्यावर प्रणाली माउंट अशक्य करण्यासाठी %s चालवा."
@@ -352,8 +915,8 @@ msgstr "समाप्तीनंतर कृपया शेलच्या
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "कार्यान्वीतजोगी /bin/sh आढळले नाही!  शेल सुरू करणार नाही"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "बचाव"
 
@@ -399,21 +962,15 @@ msgstr "बचावाची प्रणाली"
 msgid "Which device holds the root partition of your installation?"
 msgstr "कोणते विभाजन तुमच्या प्रतिष्ठापनचे रूट विभाजन धारण करते?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ठिक आहे"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "बाहेर"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "शेलमधून बाहेर पडल्यावर प्रणाली आपोआप रीबूट होईल."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -422,7 +979,7 @@ msgstr ""
 "प्रणालीवर घाणेरडी फाइल प्रणाली आहे जी तुम्ही आरोहित न करण्यासाठी निवडली आहे. रिटर्न "
 "दाबून शेल सुरू करा जेथून fsck व विभाजने माउंट करणे शक्य आहे. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -443,7 +1000,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -456,28 +1013,234 @@ msgstr ""
 "\n"
 "शेल प्राप्त करण्यासाठी <return> दाबा."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "तुमच्याकडे Linux विभाजन नाही.  रिबूट करत आहे.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " शेलमधून बाहेर पडल्यावर प्रणाली आपोआप रीबूट होईल."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "बचाव रीत"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "तुमच्याकडे कुठलेहि Linux विभाजन नाही. शेल प्राप्त करण्यासाठी रिटर्न दाबा. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "तुमची प्रणाली %s निर्देशिकेखाली आरोहित झाली आहे."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "मानक विभाजन"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "डिस्क"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"कमी मेमरिचा वापर करतेवेळी संगणकावरील 'swap' क्षेत्र कार्यप्रणाली तर्फे\n"
+"वापरली जाते."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"संगणकावरील 'boot' क्षेत्र आहे, जेथे\n"
+"कार्यप्रणाली सुरू करण्यासाठीचे फाइल्स् साठवले जातात."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"संगणकावरील 'root' क्षेत्र आहे, जेथे\n"
+"कार्यप्रणाली सुरू करण्यासाठीचे फाइल्स् साठवले जातात."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"संगणकावरील 'home' क्षेत्र जेथे आपला व्यक्तिगत डाटा साठवला\n"
+"जातो."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS हार्डवेअरवरील GPT-विभाजीत डिस्क्सपासून बूटिंग सुरू करण्यासाठी\n"
+"BIOS बूट विभाजन आवश्यक आहे."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"ठराविक PPC प्लॅटफॉर्म्सवर बूटलोडर संरचनाचे भाग म्हणून PReP बूट विभाजन\n"
+"आवश्यक आहे."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"तुमचे रूट विभाजन 250 मेगाबाइट्स पेक्षा कमी आहे जे %s प्रतिष्ठापीत करण्यासाठी खूपच लहान आहे."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"तुम्ही रूट विभाजन (/) जे %s ची प्रतिष्ठापना चालू राहण्यासाठी आवश्यक असते, निश्चित केलेले "
+"नाही."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"या प्लॅटफॉर्मला विश्वासर्ह विभाज किंवा लॉजिकल वॉल्यूमकरीता /boot आवश्यक आहे.  /boot "
+"वॉल्यूम आवश्यक नसल्यास, / ला विश्वासर्ह विना-LVM विभाजनावर स्थीत करा."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"तुमचे %(mount)s विभाजन %(size)s मेगाबाईट्सपेक्षा कमी आहे, जे सामान्य %(productName)s "
+"प्रतिष्ठापनजोगी संकेतपेक्षा कमी आहे."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(format)s रूपणकरीता %(mount)s विभाजन खूप छोटे आहे (स्वीकार्य आकार %(minSize)d MB "
+"ते %(maxSize)d MB आहे)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(format)s रूपणकरीता %(mount)s विभाजन खूप मोठे आहे (स्वीकार्य आकार %(minSize)d MB "
+"ते %(maxSize)d MB आहे)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "नवीन साधन समाविष्ट करण्यास अशक्य. तपशीलकरीता क्लिक करा."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "तुम्ही बूटजोगी विभाजन निर्माण केले नाही."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"तुमच्या BIOS-आधारित प्रणालीला %sच्या नवीन डिस्क लेबल रूपण (GPT) सह विशेष विभाजनची "
+"आवश्यकता आहे. पुढे जाण्याकरीता, कृपया 1MB 'BIOS बूट' विभाजन प्रकार निर्माण करा."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"स्वॅप विभाजन निर्देशीत केले नाही.  स्वॅप विभाजनविना प्रतिष्ठापन चालू ठेवायचे असल्यास "
+"%(requiredMem)s MB स्मृती आवश्यक आहे, परंतु तुमच्याकडे फक्त %(installedMem)s MB आढळले."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"तुम्ही स्वॅप विभाजन दर्शविलेले नाही. जरी ते नेहमी काटेकोरपणे आवश्यक नसले, तरीही बऱ्याच "
+"प्रतिष्ठापनांसाठी त्यामुळे कृतीशीलतेत उठावदार सुधारणा होइल."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"किमान एक स्वॅप साधनांकडे UUID आढळली नाही, जे mkswap च्या जुण्या आवृत्तींचा वापर करून "
+"निर्मीत स्वॅप जागामध्ये सामान्य आहे. ह्या साधनांना /etc/fstab मधील साधन मार्गतर्फे संदर्भ "
+"केले जाते, जे अनुकूल नाही कारण साधन मार्गे विविध कारणास्तव बदलतात."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "माउंट पॉइंट अवैध आहे.  %s डिरेक्ट्री / फाइल प्रणालीवर असायला हवे."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "माउंट पॉइंट %s linux फाइल प्रणालीवर असायला हवी."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "पासफ्रेज:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -588,87 +1351,239 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "VNC पासवर्ड किमान 6 अक्षर लांबीचे नाही.\n"
 "कृपया नवीन द्या.  पासवर्ड नाहीकरीता रिकामे ठेवा."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "Fedora (_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "प्रतिष्ठापन स्रोतची मांडणी करण्यास अपयशी"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "संकुल मेटाडेटा डाउनलोड करतेवेळी त्रुटी..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "प्रतिष्ठापन स्रोत उपलब्ध नाही"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "सॉफ्टवेअर प्रतिष्ठापीत करत आहे"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "संकुल प्रतिष्ठापन प्रक्रिया सुरू करत आहे"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "खालील फाइल प्रणाल्यांवर तुम्हांस अधिक जागेची गरज आहे:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "प्रतिष्ठापन स्त्रोतपासून व्यवहार तयार करत आहे"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "प्रतिष्ठापीत करत आहे"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "पॅकेज मेटाडाटा डाऊनलोड करत आहे..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "प्रतिष्ठापीत करत आहे"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "प्रतिष्ठापनसाठी तयारी करत आहे"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "स्टोरेज संरचना तपासत आहे..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "पूर्वनिर्धारित शीर्षक"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "भाषांतरन"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "भाषांतरन"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "सॉफ्टवेअर"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "प्रणाली"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "प्रतिष्ठापन हब"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "स्वयं प्रतिष्ठापन सुरू करत आहे"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "आदेश पंक्ती रीतीमध्ये प्रश्न असू शकत नाही!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  कृपया वरपासून पर्याय पसंत करा [ बाहेर पडण्यासाठी 'q' | पुढे जाण्यासाठी 'c']: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "पुढे जाण्यापूर्वी कृपया सर्व स्पोक्स् पूर्ण करा"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "पूर्वनिर्धारित HUB शीर्षक"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "पुढे जाण्यापूर्वी कृपया सर्व स्पोक्स् पूर्ण करा"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "त्रुटी"
 
@@ -692,32 +1607,35 @@ msgstr "होय"
 msgid "no"
 msgstr "नाही"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "तुम्हाला नक्की बाहेर पडायचे?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  कृपया वरपासून पर्याय पसंत करा [ बाहेर पडण्यासाठी 'q' | पुढे जाण्यासाठी 'c']: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -731,219 +1649,258 @@ msgstr ""
 "तुमच्या यंत्रणेवर X सुरू होण्यास असमर्थ होता. तुम्ही VNC सुरू करून दुसऱ्या संगणकाद्वारे या "
 "संगणकास जोडून आलेखीय प्रतिष्ठापन करू इच्छिता की पाठ रीतीमध्येच प्रतिष्ठापन सुरू ठेवू इच्छिता?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC पासवर्ड"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "कृपया VNC पासवर्ड द्या. तुम्हाला दोनवेळा टाइप करावे लागेल. \n"
 "पासवर्ड नसल्यास रिकामे सोडा"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "पासवर्ड: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "पासवर्ड (खात्री करा): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "पासवर्ड जुळत नाही!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "पासवर्डाची लांबी किमान सहा अक्षरे इतकी असावी."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "पासवर्डाची लांबी किमान सहा अक्षरे इतकी असावी."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "वेळक्षेत्र सेटिंग्स्"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "वेळक्षेत्र ठरवले नाही."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "उपलब्ध क्षेत्र"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "उपलब्ध क्षेत्र"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "स्टोरेज संरचना तपासत आहे..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "वायर्ड् (%s) जुळले"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "वायर्ड् (%s) जुळले"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "यजमाननाव"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "यजमाननाव"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "यजमाननाव"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "संरचना पूर्ण करा (_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "गेटवे"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "फाइलप्रणाली संयोजना अंतर्गत प्रकार आढळले नाही"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "रूट पासवर्ड:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "पासवर्ड ठरवले."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "रूट खाते बंद केले."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "पासवर्ड ठरवले नाही."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "कृपया नवीन रूट पासवर्ड नीवडा. तुम्हाला दोनवेळा टाइप करावे लागेल."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "पासवर्ड: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "सर्व जागेचा वापर करा"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "अस्तित्वातील Linux प्रणालीला अदलाबदल करा"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "मोकळ्या जागेचा वापर करा"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "प्रतिष्ठापन लक्ष्य"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "डिस्क्स् नीवडले नाही"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "स्टोरेज संरचना तपासतेवेळी त्रुटी आढळली"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "स्टोरेज संरचना तपासतेवेळी त्रुटी आढळली"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "स्वयं विभाजन नीवडले"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "पसंतीचे विभाजन नीवडले"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -951,38 +1908,59 @@ msgstr ""
 "डिस्क्स् आढळले नाही.  कृपया संगणक पूर्णपणे बंद करा, किमान एक डिस्कसह जोडणी करा, व "
 "प्रतिष्ठापन पूर्ण करण्यासाठी पुनः सुरू करा."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "डिस्क्स् नीवडले नाही; कृपया प्रतिष्ठापनकरीता किमान एक डिस्क पसंत करा."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "स्टोरेज शोधत आहे..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "सुधारित स्टोरेज संरचना निर्माण करत आहे"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "स्टोरेज संरचना अपयशी: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "स्टोरेज संरचना तपासत आहे..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "स्वयंविभाजन पर्याय"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -991,41 +1969,41 @@ msgstr ""
 "प्रतिष्ठापनकरीता हार्ड ड्राइव्हवरील विभाजन आवश्यक आहे.  प्रतिष्ठापन लक्ष्यकरीता कोणत्या "
 "जागेचा वापर करायचे ते पसंत करा."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "विभाजन सुत्रयोजना संरचना"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "विभाजन सुत्रयोजना संरचना"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "वेळक्षेत्र सेटिंग्स्"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s वेळक्षेत्र"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "वेळक्षेत्र ठरवले नाही."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "क्षेत्र %s मधील उपलब्ध वेळक्षेत्र"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "उपलब्ध क्षेत्र"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1034,178 +2012,196 @@ msgstr ""
 "संख्यांच्या वापर करा किंवा प्रत्यक्षरित्या नाव टाइप करा [b क्षेत्र सूचीकरीता, बाहेर "
 "पडण्यासाठी q]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC सुरू करा"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "प्रतिष्ठापन प्रगती"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "सर्वात जवळचा मिरर"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS सर्व्हर %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "सॉफ्टवेअर स्रोत ठरवतेवेळी त्रुटी"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "काहिच नीवडले नाही"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "जोडणी करत आहे..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD ड्राइव्ह"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO फाइल (_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "नेटवर्क वेळ"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "प्रतिष्ठापन स्रोत उपलब्ध नाही"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "प्रतिष्ठापन स्रोतची मांडणी करण्यास अपयशी"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "संकुल मेटाडेटा डाउनलोड करतेवेळी त्रुटी..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "प्रतिष्ठापन स्रोत उपलब्ध नाही"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS सर्व्हर %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS माउंट पर्याय:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "प्रतिष्ठापन स्रोतची मांडणी करण्यास अपयशी, रेपो url ची तपासणी करा"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot समाविष्टीत असलेले साधण"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "प्रतिष्ठापन स्रोतची मांडणी करण्यास अपयशी"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "सॉफ्टवेअर नीवड संपादित करा (_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "सॉफ्टवेअर नीवड तपासतेवेळी त्रुटी"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "प्रतिष्ठापन स्रोत ठरवले नाही"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "पसंतीचे सॉफ्टवेअर नीवडले"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "प्रतिष्ठापन स्रोत ठरवले नाही"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "वातावरण पसंत करा"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "ओळख पटवा (_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "पासवर्ड पुरवणे व त्याची खात्री करणे आवश्यक."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ताकीद"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1221,112 +2217,99 @@ msgstr "कार्य चालू आहे"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tप्रतिष्ठापन पूर्ण झाली.  बाहेर पडण्यासाठी रिटर्न दाबा"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "पूर्वनिर्धारि स्पोक शीर्षक"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "चाचणी स्थिती..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "नवीन साधन"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "पासवर्ड (खात्री करा): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "तुम्ही कमजोर पासवर्ड: %s पुरवले आहे.  कसेहिकरून वापरायचे असल्यास पूर्ण झाले दाबा."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "तुम्ही कमजोर पासवर्ड: %s पुरवले आहे.  कसेहिकरून वापरायचे असल्यास पूर्ण झाले दाबा."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "पासवर्ड ठरवले."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "इंस्टॉलरमधून बाहेर पडा (_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "बाहेर पडा (_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "नाही (_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "होय (_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "पूर्वनिर्धारित शीर्षक"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "भाषांतरन"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "भाषांतरन"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "सॉफ्टवेअर"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "प्रणाली"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "कृपया पुढे मुद्यावर जाण्यापूर्वी ह्या चिन्हासह चिन्ह लावलेल्या घटकांना पूर्ण करा."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "पूर्ण झाले!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1335,165 +2318,65 @@ msgstr ""
 "%s आता यशस्वीरित्या प्रणालीवर प्रतिष्ठापीत झाले आहे व वापरण्यासाठी\n"
 "सज्ज आहे!  पुढे चला व वापरण्यासाठी पुनःबूट करा!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "पूर्ण झाले!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "नवीन %s %s प्रतिष्ठापन"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s आता यशस्वीरित्या प्रणालीवर प्रतिष्ठापीत झाले आहे, परंतु काहिक संरचना अजूनही पूर्ण करणे "
+"आवश्यक आहे. \n"
+"पूर्ण करा व त्यानंतर कृपया पूर्ण करा संरचना बटन दाबा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s आता यशस्वीरित्या प्रणालीवर प्रतिष्ठापीत झाले आहे व वापरण्यासाठी\n"
+"सज्ज आहे!  पुढे चला व वापरण्यासाठी पुनःबूट करा!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "स्तंभ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr "विना पुनःप्राप्य त्रुटीमुळे स्टोरेज संरचना पूर्वस्थितीत आणले. तपशीलकरीता क्लिक करा."
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr "साधन पुनःसंरचना अपयशी. तपशीलकरीता क्लिक करा."
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "कृपया वैध माउंटपॉइंट द्या."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "माउंट पॉइंट अवैध आहे. इतर वापरून पहा?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "माउंट पॉइंट आधिपासूनच वापरणीत आहे. इतर वापरून पहा?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"नीवडलेले RAID स्तरकरीता सध्या पसंत केलेल्या डिस्क्स्च्या तुलनेत एकापेक्षा जास्त डिस्क्स् आवश्यक "
-"आहे."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "कृपया वैध माउंटपॉइंट द्या."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "माउंट पॉइंट अवैध आहे. इतर वापरून पहा?"
+"Storage configuration reset due to unrecoverable error. Click for details."
+msgstr "विना पुनःप्राप्य त्रुटीमुळे स्टोरेज संरचना पूर्वस्थितीत आणले. तपशीलकरीता क्लिक करा."
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "मानक विभाजन"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "डिस्क"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "काहिच नाही"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s रूटमधील इतर सर्व फाइलप्रणाली नष्ट करा."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "तुम्हाला नक्की %s वरील सर्व डाटा नष्ट करायचे?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "तुम्हाला नक्की %s वरील सर्व डाटा नष्ट करायचे?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "मॅन्युअल विभाजन"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d स्टोरेज साधन पसंत केले"
 msgstr[1] "%d स्टोरेज साधन पसंत केले"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1502,129 +2385,110 @@ msgstr ""
 "%s %s प्रतिष्ठापनकरीता माउंट पॉइंटस् निर्माण करतेवेळी,\n"
 "त्यांचे तपशील येथे आढळतील."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"कमी मेमरिचा वापर करतेवेळी संगणकावरील 'swap' क्षेत्र कार्यप्रणाली तर्फे\n"
-"वापरली जाते."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"संगणकावरील 'boot' क्षेत्र आहे, जेथे\n"
-"कार्यप्रणाली सुरू करण्यासाठीचे फाइल्स् साठवले जातात."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"संगणकावरील 'root' क्षेत्र आहे, जेथे\n"
-"कार्यप्रणाली सुरू करण्यासाठीचे फाइल्स् साठवले जातात."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"संगणकावरील 'home' क्षेत्र जेथे आपला व्यक्तिगत डाटा साठवला\n"
-"जातो."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS हार्डवेअरवरील GPT-विभाजीत डिस्क्सपासून बूटिंग सुरू करण्यासाठी\n"
-"BIOS बूट विभाजन आवश्यक आहे."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"ठराविक PPC प्लॅटफॉर्म्सवर बूटलोडर संरचनाचे भाग म्हणून PReP बूट विभाजन\n"
-"आवश्यक आहे."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi %s प्रकारच्या साधनावर पाहिजे"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s, %s प्रकारच्या साधानवर पाहिजे"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s एंक्रिप्ट करणे अशक्य"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "रूट साधनवर नवीन फाइलप्रणाली निर्माण करणे अशक्य."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "%s प्रकारच्या साधनांना वैध RAID स्तर पसंती आवश्यक आहे."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "साधन पुनःआकार विनंती अपयशी. तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "साधन पुनःरूपण विनंती अपयशी. तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "हि फाइल प्रणाली लेबल्स्करीता समर्थन पुरवत नाही."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "डिस्क्स् नीवडले नाही"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "ह्या फाइल प्रणालीला पुनःआकार करणे अशक्य."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "स्टोरेज संरचना तपासतेवेळी त्रुटी.  तपशीलकरीता क्लिक करा."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "स्टोरेज संरचना तपासतेवेळी त्रुटी.  तपशीलकरीता क्लिक करा."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "नवीन साधन समाविष्ट करण्यास अशक्य. तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "अवैध विभाजन आकार संच. वैध इंटिजरचा वापर करा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "साधन काढून टाकण्याची विनंती अपयशी. तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs मोकळे"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1633,7 +2497,7 @@ msgstr ""
 "ह्या साधनाला प्रत्यक्षरित्या संपादित करणे शक्य आहे. काढून टाकणे किंवा वेगळे साधन पसंत करणे "
 "शक्य आहे."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1642,194 +2506,143 @@ msgstr ""
 "ह्या साधनाला प्रत्यक्षरित्या संपादित करणे शक्य आहे. काढून टाकणे किंवा वेगळे साधन पसंत करणे "
 "शक्य आहे."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "डिस्क्स् नीवडले नाही."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "नीवडलेल्या डिस्क्स्वर अतिरिक्त मोकळी जागा आढळली नाही."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "स्वयं विभाजन अपयशी. तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "सॉफ्टवेअर नीवड संपादित करा (_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "एंक्रिप्टेड ब्लॉक साधन कुलूपबंद अशक्य करण्यास अपयशी. तपशीलकरीता क्लिक करा"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "दिनांक व वेळ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "अवैध वेळक्षेत्र"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "NTP चा वापर करायचे असल्यास प्रथम नेटवर्किंग ठरवा"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "तुमच्याकडे कार्यरत NTP सर्व्हर संरचीत नाही"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "प्रतिष्ठापन लक्ष्य"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d स्टोरेज साधन पसंत केले"
+msgstr[1] "%d स्टोरेज साधन पसंत केले"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "मांडणी बदलण्यासाठी %s."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "किबोर्ड"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "चाचणी मांडणी संरचना उलब्ध नाही."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "चाचणी स्थिती..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "मांडणी बदलणे संरचीत केले नाही."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "भाषा"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "स्थिती अपरिचीत (आढळली नाही)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "स्थिती अपरिचीत"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "अव्यवस्थापीत"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "अनुपलब्ध"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "फर्मवेअर आढळले नाही"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "केबल प्लग अशक्य"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "अनुपलब्ध"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "खंडीत"
@@ -1854,296 +2667,325 @@ msgstr "खंडीत करत आहे"
 msgid "Connection failed"
 msgstr "जोडणी अपयशी"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "प्लग अशक्य"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "इथरनेट"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "वायरलेस"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "प्लग अशक्य"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 पत्ता"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 पत्ता"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP पत्ता"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "एंटरप्राइज"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "काहिच नाही"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "ओळख पटवणे आवश्यक"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "पासवर्ड: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "नेटवर्क संरचना"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "रूट पासवर्ड"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "पासवर्ड ठरवले."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "रूट पासवर्ड ठरवले"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "रूट खाते बंद केले"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "रूट पासवर्ड ठरवले नाही"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "सॉफ्टवेअर नीवड"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "सॉफ्टवेअर अवलंबन तपासत आहे..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "सॉफ्टवेअर अवलंबन तपासतेवेळी त्रुटी"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "पॅकेज मेटाडाटा डाऊनलोड करत आहे..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "गट मेटाडाटा डाऊनलोड करत आहे..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "सॉफ्टवेअर अवलंबन तपासत आहे..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "सॉफ्टवेअर अवलंबन तपासतेवेळी त्रुटी"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "सॉफ्टवेअर विलंब तपासतेवेळी त्रुटी.  तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "प्रतिष्ठापनकरीता खालील चिन्ह लावलेल्या सॉफ्टवेअरमध्ये त्रुटी आहेत.  हे संभाव्यतया\n"
 "प्रतिष्ठापन स्रोत अंतर्गत त्रुटींमुळे आहे.  ह्या संकुलांना प्रतिष्ठापनातून काढून टाकण्याचा प्रयत्न "
 "शक्य आहे.\n"
 "प्रतिष्ठापन स्रोत बदला, किंवा इंस्टॉलरतून बाहेर पडा."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "रद्द करा (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "सॉफ्टवेअर सोअर्स् संपादित करा (_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "सॉफ्टवेअर नीवड संपादित करा (_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "प्रतिष्ठापन स्रोत सेटअप करत आहे..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "संकुल मेटाडेटा डाउनलोड करतेवेळी त्रुटी..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "ओळख पटवणे आवश्यक"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "हे मिडीया प्रतिष्ठापनकरीता योग्य आहे."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "हे मिडीया प्रतिष्ठापनकरीता योग्य नाही."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "प्रतिष्ठापन स्रोत"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "प्रतिष्ठापन स्रोतची मांडणी करण्यास अपयशी, रेपो url ची तपासणी करा"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "रेपॉजीटरी संयोजीत करतेवेळी त्रुटी आढळली"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "सॉफ्टवेअर स्रोत ठरवतेवेळी त्रुटी"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "प्रतिष्ठापन स्रोतची मांडणी करण्यास अपयशी, रेपो url व प्रॉक्सी सेटिंग्स् तपासा"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "रेपॉजीटरी संयोजीत करतेवेळी त्रुटी आढळली"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "सॉफ्टवेअर स्रोत ठरवतेवेळी त्रुटी"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "साधन:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS सर्व्हर %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "अवैध वेळक्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "अवैध वेळक्षेत्र"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "अवैध वेळक्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "कृपया थांबा.... सॉफ्टवेअर मेटाडाटा अजूनही लोड होत आहे."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "नीवडलेल्या डिस्क्स्मध्ये खालील मोकळी जागा आहे:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "कृपया थांबा.... सॉफ्टवेअर मेटाडाटा अजूनही लोड होत आहे."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2154,7 +2996,7 @@ msgstr ""
 "अस्तित्वातील विभाजन संकोचीत करून किंवा\n"
 "काढून टाकून जागा पुनःप्राप्ति शक्य."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2164,7 +3006,7 @@ msgstr ""
 "<b>%s</b> प्रतिष्ठापीत करण्यासाठी अतिरिक्त जागा उपलब्ध नाही, नीवडलेल्या डिस्कवरील "
 "संपूर्ण मोकळ्या जागेचा वापर केल्यावरही."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2178,48 +3020,59 @@ msgstr ""
 "<b>%s</b> ची लहान आवृत्ती प्रतिष्ठापीत करण्यासाठी सॉफ्टवेअर नीवड संपादित करणे, किंवा "
 "इंस्टॉलरपासून बाहेर पडणे शक्य आहे."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "प्रतिष्ठापन लक्ष्य"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "स्टोरेज संरचना साठवत आहे..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "स्टोरेज संरचना साठवण्यास अपयशी..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD साधणचे रूपण सुरू आहे"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "स्टोरेज संरचना तपासतेवेळी त्रुटी.  तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "स्टोरेज संरचना तपासतेवेळी त्रुटी.  तपशीलकरीता क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs मोकळे"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d डिस्क नीवडले; %s क्षमता; %s मोकळे"
 msgstr[1] "%d डिस्क्स् नीवडले; %s क्षमता; %s मोकळे"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr "तुम्ही बूटलोडर प्रतिष्ठापन वगळ्याचे ठरवले आहे.  प्रणाली कदाचीत बूटजोगी नसावी."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2228,11 +3081,19 @@ msgstr ""
 "स्टोरेज संरचना तपासतेवेळी खालील त्रुटी आढळल्यात.  स्टोरेज मांडणी संपादित करा\n"
 "किंवा इंस्टॉलरपासून बाहेर पडा."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "स्टोरेज मांडणी संपादित करा (_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2242,75 +3103,80 @@ msgstr ""
 "स्टोरेज संरचना तपासतेवेळी खालील त्रुटी आढळल्यात.  स्टोरेज मांडणी संपादित करा\n"
 "किंवा इंस्टॉलरपासून बाहेर पडा."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ठिक आहे"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "नेटवर्क संरचना"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "अवैध वेळक्षेत्र"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s वर आपले स्वागत."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "डाटा"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "%s %s प्रतिष्ठापनकरीता अजूनही माउंट पॉइंटस् निर्माण केले नाही:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "स्वयंरित्यापूर्णकरण्यासाठी येथे क्लिक करा."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "किंवा, '+' चिन्हासह नवीन माउंट पॉइंट निर्माण करा."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2323,55 +3189,159 @@ msgstr[0] ""
 msgstr[1] ""
 "<b>%d डिस्क; %s क्षमता; %s मोकळी जागा</b> (विभाजनअशक्य व फाइलप्रणाली अंतर्गत)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "बूट साधन म्हणून ठरवा (_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"नीवडलेले RAID स्तरकरीता सध्या पसंत केलेल्या डिस्क्स्च्या तुलनेत एकापेक्षा जास्त डिस्क्स् आवश्यक "
+"आहे."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "स्तंभ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "माउंट पॉइंट %s linux फाइल प्रणालीवर असायला हवी."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "माउंट पॉइंट आधिपासूनच वापरणीत आहे. इतर वापरून पहा?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "कृपया वैध माउंटपॉइंट द्या."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "माउंट पॉइंट अवैध आहे. इतर वापरून पहा?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s रूटमधील इतर सर्व फाइलप्रणाली नष्ट करा."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "तुम्हाला नक्की %s वरील सर्व डाटा नष्ट करायचे?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "तुम्हाला नक्की %s वरील सर्व डाटा नष्ट करायचे?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "अवैध वेळक्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "तुम्ही कमजोर पासफ्रेज: %s पुरवले आहे"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "पासफ्रेज जुळत नाही."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "साठवा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "छोटे करा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "नष्ट करा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s निर्माण करत आहे, %(device)s वर"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "सज्ज नाही"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "मोकळ्या जागेचा वापर करा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2383,14 +3353,14 @@ msgstr ""
 "ह्या प्रतिष्ठापनकरीता जागा मोकळी करण्याकरीता तुम्ही अस्तित्वातील फाइलप्रणाली काढूण टाकू "
 "शकता.  फाइलप्रणाली काढून टाकल्याने समाविष्टीत सर्व डाटा नेहमीकरीता काढून टाकले जाईल."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2398,353 +3368,762 @@ msgid_plural ""
 msgstr[0] "<b>%s डिस्क; %s पुनःप्रापण जागा</b> (फाइलप्रणालीमध्ये)"
 msgstr[1] "<b>%s डिस्क्स्; %s पुनःप्रापण जागा</b> (फाइलप्रणालीमध्ये)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "पुनःप्रापणजोगी एकूण नीवडजोगी जागा: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "नष्ट करा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "साठवा"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "वितरण प्रतिष्ठापन"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "स्पोक नेम"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "प्रि-रिलिज / चाचणी"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "नवीन साधन"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "नवीन सिलेक्टर"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "पूर्ण झाले (_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "पुढे चला (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "बदल लागू करा (_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "नेटवर्क संरचना"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "गट नाव"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ठिक आहे"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "दिनांक व वेळ"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "वापर NTP सर्व्हर्सकरीता समाविष्ट करा व चिन्ह लावा"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "वेब सर्वर"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "क्रियाशील"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "वापर करा"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "संरचीत करा (_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "दिनांक व वेळ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "क्षेत्र:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "क्षेत्र:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "शहर:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "शहर:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "नेटवर्कचे नाव (_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "नेटवर्क नाव"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 तास"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "प्रतिष्ठापन लक्ष्य"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "क्षमता"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "जुडले नाही"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "आयडी"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "नीवडलेले साधन"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "काहिच नीवडले नाही"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>लेबल:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "फर्मवेअर आढळले नाही"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "नाही (_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN प्रकार"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "नीवडलेले साधन"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "सारांश"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID साधण"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "समावेश करा (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "पूर्वनिर्धारीत राऊट"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "सबनेट मास्क"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "वेग"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "हार्डवेअर पत्ता"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "संरचीत करा (_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "सुरक्षा"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "नेटवर्कचे नाव (_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "नेटवर्क नाव"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "सुरक्षा कि"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "हॉटस्पॉट म्हणून वापर करा (_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "हॉटस्पॉट थांबवा (_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "संरचीत करा (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "प्रोव्हाइडर"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "संरचीत करा (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN प्रकार"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "गेटवे"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "गट नाव"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "गट पासवर्ड"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "वापरकर्तानाव"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "संरचीत करा (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "मेथड (_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "संरचना URL (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP प्रॉक्सी (_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS प्रॉक्सी (_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP प्रॉक्सी (_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "FTP प्रॉक्सी (_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "स्टोरेज संरचना तपासत आहे..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "कुलूपबंद अशक्य करा"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "अयरप्लैन मोड (_p)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "स्टोरेज संरचना तपासत आहे..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "यजमाननाव"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "नेटवर्क संरचना"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2753,282 +4132,204 @@ msgstr ""
 "ठिकाणाविषयी माहिती प्राप्त करण्यासाठी नेटवर्क प्रवेश वसॉफ्टवेअर सुधारणा\n"
 "उपलब्ध करणे आवश्यक आहे."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "पूर्वनिर्धारीत राऊट"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "सबनेट मास्क"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "वेग"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "हार्डवेअर पत्ता"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "संरचीत करा (_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "सुरक्षा"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "नेटवर्कचे नाव (_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "नेटवर्क नाव"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "सुरक्षा कि"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "हॉटस्पॉट म्हणून वापर करा (_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "हॉटस्पॉट थांबवा (_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "संरचीत करा (_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "प्रोव्हाइडर"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN प्रकार"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "गेटवे"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "गट नाव"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "गट पासवर्ड"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "वापरकर्तानाव"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "मेथड (_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "संरचना URL (_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP प्रॉक्सी (_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS प्रॉक्सी (_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP प्रॉक्सी (_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "FTP प्रॉक्सी (_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "कुलूपबंद अशक्य करा"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "अयरप्लैन मोड (_p)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "यजमाननाव"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "ओळख पटवा (_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "ओळख पटवणे आवश्यक"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "जुळले"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "सॉफ्टवेअर नीवड"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "वातावरण पसंत करा"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "स्तंभ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "रद्द करा व आणखी डिस्क्स् समाविष्ट करा"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "प्रतिष्ठापन पर्याय"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>विभाजन प्रकार:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "डाटा एंक्रिप्ट करा. पासफ्रेज नंतर ठरवले जाईल."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "पसंतीचे विभाजन नीवडले"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "जागा पुनःप्राप्त करा (_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "प्रतिष्ठापन पर्याय"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "सध्याच्या सॉफ्टवेअर नीवडकरीता येथे आवश्यक जागा ठरवली जाईल."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "डिस्क फ्री"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "वापरकरीता मोकळी जागा उपलब्ध."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs मोकळे"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "मोकळी जागा अनुपलब्ध परंतु अस्तित्वातील विभाजनांपासून पुनःप्राप्तजोगी आहे."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "येथे पर्यायचे वर्णन केले जाईल."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "मोकळ्या जागेचा वापर करा"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "इंस्टॉलरपासून बाहेर पडा (_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "साधनचे वर्णन"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "स्थानीय मानक डिस्क्स्"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "विभाजन समाप्त करा (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "एंक्रिप्ट करा (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "स्वयं विभाजन नीवडले"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "विभाजन समाप्त करा (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "एंक्रिप्ट करा (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "डाटा एंक्रिप्ट करा. पासफ्रेज नंतर ठरवले जाईल."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "स्वयंविभाजन पर्याय"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "सारांश"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "संपूर्ण डिस्क सारांश व पर्याय..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "किबोर्ड मांडणी समाविष्ट करा"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "खालील प्रकारे नीवड करून किबोर्ड मांडणी समाविष्ट करणे शक्य आहे:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "नाव"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "किबोर्ड मांडणी"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3036,358 +4337,487 @@ msgstr ""
 "ह्या प्रणालीवर तुम्हाला कोणती किबोर्ड मांडणी वापरायला आवडेल?  पूर्वनिर्धारित म्हणून पसंत "
 "करण्यासाठी कुठलिही मांडणी सूचीच्या शीर्षास हलवणे शक्य आहे."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "नाव"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "मांडणी समाविष्ट करा"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "मांडणी काढून टाका"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "नीवडलेली मांडणी वर सरकवा"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "मांडणी समाविष्ट करा"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "मांडणी काढून टाका"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "नीवडलेली मांडणी वर सरकवा"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "नीवडलेली मांडणी खाली सरकवा"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "पूर्वावलोकन मांडणी"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "चाचणी मांडणी संरचना उलब्ध नाही."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "मांडणी बदलण्यासाठी Alt + Shift याचा वापर करा."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "पर्याय (_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "समावेश करा (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "किबोर्ड मांडणी समाविष्ट करा"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "खालील प्रकारे नीवड करून किबोर्ड मांडणी समाविष्ट करणे शक्य आहे:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "नाव"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "उपलब्ध क्षेत्र"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "मांडणी समाविष्ट करा"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ठिक आहे"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "मांडणी बदलण्याचे पर्याय"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "किबोर्ड मांडणी अंतर्गत कोणते पर्याय पसंत कराल?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "वापर"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "वर्णन"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS माउंट पर्याय:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "भाषा"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "काहिच नीवडले नाही"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "रूट पासवर्ड"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "रूट पासवर्ड:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "खात्री करा:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC पासवर्ड"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "रूट पासवर्ड ठरवा"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 "रूट खात्याच्या वापर प्रणालीचे प्रशासनकरीता केला जातो.  रूट वापरकर्त्याकरीता पासवर्ड द्या."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "पूर्ण झाले (_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "मिडीया तपासणी"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "मिडीया तपासत आहे, कृपया थांबा..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "समावेश करा (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ठिक आहे"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP प्रॉक्सी सुरू करा (_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>प्रॉक्सी URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>उदाहरण:</b> squid.mysite.org:3128</small>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "ओळख पटवा (_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>वापरकर्तानाव</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "वापरकर्तानाव"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>पासवर्ड</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "पासवर्ड: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "प्रतिष्ठापन स्रोत"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "तुम्हाला कोणते प्रतिष्ठापन स्रोत वापरायला आवडेल?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "स्वयं-आढळलेले प्रतिष्ठापन मिडीया (_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "साधन:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>लेबल:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "तपासणी करा (_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO फाइल (_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "साधन:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO पसंत करा (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "नेटवर्कवरील (_n):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "प्रॉक्सी सेटअप (_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS माउंट पर्याय:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "हा कप्पा वैकल्पिक आहे."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "फेडोरा पिपल रेपॉजिटरिज्"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "नवीन माउंटपॉइंट समाविष्ट करा."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "समावेश करा (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "नीवडलेले माउंटपॉइंट काढून टाका."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "मांडणी काढून टाका"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "कार्यवाही त्रुटी."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "रूट पासवर्ड ठरवा"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "नाव"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>प्रॉक्सी URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "वापरकर्तानाव"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "पासवर्ड: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "माउंट पॉइंट अवैध आहे. इतर वापरून पहा?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "मला इथून बाहेर काढा (_G)!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "मला माझे नशीब स्वीकार्य आहे (_I)."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "हे अस्थीर, पूर्व-प्रकाशित सॉफ्टवेअर आहे."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3398,199 +4828,262 @@ msgstr ""
 "त्यामध्ये बग्स् आहेत.  बग्स् सर्वत्र.  बग्स् जे कार्य प्रभावीत करते.  भविष्यातील हे OS "
 "विश्वासर्ह स्थीर OS नाही.  हे फक्त चाचणी कारणास्तव आहे."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s वर आपले स्वागत."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "प्रतिष्ठापन प्रक्रिये दरम्यान तुम्हांस कोणती भाषा वापरायला आवडेल?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "पुढे चला (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "वापरकर्तानाव"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "गट नाव"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "पासवर्ड: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC पासवर्ड"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "माउंट पॉइंट समाविष्ट करा (_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>अपेक्षीत क्षमता:</b>"
+msgid "Add a new mount point."
+msgstr "नवीन माउंटपॉइंट समाविष्ट करा."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>माउंट पॉइंट:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "समावेश करा (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "नवीन माउंट पॉइंट समाविष्ट करा"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"खालील माउंट पॉइंट निर्माण केल्यानंतर\n"
-"अधिक पसंतीचे पर्याय उपलब्ध आहेत."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"माउंट पॉइंटचा वापर आधिपासूनच\n"
-"केला जात आहे.  इतर वापरून पहा?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "उदा: \"20 GB\", \"500mb\" (कोटेशन मार्क्स् वजा करून)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "नष्ट करा (_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "माउंट पॉइंट संरचीत करा"
+msgid "Remove the selected mount point(s)."
+msgstr "नीवडलेले माउंटपॉइंट काढून टाका."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "मुक्त"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID साधण"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "मांडणी काढून टाका"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "Encrypt"
-msgstr "एंक्रिप्ट करा (_E)"
+msgid "Reload storage configuration from disk."
+msgstr "स्टोरेज संरचना अपयशी: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "नीवडलेले साधन"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "साधनचे वर्णन"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>माउंट पॉइंट:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>अपेक्षीत क्षमता:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>लेबल:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>साधन प्रकार:</b>"
+msgid "Device(s):"
+msgstr "साधन:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>फाइल प्रणाली:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "एंक्रिप्ट करा (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "पुनःरूपण"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "नाव"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>साधन प्रकार:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "एंक्रिप्ट करा (_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "फाइलप्रणाली"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "पुनःरूपण"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "स्तंभ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID साधण"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3598,17 +5091,19 @@ msgstr ""
 "हे साधन एंक्रिप्टेड आहे व वैध पासफ्रेजविना वाचणे अशक्य आहे. त्यास खालीलप्रमाणे कुलूपबंध अशक्य "
 "करणे शक्य आहे."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "पासफ्रेज:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "कुलूपबंद अशक्य करा (_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3616,294 +5111,568 @@ msgstr ""
 "ह्या साधनाला प्रत्यक्षरित्या संपादित करणे शक्य आहे. काढून टाकणे किंवा वेगळे साधन पसंत करणे "
 "शक्य आहे."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "नवीन माउंटपॉइंट समाविष्ट करा."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "नीवडलेले माउंटपॉइंट काढून टाका."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "नीवडलेले माउंटपॉइंट संरचीत करा."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "संरचीत करा (_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "स्टोरेज संरचना अपयशी: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">उपलब्ध जागा</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">एकूण जागा</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "माउंट पॉइंट संरचीत करा"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "ह्या साधनावर अवलंबून एक किंवा त्यापेक्षा जास्त डिस्क्स् पसंत करा."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ठिक आहे"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP पत्ता"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI इनीशीएटर नाव पुरवणे आवश्यक आहे"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "ओळख पटवा (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>उदाहरण:</b> squid.mysite.org:3128</small>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "वापरकर्तानाव"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC पासवर्ड"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "वापरकर्तानाव"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC पासवर्ड"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "वापरकर्तानाव"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC पासवर्ड"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "नेटवर्क नाव"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "ओळख पटवा (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "वापरकर्तानाव"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC पासवर्ड"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "वापरकर्तानाव"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC पासवर्ड"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "वापरकर्तानाव"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC पासवर्ड"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "जोडणी अपयशी"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ठिक आहे"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "साधन:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "नीवडलेले डिस्क्स्"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "बंद करा"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "बूट"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "वर्णन"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "मुक्त"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "मांडणी काढून टाका"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "डिस्क सारांश येथे येते"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "नष्ट करा (_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "काहिच नीवडले नाही"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "माउंट पॉइंट संरचीत करा"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "ह्या साधनावर अवलंबून एक किंवा त्यापेक्षा जास्त डिस्क्स् पसंत करा."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "माउंट पॉइंट समाविष्ट करा (_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>अपेक्षीत क्षमता:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>माउंट पॉइंट:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "नवीन माउंट पॉइंट समाविष्ट करा"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"खालील माउंट पॉइंट निर्माण केल्यानंतर\n"
+"अधिक पसंतीचे पर्याय उपलब्ध आहेत."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"माउंट पॉइंटचा वापर आधिपासूनच\n"
+"केला जात आहे.  इतर वापरून पहा?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "उदा: \"20 GB\", \"500mb\" (कोटेशन मार्क्स् वजा करून)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "माउंट पॉइंट संरचीत करा"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "नाव"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID साधण"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "एंक्रिप्ट करा (_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "कृपया वैध माउंटपॉइंट द्या."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ठिक आहे"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD साधणचे रूपण सुरू आहे"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "प्रतिष्ठापनवेळी अपरिचीत त्रुटी आढळली.  तपशील खालील प्रमाणे आहे."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "डिस्क एंक्रिप्शन पासफ्रेज"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "पासफ्रेज साठवा"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "डिस्क एंक्रिप्शन पासफ्रेज"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3912,7 +5681,19 @@ msgstr ""
 "ठराविक डाटा एंक्रिप्ट करायचे तुम्ही नीवड केली आहे. संगणक सुरू केल्यावर डाटाकरीता प्रवेश "
 "प्राप्त करण्यासाठी पासफ्रेज निर्माण करणे आवश्यक आहे."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "पासफ्रेज:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "खात्री करा:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3921,117 +5702,172 @@ msgstr ""
 "सावधानता: तुमची सध्याची किबोर्ड मांडणी <b>%s</b> आहे.किबोर्ड मांडणी बदलल्यास, "
 "प्रतिष्ठापन नंतर डिस्क्सला डिक्रिप्ट करणे अशक्य होईल."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "डिस्क जागा पुनःप्राप्त करा"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ठिक आहे"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "जागा पुनःप्राप्त करा (_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "डिस्क जागा पुनःप्राप्त करा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "वर्णन येथे उपलब्ध होते."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "फाइलप्रणाली"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "पुनःप्राप्यजोगी जागा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "कृती"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "साठवा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "नष्ट करा"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "छोटे करा"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "पसंतीचे विभाजन नीवडले"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "बदल लागू करा (_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "साधन:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "माउंट पॉइंट समाविष्ट करा (_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "इंस्टॉलरमधून बाहेर पडा (_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "नाही (_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "होय (_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4039,51 +5875,50 @@ msgstr ""
 "तुम्हाला नक्की\n"
 "प्रतिष्ठापन प्रक्रियापासून बाहेर पडायचे?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "बाहेर पडा (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "प्रतिष्ठापन सारांश"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "प्रतिष्ठापन सुरू करा (_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "संरचना"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "प्रतिष्ठापनसाठी तयारी करत आहे"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s आता यशस्वीरित्या प्रणालीवर प्रतिष्ठापीत झाले आहे, परंतु काहिक संरचना अजूनही पूर्ण करणे "
-"आवश्यक आहे. \n"
-"पूर्ण करा व त्यानंतर कृपया पूर्ण करा संरचना बटन दाबा."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "संरचना पूर्ण करा (_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s आता यशस्वीरित्या प्रणालीवर प्रतिष्ठापीत झाले आहे व वापरण्यासाठी\n"
-"सज्ज आहे!  पुढे चला व वापरण्यासाठी पुनःबूट करा!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "रिबूट (_R)"
 
@@ -4099,16 +5934,16 @@ msgstr "प्रतिष्ठापीत करा"
 msgid "Install the live CD to your hard disk"
 msgstr "लाइव्ह CD ला तुमच्या हार्ड डिस्कवर प्रतिष्ठापीत करा"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "हार्ड ड्राइव्हवर प्रतिष्ठापन सुरू करा"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "फेडोरावर स्वागत आहे"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4117,25 +5952,26 @@ msgstr ""
 "%s ला प्रतिष्ठापनकरीता %s MB स्मृती आवश्यक आहे, परंतु तुमच्याकडे या मशीनवर फक्त %s MB "
 "उपलब्ध आहे.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s ग्राफिकल इंस्टालरला %s MB स्मृती आवश्यक आहे, परंतु तुमच्याकडे फक्त %s MB उपलब्ध आहे."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "पुरेशी RAM आढळली नाही"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4149,24 +5985,24 @@ msgstr ""
 "\n"
 ", रूट टर्मिनल पासून."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " मजकूर मोड सुरू करत आहे."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "त्रुटी"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY वेरियेबल सेट केले नाही. मजकूर मोड सुरु करत आहे."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ग्राफिकल प्रतिष्ठापन उपलब्ध नाही. मजकूर मोड सुरु करत आहे."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4176,20 +6012,20 @@ msgstr ""
 "मजकूर मोड तुम्हाला प्रतिष्ठापन पर्यायचे मर्यादीत संच पुरवतो. स्वतःची विभाजन मांडणी किंवा "
 "संकुल नीवड निर्देशीत करण्यास परवानगी देत नाही. त्याऐवजी VNC मोड वापरायचे?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "प्रतिष्ठापन सुरू करण्यासाठी कृपया ssh install@%s करा."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "प्रतिष्ठापन सुरू ठेवण्याकरीता कृपया ssh install@<host> करा."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "फेडोरा वारून पहा"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4199,7 +6035,7 @@ msgstr ""
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4207,10 +6043,86 @@ msgstr ""
 "पुढील वेळी क्रिया अवलोकनमध्ये \"हार्ड ड्राइव्हवर प्रतिष्ठापीत करा\"\n"
 "पसंत करणे शक्य आहे."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "बंद करा"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "यजमाननावचे प्रारंभ वैध अक्षर क्षेत्र जसे कि 'a-z', 'A-Z', किंवा '0-9'  यानुरूप सुरू "
+#~ "व्हायला हवे"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "खालील फाइल प्रणाल्यांवर तुम्हांस अधिक जागेची गरज आहे:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "आदेश पंक्ती रीतीमध्ये प्रश्न असू शकत नाही!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "माउंट पॉइंट अवैध आहे. इतर वापरून पहा?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "संकुल मेटाडेटा डाउनलोड करतेवेळी त्रुटी..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "काहिच नीवडले नाही"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "फर्मवेअर आढळले नाही"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "ओळख पटवणे आवश्यक"
+
+#~ msgid "column"
+#~ msgstr "स्तंभ"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>विभाजन प्रकार:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>प्रॉक्सी URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>वापरकर्तानाव</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>पासवर्ड</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "माउंट पॉइंट अवैध आहे. इतर वापरून पहा?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>लेबल:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>फाइल प्रणाली:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID साधण"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "नीवडलेले माउंटपॉइंट संरचीत करा."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">उपलब्ध जागा</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">एकूण जागा</span>"
+
 #~ msgid "Completed"
 #~ msgstr "पूर्ण "
 
@@ -4258,40 +6170,9 @@ msgstr "बंद करा"
 #~ msgid "Install on System"
 #~ msgstr "प्रणालीवर प्रतिष्ठापीत करा"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "प्रतिष्ठापन रेपॉजिटरी सेटअप करतेवेळी खालील त्रुटी आढळली:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "प्रतिष्ठापन पुढे चालू ठेवणे अशक्य."
-
 #~ msgid "Exit installer"
 #~ msgstr "प्रतिष्ठापक पासून बाहेर पडा"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "हार्डवेअरमधील अडचणमुळे प्रतिष्ठापन थांबवले गेले. योग्य त्रुटी संदेश खालील प्रमाणे आहे:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " इंस्टॉलर आत्ता बंद होईल."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "हार्डवेअर त्रुटी आढळली"
-
 #~ msgid "_Exit installer"
 #~ msgstr "प्रतिष्ठापकातून बाहेर पडा (_E)"
 
@@ -4579,9 +6460,6 @@ msgstr "बंद करा"
 #~ msgid "Software Development"
 #~ msgstr "सॉफ्टवेअर विकास"
 
-#~ msgid "Web Server"
-#~ msgstr "वेब सर्वर"
-
 #~ msgid "Minimal"
 #~ msgstr "किमान"
 
@@ -4624,49 +6502,6 @@ msgstr "बंद करा"
 #~ "हे उपकरन वाढिव विभाजन आहे ज्यात तर्क विभाजनचे समावेष आहे ज्यांस नष्ट करणे शक्य नाही:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "तुम्ही रूट विभाजन (/) जे %s ची प्रतिष्ठापना चालू राहण्यासाठी आवश्यक असते, निश्चित "
-#~ "केलेले नाही."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "तुमचे रूट विभाजन 250 मेगाबाइट्स पेक्षा कमी आहे जे %s प्रतिष्ठापीत करण्यासाठी खूपच लहान "
-#~ "आहे."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "या प्लॅटफॉर्मला विश्वासर्ह विभाज किंवा लॉजिकल वॉल्यूमकरीता /boot आवश्यक आहे.  /boot "
-#~ "वॉल्यूम आवश्यक नसल्यास, / ला विश्वासर्ह विना-LVM विभाजनावर स्थीत करा."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "तुमचे %(mount)s विभाजन %(size)s मेगाबाईट्सपेक्षा कमी आहे, जे सामान्य "
-#~ "%(productName)s प्रतिष्ठापनजोगी संकेतपेक्षा कमी आहे."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(format)s रूपणकरीता %(mount)s विभाजन खूप छोटे आहे (स्वीकार्य आकार %(minSize)d "
-#~ "MB ते %(maxSize)d MB आहे)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(format)s रूपणकरीता %(mount)s विभाजन खूप मोठे आहे (स्वीकार्य आकार %(minSize)d "
-#~ "MB ते %(maxSize)d MB आहे)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4683,52 +6518,6 @@ msgstr "बंद करा"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "तुम्ही बूटलोडर स्टेज1 लक्ष्य साधन निर्माण केले नाही"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "तुम्ही बूटजोगी विभाजन निर्माण केले नाही."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "तुमच्या BIOS-आधारित प्रणालीला %sच्या नवीन डिस्क लेबल रूपण (GPT) सह विशेष विभाजनची "
-#~ "आवश्यकता आहे. पुढे जाण्याकरीता, कृपया 1MB 'BIOS बूट' विभाजन प्रकार निर्माण करा."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "स्वॅप विभाजन निर्देशीत केले नाही.  स्वॅप विभाजनविना प्रतिष्ठापन चालू ठेवायचे असल्यास "
-#~ "%(requiredMem)s MB स्मृती आवश्यक आहे, परंतु तुमच्याकडे फक्त %(installedMem)s MB "
-#~ "आढळले."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "तुम्ही स्वॅप विभाजन दर्शविलेले नाही. जरी ते नेहमी काटेकोरपणे आवश्यक नसले, तरीही बऱ्याच "
-#~ "प्रतिष्ठापनांसाठी त्यामुळे कृतीशीलतेत उठावदार सुधारणा होइल."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "किमान एक स्वॅप साधनांकडे UUID आढळली नाही, जे mkswap च्या जुण्या आवृत्तींचा वापर करून "
-#~ "निर्मीत स्वॅप जागामध्ये सामान्य आहे. ह्या साधनांना /etc/fstab मधील साधन मार्गतर्फे "
-#~ "संदर्भ केले जाते, जे अनुकूल नाही कारण साधन मार्गे विविध कारणास्तव बदलतात."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "माउंट पॉइंट अवैध आहे.  %s डिरेक्ट्री / फाइल प्रणालीवर असायला हवे."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "माउंट पॉइंट %s linux फाइल प्रणालीवर असायला हवी."
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s वरील Linux"
 
@@ -4738,11 +6527,6 @@ msgstr "बंद करा"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s, %(arch)s करीता"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD साधणचे रूपण सुरू आहे"
-#~ msgstr[1] "DASD साधणांचे रूपण सुरू आहे"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux सह वापरकरीता %d DASD उपकरण तयार करत आहे..."
@@ -4940,9 +6724,6 @@ msgstr "बंद करा"
 #~ msgid "Error setting root password"
 #~ msgstr "रूट पासवर्ड ठरवणे अपयशी"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "पासवर्ड पुरवणे व त्याची खात्री करणे आवश्यक."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "संकुल काढून टाका (_R)"
 
@@ -4960,24 +6741,12 @@ msgstr "बंद करा"
 #~ msgid "%s of %s"
 #~ msgstr "%s, %s पैकी"
 
-#~ msgid "Region:"
-#~ msgstr "क्षेत्र:"
-
-#~ msgid "City:"
-#~ msgstr "शहर:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 तास"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "ॲडऑन्स् पसंत करा"
 
@@ -5050,9 +6819,6 @@ msgstr "बंद करा"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "विभाजन समाप्त करा (_F)"
-
 #~ msgid "Id"
 #~ msgstr "आयडी"
 
diff --git a/anaconda/po/ms.po b/anaconda/po/ms.po
index a6252eb..cc1893b 100644
--- a/anaconda/po/ms.po
+++ b/anaconda/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,208 +20,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Memulakan VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Sila guna mod teks"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -230,85 +463,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -317,7 +842,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -330,8 +860,8 @@ msgstr "Bila selesai, sila keluar dari shell dan sistem akan diulangbut."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Penyelamatan"
 
@@ -369,28 +899,22 @@ msgstr "Sistem untuk diselamatkan"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Keluar"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -403,7 +927,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -412,28 +936,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mod Penyelamatan"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Sistem anda dilekapkan dibawah direktori %s ."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Partisyen root adalah kurang dari 250 megabyte dimana ianya terlalu kecil "
+"untuk memasang %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Anda tidak mentakrifkan partisyen root (/), simana diperlukan supaya "
+"pemasangan %s diteruskan."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Partisyen root adalah kurang dari 250 megabyte dimana ianya terlalu kecil "
+"untuk memasang %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Anda tidak menyatakan partisyen swap. Walaupun ianya tidak wajib pada "
+"sebarang kes, namun ianya boleh meningkatkan prestasi bagi kebanyakan "
+"pemasangan."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -524,84 +1228,228 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Pasang"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Pasang"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Ralat"
 
@@ -625,31 +1473,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -665,446 +1515,519 @@ msgstr ""
 "menggunakan paparan grafik semasa install atau sambung dengan menggunakan "
 "mod paparan teks install?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Katalaluan mestilah sekurang-kurangnya enam aksara panjang."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Katalaluan mestilah sekurang-kurangnya enam aksara panjang."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Memulakan VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Pasang pada Sistem"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Pembangunan Perisian"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Amaran"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1119,579 +2042,402 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Pembangunan Perisian"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1718,277 +2464,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Pembangunan Perisian"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1996,14 +2766,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2012,127 +2782,147 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2142,1013 +2932,1511 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Teruskan"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Sila guna mod teks"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Peranti RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Tambah"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Teruskan"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Teruskan"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Teruskan"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Tersambung!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Amaran"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Tambah"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Tambah"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Peranti RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Tambah"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3156,643 +4444,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Bahasa apa yang anda ingin gunakan ketika proses pemasangan?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Teruskan"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Bebas"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Peranti RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Tambah"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Peranti RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Peranti RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Peranti RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Peranti RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Bebas"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Peranti RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Pasang"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Ulang_but"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3806,40 +5457,41 @@ msgstr "Pasang"
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3848,60 +5500,64 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Ralat"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Peranti RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Selesai"
 
@@ -3918,9 +5574,6 @@ msgstr ""
 #~ msgid_plural "%s Bytes"
 #~ msgstr[0] "%s Byte"
 
-#~ msgid "Re_boot"
-#~ msgstr "Ulang_but"
-
 #~ msgid "_Retry"
 #~ msgstr "_Ulang"
 
@@ -3939,29 +5592,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Anda tidak boleh memadam partisyen bagi DASD yang diformat LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Anda tidak mentakrifkan partisyen root (/), simana diperlukan supaya "
-#~ "pemasangan %s diteruskan."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Partisyen root adalah kurang dari 250 megabyte dimana ianya terlalu kecil "
-#~ "untuk memasang %s."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Anda tidak menyatakan partisyen swap. Walaupun ianya tidak wajib pada "
-#~ "sebarang kes, namun ianya boleh meningkatkan prestasi bagi kebanyakan "
-#~ "pemasangan."
-
 #~ msgid "Back"
 #~ msgstr "Undur"
 
diff --git a/anaconda/po/nb.po b/anaconda/po/nb.po
index 85ba675..621f548 100644
--- a/anaconda/po/nb.po
+++ b/anaconda/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -22,18 +22,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot-filsystem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "RAID-sett som inneholder «%s» må ha ett av følgende RAID-nivå: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -41,195 +41,461 @@ msgid ""
 msgstr ""
 "RAID-sett som inneholder «%s» må ha en av følgende metadataversjoner: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "RAID-sett som inneholder «%s» må ha en av følgende enhetstyper: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s må ha en av følgende typer disketikett: %s"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s kan ikke være av type %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s må monteres på en av %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s må være mellom %d og %d MB i størrelse"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s må ikke være mindre enn %d MB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s må ikke være større enn %d MB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s må være innenfor de første %d MB på disken."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s må være på en primær partisjon."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s kan ikke være på en kryptert blokkenhet."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s kan ikke være av type %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Start VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Bruker tekstmodus"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Passord for root er satt"
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Passord for root er ikke satt"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Svak"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Bra"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "God"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Sterk"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Ja"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nei"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Følgende feil oppsto under oppsett av installasjonslageret:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installasjonen kan ikke fortsette."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Følgende feil oppsto under oppsett av installasjonslageret:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installasjonen kan ikke fortsette."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Installasjonen ble stoppet pga noe som ser ut som et problem med din "
+"maskinvare. Den eksakte feilmeldingen er:\n"
+"\n"
+"%s.\n"
+"\n"
+"Installasjonen vil nå avsluttes."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Installasjonen ble stoppet pga noe som ser ut som et problem med din "
+"maskinvare. Den eksakte feilmeldingen er:\n"
+"\n"
+"%s.\n"
+"\n"
+"Installasjonen vil nå avsluttes."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Fant en maskinvarefeil"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Installasjonen ble stoppet pga noe som ser ut som et problem med din "
+"maskinvare. Den eksakte feilmeldingen er:\n"
+"\n"
+"%s.\n"
+"\n"
+"Installasjonen vil nå avsluttes."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Kjører skript før installasjon"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Setter opp installasjonskilde …"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Utfører oppsettsoppgaver etter installasjonen"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -238,86 +504,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Dette filsystemet støtter ikke etiketter."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Kjører skript før installasjon"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Vertsnavnet må være maksimum 255 tegn langt."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Vertsnavnet på begynne med et gyldig tegn i området «a-z», «A-Z» eller «0-9»"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -326,7 +883,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Ny installasjon av %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Kjør %s for å avmontere systemet når du er ferdig."
@@ -339,8 +901,8 @@ msgstr "Avslutt skallet når du er ferdig for å starte systemet på nytt."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Kan ikke finne /bin/sh for kjøring! Starter ikke skall"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Redning"
 
@@ -378,21 +940,15 @@ msgstr "System som skal reddes"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Hvilken enhet inneholder rotpartisjonen for din installasjon?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Avslutt"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Systemet vil starte på nytt automatisk når du avslutter skallet."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -402,7 +958,7 @@ msgstr ""
 "linjeskift for å gå til et skal hvor du kan kjøre fsck og montere "
 "partisjonene. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -423,7 +979,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -432,29 +988,219 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Du har ingen Linux-partisjoner. Starter på nytt.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Systemet vil starte på nytt automatisk når du avslutter skallet."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Redningsmodus"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Du har ingen Linux-partisjoner. Trykk linjeskift for å gå til et skall.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Systemet er montert under katalogen %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disk"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"«swap»-området på din datamaskin brukes av operativsystemet\n"
+"når den har lite ledig minne."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"«boot»-området på din datamaskin inneholder filer som trengs\n"
+"for å starte operativsystemet."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"«root»-området på din datamaskin inneholder grunnleggende filer\n"
+"for system og applikasjoner."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"«Hjemme»-området på din datamaskin er hvor alle dine personlige\n"
+"data lagres."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Din rot-partisjon er mindre enn 250 megabyte og dette er vanligvis for lite "
+"for å installere %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Du har ikke definert en rot-partisjon (/). Dette må gjøres før "
+"installasjonen av %s kan fortsette."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Din %(mount)s-partisjon er mindre enn %(size)s megabyte hvilket er mindre "
+"enn anbefalt for en normal installasjon av %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Du har ikke laget en oppstartbar partisjon."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Du har ikke spesifisert en swap-partisjon. Selv om det ikke er et strengt "
+"krav om dette i alle tilfeller, så vil det øke ytelsen for de fleste "
+"installasjoner."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Monteringspunktet er ugyldig. Katalogen %s må være på rotfilsystemet (/)."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Monteringspunkt %s må være på et linux-filsystem."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Passord for root er satt"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -554,84 +1300,233 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Klarte ikke å sette opp installasjonskilde"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Feil ved nedlasting av metadata for pakke …"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Ingen installasjonskilde tilgjengelig"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Installerer programvare"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Starter pakkeinstallasjonsprosessen"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Du trenger mer plass på følgende filsystemer:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Forbereder transaksjon fra installasjonskilden"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Installerer"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Laster ned metadata for pakke"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installerer"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Forbereder installasjon"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Sjekker konfigurasjon av lagring …"
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "FORVALGT TITTEL"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALISERING"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALISERING"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "PROGRAMVARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Etter installasjon"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Kan ikke stille spørsmål i kommandolinjemodus!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Feil"
 
@@ -655,31 +1550,33 @@ msgstr "ja"
 msgid "no"
 msgstr "nei"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -694,468 +1591,545 @@ msgstr ""
 "maskinen til en annen datamaskin og utføre en grafisk installasjon eller vil "
 "du starte installasjonen i tekstmodus?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Passordet må være minst seks tegn langt."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Passordet må være minst seks tegn langt."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Innstillinger for tidssone"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Tidssone er ikke satt"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Tilgjengelige regioner"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Tilgjengelige regioner"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Sjekker konfigurasjon av lagring …"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Lagrer lagringskonfigurasjon …"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "filsystemkonfigurasjon mangler en type"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Bruk all tilgjengelig plass"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Erstatt eksisterende Linux-system(er)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Bruk ledig plass"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Mål for installasjon"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Ingen disker valgt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Feil ved sjekk av lagringskonfigurasjon"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Feil ved sjekk av lagringskonfigurasjon"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automatisk partisjonering valgt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Tilpasset partisjonering valgt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Ingen disker valgt. Vennligst velg minst en disk å installere til."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Sjekker lagring …"
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Genererer oppdatert lagringskonfigurasjon"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Sjekker konfigurasjon av lagring …"
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Alternativer for automatisk partisjonering"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Alternativer for automatisk partisjonering"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Lagrer lagringskonfigurasjon …"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Innstillinger for tidssone"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s tidssone"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Tidssone er ikke satt"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Tilgjengelige tidssoner i region %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Tilgjengelige regioner"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Start VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Fremdrift for installasjonen"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Nærmeste speil."
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-tjener %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Feil ved oppsett av programvarekilde"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Ingenting valgt"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD-stasjon"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-fil:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Nettverkstid"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Ingen installasjonskilde tilgjengelig"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Klarte ikke å sette opp installasjonskilde"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Feil ved nedlasting av metadata for pakke …"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Ingen installasjonskilde tilgjengelig"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-tjener %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Alternativer for NFS-montering:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Klarte ikke å sette opp installasjonskilde. Sjekk URL for lager"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "enheten som inneholder /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Klarte ikke å sette opp installasjonskilde"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Programvareutvikling"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Kilde for installasjonen er ikke satt opp"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Tilpasset programvare valgt"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Kilde for installasjonen er ikke satt opp"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Velg ditt miljø"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "Br_uk autentisering"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Du må oppgi og bekrefte et passord"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Advarsel"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1171,105 +2145,88 @@ msgstr "Pågår"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "tester status …"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Ny enhet"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Bekreft:"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Passord for root er satt"
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Avslutt installasjon"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nei"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Ja"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "FORVALGT TITTEL"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALISERING"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALISERING"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "PROGRAMVARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1277,496 +2234,331 @@ msgstr ""
 "Vennligst fullfør oppføringer merket med dette ikonet før du fortsetter til "
 "neste steg."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Fullført!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Fullført!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "A_vslutt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Ny installasjon av %s %s"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr ""
-"Monteringspunktet er allerede i bruk.\n"
-"Prøv noe annet?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disk"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Du må opprette et nytt filsystem på rot-enheten."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "MANUELL PARTISJONERING"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d lagringsenhet valgt"
 msgstr[1] "%d lagringsenheter valgt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"«swap»-området på din datamaskin brukes av operativsystemet\n"
-"når den har lite ledig minne."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"«boot»-området på din datamaskin inneholder filer som trengs\n"
-"for å starte operativsystemet."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"«root»-området på din datamaskin inneholder grunnleggende filer\n"
-"for system og applikasjoner."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"«Hjemme»-området på din datamaskin er hvor alle dine personlige\n"
-"data lagres."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s kan ikke krypteres"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Du må opprette et nytt filsystem på rot-enheten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Dette filsystemet støtter ikke etiketter."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Ingen disker valgt"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Kan ikke endre størrelse på dette filsystemet."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Sjekker konfigurasjon av lagring …"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Sjekker konfigurasjon av lagring …"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Programvareutvikling"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATO & KLOKKESLETT"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Du må konfigurere nettverk først hvis du vil bruke NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Ingen fungerende NTP-tjener er konfigurert"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "MÅL FOR INSTALLASJON"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d lagringsenhet valgt"
+msgstr[1] "%d lagringsenheter valgt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TASTATUR"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "tester status …"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "SPRÅK"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Status ukjent (mangler)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Status ukjent"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Ikke håndtert"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Ikke tilgjengelig"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Fastvare mangler"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kabel er ikke satt inn"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Ikke tilgjengelig"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Koblet fra"
@@ -1791,193 +2583,240 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4-adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Autentisering kreves"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "KONFIGURASJON"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "PASSORD FOR ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Passord for root er satt"
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Passord for root er satt"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root-kontoen er slått av"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Passord for root er ikke satt"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Laster ned metadata for pakke"
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Laster ned metadata for gruppe"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Feil ved sjekk av programvareavhengigheter. Klikk for detaljer."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "A_vbryt"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "A_vslutt"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "E_ndre programvarekilde"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Programvareutvikling"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Setter opp installasjonskilde …"
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Feil ved nedlasting av metadata for pakke …"
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Autentisering kreves"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Dette mediet kan brukes til installasjonen."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Dette mediet kan ikke brukes til installasjonen."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALLASJONSKILDE"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Klarte ikke å sette opp installasjonskilde. Sjekk URL for lager"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Feil ved oppsett av lager"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Feil ved oppsett av programvarekilde"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -1985,98 +2824,80 @@ msgstr ""
 "Klarte ikke å sette opp installasjonskilde. Sjekk URL til lager og "
 "innstillinger for proxy"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Feil ved oppsett av lager"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Feil ved oppsett av programvarekilde"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-tjener %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Ugyldig tidssone"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Ugyldig tidssone"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Ugyldig tidssone"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Diskene du har valgt har følgende mengde ledig plass:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2084,14 +2905,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2100,110 +2921,130 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "MÅL FOR INSTALLASJON"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Lagrer lagringskonfigurasjon …"
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatterer DASD-enhet"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Sjekker konfigurasjon av lagring …"
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d disk valgt; %s kapasitet; %s ledig"
 msgstr[1] "%d disker valgt; %s kapasitet; %s ledig"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "E_ndre utforming av lagring"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "KONFIGURASJON"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ugyldig tidssone"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "VELKOMMEN TIL %s %s"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2211,22 +3052,26 @@ msgid ""
 msgstr ""
 "Du har ikke laget noen monteringspunkter for din %s %s installasjon ennå:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Eller lag nye monteringspunkter under med «+»-ikonet."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2237,69 +3082,170 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Sett som oppstartsenhet"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Monteringspunkt %s må være på et linux-filsystem."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Du må opprette et nytt filsystem på rot-enheten."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Ugyldig tidssone"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Lager %(type)s på %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Ikke klar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Bruk ledig plass"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2307,981 +3253,1422 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALLASJON AV DISTRIBUSJON"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "IKE UTGITT / TESTING"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Ny enhet"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Bruk endringer"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "KONFIGURASJON"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "A_vbryt"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATO & KLOKKESLETT"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Webtjener"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Bekreft"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATO & KLOKKESLETT"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "By:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "By:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Nettverkstid"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Bruker tekstmodus"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "MÅL FOR INSTALLASJON"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapasitet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "_Sett som oppstartsenhet"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Ingenting valgt"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Brukernavn</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Fastvare mangler"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nei"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "_Sett som oppstartsenhet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "sammendrag"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-enhet"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Legg til"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Bekreft"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Nettverkstid"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Bekreft"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Bekreft"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Bekreft"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "Lagrer lagringskonfigurasjon …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_Slå på HTTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "_Slå på HTTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_Slå på HTTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Sjekker konfigurasjon av lagring …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Lås _opp"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Sjekker konfigurasjon av lagring …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Brukernavn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_Slå på HTTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Lås _opp"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "Br_uk autentisering"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Autentisering kreves"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Tilkoblet"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Velg ditt miljø"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-#, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Type partisjon:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Krypter mine data. Jeg setter et passord senere."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Tilpasset partisjonering valgt"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Bruk ledig plass"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "A_vslutt installasjon"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Lagrer lagringskonfigurasjon …"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Tilpasset partisjonering valgt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptert"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automatisk partisjonering valgt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Jeg godtar min skjebne."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Krypter mine data. Jeg setter et passord senere."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Alternativer for automatisk partisjonering"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "sammendrag"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "LEGG TIL TASTATURUTFORMING"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Du kan legge til en tastaturutforming ved å velge den under:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Navn"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "TASTATURUTFORMING"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "navn"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Fje_rn pakker"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift for å bytte utforminger"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Legg til"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "LEGG TIL TASTATURUTFORMING"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Du kan legge til en tastaturutforming ved å velge den under:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Tilgjengelige regioner"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Alternativer for NFS-montering:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "SPRÅK"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Ingenting valgt"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "PASSORD FOR ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Bekreft:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "VERIFISERING AV MEDIE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Verifiserer medie. Vennligst vent …"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Legg til"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Slå på HTTP-proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>URL til proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "Br_uk autentisering"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Brukernavn</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Brukernavn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<p>Passord</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALLASJONSKILDE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verifiser"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-fil:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Velg en ISO-fil"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "På _nettverket:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Oppsett av _proxy …"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Alternativer for NFS-montering:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Dette feltet er valgfritt."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People lager"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Standard YUM-lager"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Legg til"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Henter informasjon om forespurt lager"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+#, fuzzy
+msgctxt "GUI|Software Source"
+msgid "_Remove"
+msgstr "Fje_rn pakker"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operasjonsfeil."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Operasjonsfeil."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Navn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>URL til proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Brukernavn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-"Monteringspunktet er allerede i bruk.\n"
-"Prøv noe annet?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Få meg ut herfra!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Jeg godtar min skjebne."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Dette er ustabil programvare som ikke er klar for utgivning."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3289,80 +4676,687 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "VELKOMMEN TIL %s %s"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Hvilket språk ønsker du å bruke under installeringen?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Fortsett"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Brukernavn"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Passord for root:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "_Legg til monteringspunkt"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Legg til"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "Henter informasjon om forespurt lager"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+#, fuzzy
+msgid "Reload storage configuration from disk."
+msgstr "Lagrer lagringskonfigurasjon …"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
+msgid "Selected Device"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
+msgid "Device description"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+#, fuzzy
+msgid "Mount _Point:"
+msgstr "<b>Monteringspunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Ønsket kapasitet:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
+msgstr "<b>Brukernavn</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Enhet:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+#, fuzzy
+msgid "_Name:"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Ønsket kapasitet:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Kryptert"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Filsystem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID-enhet"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
+msgid "_Update Settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:969
+msgid ""
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
+msgid ""
+"This device is encrypted and cannot be read without a valid passphrase. You "
+"may unlock it below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Passphrase:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Unlock"
+msgstr "Lås _opp"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
+msgid ""
+"This device cannot be edited directly. You can remove it or select a "
+"different device."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
+msgid "_Reset All"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
+msgid ""
+"Please select the network interface which is connected to your FCoE switch."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_NIC:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use _DCB"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use auto _vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Add FCoE Disk(s)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
+msgid ""
+"The following error occurred while attempting to add an FCoE SAN.  Please "
+"check your configuration and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
+msgid "ADD iSCSI STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
+msgid ""
+"To use iSCSI disks, you must provide the address of your iSCSI target and "
+"the iSCSI initiator name you've configured for your host."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Target IP Address:"
+msgstr "IPv4-adresse"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "iSCSI _Initiator Name:"
+msgstr "Må oppgi navn på iSCSI-initiator"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
+msgid "No credentials (discovery authentication disabled)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
+msgid "CHAP pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
+msgid "CHAP pair and a reverse pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Discovery Authentication Type:"
+msgstr "Br_uk autentisering"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
+msgid ""
+"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
+"a8675309</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Username:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Password:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP User_name:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
+msgid "Discovering iSCSI targets.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
+msgid ""
+"The following error occurred discovering iSCSI targets.  Please double check "
+"your authorization information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Bind targets to network interfaces"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
+#, fuzzy
+msgid "Node Name"
+msgstr "Navn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
+msgid "Interface"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
+msgid "_Node login authentication type:"
+msgstr "Br_uk autentisering"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
+msgid "Use the credentials from discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Brukernavn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
+msgid "_Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
+msgid ""
+"The following error occurred logging into the selected iSCSI node.  Please "
+"double check your authorization information and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
+msgid "Retry _Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Enhet:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
+msgid "SELECTED DISKS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Close"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
+msgid "Boot"
+msgstr "Oppstart"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
+msgid "Description"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Ledig"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Fje_rn pakker"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
+msgid "Disk summary goes here"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Ingenting valgt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "KONFIGURER MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Velg en eller flere disker denne enheten kan befinne seg på."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
 msgid "_Add mount point"
 msgstr "_Legg til monteringspunkt"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
 msgstr "<b>Ønsket kapasitet:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
 msgstr "<b>Monteringspunkt:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
 msgid "ADD A NEW MOUNT POINT"
 msgstr "LEGG TIL ET NYTT MONTERINGSPUNKT"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
 msgid ""
 "More customization options are available\n"
 "after creating the mount point below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
 msgid ""
 "That mount point is already in\n"
 "use.  Try something else?"
@@ -3370,585 +5364,385 @@ msgstr ""
 "Monteringspunktet er allerede i bruk.\n"
 "Prøv noe annet?"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
 msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "_Save"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
 #, fuzzy
 msgid "CONFIGURE CONTAINER"
 msgstr "KONFIGURER MONTERINGSPUNKT"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
 msgid ""
 "Please create a name for this container and select at least one disk below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Ledig"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Navn"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
 #, fuzzy
 msgid "RAID Level:"
 msgstr "RAID-enhet"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
 #, fuzzy
 msgid "Encrypt"
 msgstr "Kryptert"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "Si_ze policy:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
 msgid "Automatic"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
 msgid "As large as possible"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
 msgid "Fixed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
-msgid "Selected Device"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
-msgid "Device description"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
 #, fuzzy
-msgid "<b>_Label:</b>"
-msgstr "<b>Brukernavn</b>"
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Ønsket kapasitet:</b>"
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "Filsystem"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
-msgid "_Modify..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
-#, fuzzy
-msgid "R_AID Level:"
-msgstr "RAID-enhet"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
-msgid "_Update Settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
-msgid ""
-"This device is encrypted and cannot be read without a valid passphrase. You "
-"may unlock it below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
-msgid "_Passphrase:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
-msgid "_Unlock"
-msgstr "Lås _opp"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
-msgid ""
-"This device cannot be edited directly. You can remove it or select a "
-"different device."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
 #, fuzzy
-msgid "Configure"
-msgstr "Bekreft"
+msgid "Unformatted DASDs Detected"
+msgstr "Formatterer DASD-enhet"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "Lagrer lagringskonfigurasjon …"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
-msgid "_Reset All"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "KONFIGURER MONTERINGSPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Velg en eller flere disker denne enheten kan befinne seg på."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
 msgid ""
-"Please select the network interface which is connected to your FCoE switch."
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
-msgid "_NIC:"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
-msgid "Use _DCB"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
-msgid "Use auto _vlan"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
-msgid "_Add FCoE Disk(s)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
 msgid ""
-"The following error occurred while attempting to add an FCoE SAN.  Please "
-"check your configuration and try again"
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
-msgid "ADD iSCSI STORAGE TARGET"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
 msgid ""
-"To use iSCSI disks, you must provide the address of your iSCSI target and "
-"the iSCSI initiator name you've configured for your host."
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
-#, fuzzy
-msgid "_Target IP Address:"
-msgstr "IPv4-adresse"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
-#, fuzzy
-msgid "iSCSI _Initiator Name:"
-msgstr "Må oppgi navn på iSCSI-initiator"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
-msgid "No credentials (discovery authentication disabled)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
-msgid "CHAP pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
-msgid "CHAP pair and a reverse pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
-#, fuzzy
-msgid "_Discovery Authentication Type:"
-msgstr "Br_uk autentisering"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
-msgid ""
-"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
-"a8675309</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
-#, fuzzy
-msgid "CHAP _Username:"
-msgstr "Brukernavn"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
-#, fuzzy
-msgid "CHAP _Password:"
-msgstr "Passord for root:"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
-msgid "Reverse CHAP User_name:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
-msgid "Reverse CHAP Pass_word:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
-msgid "_Start Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
-msgid "Discovering iSCSI targets.  This may take a moment..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
-msgid ""
-"The following error occurred discovering iSCSI targets.  Please double check "
-"your authorization information and try again."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
-msgid "_Retry Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
-msgid "_Bind targets to network interfaces"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
-#, fuzzy
-msgid "Node Name"
-msgstr "Navn"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
-msgid "Interface"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
-#, fuzzy
-msgid "_Node login authentication type:"
-msgstr "Br_uk autentisering"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
-msgid "Use the credentials from discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
-msgid "_Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
-msgid ""
-"The following error occurred logging into the selected iSCSI node.  Please "
-"double check your authorization information and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
-msgid "Retry _Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
-msgid "SELECTED DISKS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
-msgid "_Close"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
-msgid "Boot"
-msgstr "Oppstart"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
-msgid "Description"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
-msgid "Disk summary goes here"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Save Passphrase"
+msgstr "_Bruk endringer"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
 msgid "DISK ENCRYPTION PASSPHRASE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
-msgid "_Save Passphrase"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Passord for root:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Bekreft:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Handling"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Tilpasset partisjonering valgt"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Bruk endringer"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Legg til monteringspunkt"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Avslutt installasjon"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nei"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Ja"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "A_vslutt"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "SAMMENDRAG FOR INSTALLASJON"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Etter installasjon"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURASJON"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Forbereder installasjon"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Lagrer lagringskonfigurasjon …"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "St_art på nytt"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3962,16 +5756,16 @@ msgstr "Installer"
 msgid "Install the live CD to your hard disk"
 msgstr "Installer live-CD til din harddisk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Starter installasjon til harddisk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3980,24 +5774,25 @@ msgstr ""
 "%s krever %s MB minne for å installeres, men du har kun %s MB på denne "
 "maskinen.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s grafisk installasjon krever %s MB minne, men du har kun %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Ikke nok minne"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4011,24 +5806,24 @@ msgstr ""
 "\n"
 "fra en terminal som root-bruker."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Starter tekstmodus."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Feil"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY-variabelen er ikke satt. Starter tekstmodus."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafisk installasjon er ikke tilgjengelig. Starter tekstmodus."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4039,36 +5834,100 @@ msgstr ""
 "oppgi egendefinert partisjonsutforming eller pakkevalg. Vil du bruke VNC-"
 "modus i stedet?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Vennligst logg inn via ssh install@%s for å starte installasjon."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Vennligst kjør ssh install@<vert> for å fortsette installasjonen."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Vertsnavnet på begynne med et gyldig tegn i området «a-z», «A-Z» eller "
+#~ "«0-9»"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Du trenger mer plass på følgende filsystemer:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Kan ikke stille spørsmål i kommandolinjemodus!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr ""
+#~ "Monteringspunktet er allerede i bruk.\n"
+#~ "Prøv noe annet?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Feil ved nedlasting av metadata for pakke …"
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Ingenting valgt"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Fastvare mangler"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Autentisering kreves"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Type partisjon:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>URL til proxy</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Brukernavn</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<p>Passord</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr ""
+#~ "Monteringspunktet er allerede i bruk.\n"
+#~ "Prøv noe annet?"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "Filsystem"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-enhet"
+
 #~ msgid "Completed"
 #~ msgstr "Ferdig"
 
@@ -4108,41 +5967,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "Installer på systemet"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Følgende feil oppsto under oppsett av installasjonslageret:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installasjonen kan ikke fortsette."
-
 #~ msgid "Exit installer"
 #~ msgstr "Avslutt installering"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Installasjonen ble stoppet pga noe som ser ut som et problem med din "
-#~ "maskinvare. Den eksakte feilmeldingen er:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "Installasjonen vil nå avsluttes."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Fant en maskinvarefeil"
-
 #~ msgid "_Exit installer"
 #~ msgstr "A_vslutt installering"
 
@@ -4251,9 +6078,6 @@ msgstr ""
 #~ "Noen av dine programvarelager krever nettverk, men det oppsto en feil "
 #~ "under aktivering av nettverk på systemet ditt."
 
-#~ msgid "Re_boot"
-#~ msgstr "St_art på nytt"
-
 #~ msgid "_Eject"
 #~ msgstr "_Løs ut"
 
@@ -4410,9 +6234,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Grafisk skrivebord"
 
-#~ msgid "Web Server"
-#~ msgstr "Webtjener"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4456,27 +6277,6 @@ msgstr ""
 #~ "som ikke kan slettes:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Du har ikke definert en rot-partisjon (/). Dette må gjøres før "
-#~ "installasjonen av %s kan fortsette."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Din rot-partisjon er mindre enn 250 megabyte og dette er vanligvis for "
-#~ "lite for å installere %s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Din %(mount)s-partisjon er mindre enn %(size)s megabyte hvilket er mindre "
-#~ "enn anbefalt for en normal installasjon av %(productName)s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4490,38 +6290,12 @@ msgstr ""
 #~ "Installerer på en FireWire-enhet. Det er ikke sikkert at dette gir et "
 #~ "fungerende system."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Du har ikke laget en oppstartbar partisjon."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Du har ikke spesifisert en swap-partisjon. Selv om det ikke er et strengt "
-#~ "krav om dette i alle tilfeller, så vil det øke ytelsen for de fleste "
-#~ "installasjoner."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Monteringspunktet er ugyldig. Katalogen %s må være på rotfilsystemet (/)."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Monteringspunkt %s må være på et linux-filsystem."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux på %s"
 
 #~ msgid "Unknown Linux"
 #~ msgstr "Ukjent Linux"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatterer DASD-enhet"
-#~ msgstr[1] "Formatterer DASD-enheter"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Forbereder %d DASD-enhet for bruk med Linux …"
@@ -4631,21 +6405,9 @@ msgstr ""
 #~ msgid "Error setting root password"
 #~ msgstr "Feil under setting av passord for root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Du må oppgi og bekrefte et passord"
-
-#~ msgid "_Remove Packages"
-#~ msgstr "Fje_rn pakker"
-
 #~ msgid "enter URL of your desired repository"
 #~ msgstr "oppgi URL for ønsket lager"
 
-#~ msgid "Region:"
-#~ msgstr "Region:"
-
-#~ msgid "City:"
-#~ msgstr "By:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
diff --git a/anaconda/po/ne.po b/anaconda/po/ne.po
index bd19870..c771fbb 100644
--- a/anaconda/po/ne.po
+++ b/anaconda/po/ne.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,208 +22,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "भीएनसी सुरु गर्नुहोस्"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "पाठ मोड प्रयोग गर्नुहोस्"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ठीक छ"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -232,85 +465,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -319,7 +844,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -332,8 +862,8 @@ msgstr "समाप्त भएपछि कृपया शेलबाट 
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "मुक्ति"
 
@@ -371,28 +901,22 @@ msgstr "छोडिने प्रणाली"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ठीक छ"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "अन्त्य गर्नुहोस्"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -405,7 +929,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -414,28 +938,203 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "छोड्ने मोड"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "तपाईँको प्रणाली %s डाइरेक्टरी अन्तर्गत माउन्ट भएको छ ।"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "तपाईँको मूल विभाजन २५० मेगाबाइट भन्दा कम छ जुन %s स्थापना गर्न अति सानो हुन्छ ।"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"तपाईँले मूल विभाजन (/) परिभाषित गर्नुभएको छैन, जुन जारी राख्न %s को स्थापनाका लागि "
+"आवश्यक पर्दछ ।"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr "तपाईँको मूल विभाजन २५० मेगाबाइट भन्दा कम छ जुन %s स्थापना गर्न अति सानो हुन्छ ।"
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"तपाईँले स्वाप विभाजन निर्दिष्ट गर्नुभएको छैन । सबै केसहरूमा कडा रूपमा आवश्यक नपरेता पनि, "
+"धेरैजसो स्थापनाहरूका लागि यसले सार्थक रूपमा कार्यसम्पादन सुधार गर्नेछ ।"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -527,84 +1226,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "फेडोरा"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "रेड ह्याट उद्यमशीलता लिनक्स"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "तपाईँले निम्न फाइल प्रणालीमा धेरै खाली स्थान चाहिन्छ:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "पुरानो प्याकेजहरू"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "स्थापना गर्नुहोस्"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "स्थापना गर्नुहोस्"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "आदेश रेखा मोडमा प्रश्न हुन सक्दैन!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -628,31 +1473,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -667,447 +1514,520 @@ msgstr ""
 "गर्न भीएनसी सुरु गर्न चाहनुहुन्छ र ग्राफिकल स्थापना सम्पादन गर्न वा पाठ मोड स्थापनासँग "
 "जारी राख्न चाहनुहुन्छ ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "पासवर्ड कम्तिमा ६ क्यारेक्टरको हुनुपर्छ ।"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "पासवर्ड कम्तिमा ६ क्यारेक्टरको हुनुपर्छ ।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "स्थापना प्रगति"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "भीएनसी सुरु गर्नुहोस्"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "स्थापना प्रगति"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "सफ्टवेयर विकास"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "चेतावनी"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1122,580 +2042,405 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "सफ्टवेयर विकास"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1722,277 +2467,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "सफ्टवेयर विकास"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2000,14 +2769,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2016,128 +2785,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ठीक छ"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2148,68 +2937,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2217,945 +3101,1349 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "जारी राख्नुहोस्"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ठीक छ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "पाठ मोड प्रयोग गर्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "रेड यन्त्र"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "थप्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "जारी राख्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "जारी राख्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "जारी राख्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "जडान गरियो!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "स्थापक अन्त्य गर्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "चेतावनी"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "थप्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ठीक छ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "थप्नुहोस्"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ठीक छ"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "रेड यन्त्र"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "थप्नुहोस्"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3163,643 +4451,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "तपाईँ स्थापना प्रक्रियामा कस्तो भाषा प्रयोग गर्न चाहनुहुन्छ ?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "जारी राख्नुहोस्"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "स्वतन्त्र"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "रेड यन्त्र"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "थप्नुहोस्"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "रेड यन्त्र"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "रेड यन्त्र"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "रेड यन्त्र"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ठीक छ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ठीक छ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "रेड यन्त्र"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "स्वतन्त्र"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "रेड यन्त्र"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ठीक छ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ठीक छ"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "स्थापना गर्नुहोस्"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "रिबुट गर्नुहोस्"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3813,40 +5464,41 @@ msgstr "स्थापना गर्नुहोस्"
 msgid "Install the live CD to your hard disk"
 msgstr "तपाईँको हार्ड डिस्कमा लाइभ सीडी स्थापना गर्नुहोस्"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3855,60 +5507,70 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "त्रुटि"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "तपाईँले निम्न फाइल प्रणालीमा धेरै खाली स्थान चाहिन्छ:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "आदेश रेखा मोडमा प्रश्न हुन सक्दैन!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "रेड यन्त्र"
+
 #~ msgid "Completed"
 #~ msgstr "पूरा भयो"
 
@@ -3918,9 +5580,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "स्थापक निकाल्नुहोस्"
 
-#~ msgid "_Exit installer"
-#~ msgstr "स्थापक अन्त्य गर्नुहोस्"
-
 #~ msgid "IP address is missing."
 #~ msgstr "आईपी ठेगाना हराइरहेको छ ।"
 
@@ -3957,9 +5616,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "त्यो सही %s डिस्क होइन ।"
 
-#~ msgid "Re_boot"
-#~ msgstr "रिबुट गर्नुहोस्"
-
 #~ msgid "_Retry"
 #~ msgstr "पुन: प्रयास गर्नुहोस्"
 
@@ -3969,9 +5625,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "फाइल संयोजन त्रुटि"
 
-#~ msgid "older package(s)"
-#~ msgstr "पुरानो प्याकेजहरू"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "अपर्याप्त डिस्क खाली ठाउँ"
 
@@ -4024,19 +5677,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "तपाईँले एलडीएल ढाँचाबद्ध भएको DASD को विभाजन मेट्न सक्नुहुन्न ।"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "तपाईँले मूल विभाजन (/) परिभाषित गर्नुभएको छैन, जुन जारी राख्न %s को स्थापनाका लागि "
-#~ "आवश्यक पर्दछ ।"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "तपाईँको मूल विभाजन २५० मेगाबाइट भन्दा कम छ जुन %s स्थापना गर्न अति सानो हुन्छ ।"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "यूएसबी यन्त्रमा स्थापना गर्दै । यसले कार्य प्रणाली उत्पन्न गर्न सक्छ वा सक्दैन ।"
@@ -4047,14 +5687,6 @@ msgstr ""
 #~ msgstr ""
 #~ "फायरवायर यन्त्रमा स्थापना गर्दै । यसले कार्य प्रणाली उत्पन्न गर्न सक्छ वा सक्दैन ।"
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "तपाईँले स्वाप विभाजन निर्दिष्ट गर्नुभएको छैन । सबै केसहरूमा कडा रूपमा आवश्यक नपरेता "
-#~ "पनि, धेरैजसो स्थापनाहरूका लागि यसले सार्थक रूपमा कार्यसम्पादन सुधार गर्नेछ ।"
-
 #~ msgid "Back"
 #~ msgstr "पछाडि"
 
diff --git a/anaconda/po/nl.po b/anaconda/po/nl.po
index c62a817..07b74d3 100644
--- a/anaconda/po/nl.po
+++ b/anaconda/po/nl.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-05 11:32+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/"
@@ -33,11 +33,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot-bestandssysteem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -46,7 +46,7 @@ msgstr ""
 "RAID-opstellingen die '%s' bevatten moeten één van de volgende raidlevels "
 "hebben: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -55,7 +55,7 @@ msgstr ""
 "RAID-opstellingen die '%s' bevatten moeten één van de volgende metadata-"
 "versies hebben: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -64,108 +64,129 @@ msgstr ""
 "RAID-opstellingen die '%s' bevatten moeten één van de volgende apparaattypes "
 "hebben:  %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s moet één van de volgende disklabeltypes hebben: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s kan niet het type %s hebben."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s moet aangekoppeld worden op één van %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "de grootte van %s moet tussen %d en %d MB liggen"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s mag niet kleiner zijn dan %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s mag niet groter zijn dan %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s moet zich binnen de eerste %dMB van de schijf bevinden."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s moet zich op een primaire partitie bevinden."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s kan zich niet op een versleuteld blokapparaat bevinden."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s kan niet het type %s hebben"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s heeft misschien niet voldoende ruimte om grub2 core.img te laten "
 "omsluiten als het %s bestandssysteem op %s gebruikt wordt."
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Start VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Gebruik tekstmodus"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Wachtwoord is ingesteld."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Wachtwoorden komen niet overeen!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Je hebt een zwak wachtwoord aangeboden: %s. Klik op 'Klaar' als je het toch "
 "wilt gebruiken."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -173,87 +194,340 @@ msgstr ""
 "wilt gebruiken."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Zwak"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Matig"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Goed"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Sterk"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Ja"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nee"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"De volgende fout is tijdens het instellen van de installatierepository "
+"opgetreden:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"De installatie kan niet verdergaan."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"De volgende fout is tijdens het instellen van de installatierepository "
+"opgetreden:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"De installatie kan niet verdergaan."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"De volgende software, gemarkeerd voor installatie, heeft fouten.  Dit wordt "
+"waarschijnlijk veroorzaakt door\n"
+"een fout in je installatiebron.  Je kunt proberen om deze pakketten uit je "
+"installatie te verwijderen,\n"
+"Verander je installatiebron, of sluit het installatieprogramma af."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"De installatie werd onderbroken omdat er een probleem met je hardware lijkt "
+"te zijn. De exacte foutboodschap is:\n"
+"\n"
+"%s.\n"
+"\n"
+" Het installatieprogramma zal nu afsluiten."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"De installatie werd onderbroken omdat er een probleem met je hardware lijkt "
+"te zijn. De exacte foutboodschap is:\n"
+"\n"
+"%s.\n"
+"\n"
+" Het installatieprogramma zal nu afsluiten."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Er is een hardwarefout opgetreden "
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"De installatie werd onderbroken omdat er een probleem met je hardware lijkt "
+"te zijn. De exacte foutboodschap is:\n"
+"\n"
+"%s.\n"
+"\n"
+" Het installatieprogramma zal nu afsluiten."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Bezig met configureren van geïnstalleerd systeem"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Bezig met schrijven van netwerkinformatie"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Bezig met aanmaken gebruikers"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Bezig met configureren van geïnstalleerd systeem"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Uitvoeren van pre-installatiescripts"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Bezig met instellen van installatiebron..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Bezig met installeren van bootlader."
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Bezig met post-installatie-instellingstaken uit te voeren"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Bezig met installeren van bootlader."
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow-certificaat %s vereist het netwerk."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -266,32 +540,323 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s ontbreekt. Kan de firewall niet instellen."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s ontbreekt. Kan de firewall niet instellen."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Dit bestandssysteem ondersteunt geen labels."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Opgegeven naam %s is al in gebruik."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+"Volumegroepsnaam %s is al in gebruik. Wijzigingen worden niet opgeslagen."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Uitvoeren van pre-installatiescripts"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Hostnaam kan niet None of een lege tekenreeks zijn."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Hostnaam moet 255 -of minder- karakters lang zijn."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Hostnaam moet beginnen met een geldig karakter in de reeksen 'a-z', 'A-Z' of "
-"'0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -301,55 +866,55 @@ msgstr ""
 "bevatten, onderdelen tussen punten mogen niet leeg zijn en kan niet beginnen "
 "of eindigen met '-'."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Bezig met verbinding maken..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Bezig met verbinding verbreken..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Bekabeld (%s) verbonden"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Draadloos verbonden met %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Geen netwerkapparaat beschikbaar"
 
@@ -358,7 +923,12 @@ msgstr "Geen netwerkapparaat beschikbaar"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s INSTALLATIE"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nieuwe %s %s installatie"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Draai %s om het systeem af te koppelen als je klaar bent."
@@ -372,8 +942,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Kan /bin/sh niet vinden om uit te voeren! Shell wordt niet gestart"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Redding"
 
@@ -422,21 +992,15 @@ msgstr "Te redden systeem"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Welke apparaat bevat de rootpartitie van je installatie?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Het systeem zal automatisch herstarten als je de shell verlaat."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -446,7 +1010,7 @@ msgstr ""
 "deze niet aan te koppelen. Druk op <Enter> om naar een shell te gaan waarin "
 "je de partities met fsck kunt controleren en kunt aankoppelen. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -467,7 +1031,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -481,29 +1045,243 @@ msgstr ""
 "\n"
 "Druk op <Enter> om naar een ​​shell te gaan."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Je hebt geen Linux-partities. Het systeem zal nu herstarten.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Het systeem zal automatisch herstarten als je de shell verlaat."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Reddingsmodus"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Je hebt geen Linux-partities. Druk op <Enter> om een shell te krijgen.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Je systeem is aangekoppeld onder de map %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standaardpartitie"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Schijf"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Het 'swap'-gebied op je computer wordt door het besturingssysteem\n"
+"gebruikt als het geheugen bijna op is."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"In het 'boot'-gebied op je computer bevinden zich bestanden\n"
+"die nodig zijn om het besturingssysteem op te starten."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"In het 'root'-gebied op je computer bevinden zich\n"
+"essentiële systeembestanden en toepassingen."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"In het 'home'-gebied op je computer bevindt zich al\n"
+"je persoonlijke data."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"De BIOS-bootpartitie is vereist voor het opstarten vanaf\n"
+"GPT-gepartitioneerde schijven voor BIOS-hardware."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"De PReP-bootpartitie is vereist als onderdeel van de\n"
+"bootladerconfiguratie op sommige PPC-platforms."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Je rootpartitie is kleiner dan 250 megabytes, wat gewoonlijk te klein is om "
+"%s te kunnen installeren."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Je hebt geen rootpartitie (/) gedefinieerd. Deze is echter vereist om verder "
+"te kunnen gaan met de installatie van %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Dit platform vereist /boot op een aparte partitie of logische volume. Als je "
+"geen /boot-volume wilt, moet je / op een specifieke niet-LVM partitie "
+"plaatsen."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Je %(mount)s-partitie is kleiner dan %(size)s megabyte, wat kleiner is dan "
+"aanbevolen wordt voor een normale %(productName)s installatie."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Je %(mount)s-partitie is te klein voor het formatteren als %(format)s "
+"(toegestane grootte loopt van %(minSize)d MB tot %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Je %(mount)s-partitie is te groot voor het formatteren als %(format)s "
+"(toegestane grootte loopt van %(minSize)d MB tot %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Nieuw apparaat toevoegen mislukte. Klik voor details."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Je hebt geen opstartpartitie aangemaakt."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Je op BIOS-gebaseerd systeem heeft een speciale partitie nodig om op te "
+"starten met het nieuwe schijflabelformaat (GPT) van %s. Om verder te gaan "
+"moet je een 1 MB 'BIOS Boot' type-partitie aanmaken."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Je hebt geen swappartitie opgegeven.  %(requiredMem)s MB geheugen is vereist "
+"om de installatie voort te zetten zonder een swappartitie, maar je hebt "
+"slechts %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Je hebt geen swappartitie opgegeven.  Hoewel dit niet in alle gevallen "
+"strikt noodzakelijk is, verhoogt het in het algemeen wel de performance voor "
+"de meeste installaties."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Tenminste een van de swapapparaten heeft geen UUID, wat gebruikelijk is voor "
+"swapruimte aangemaakt met oudere versies van mkswap.  Naar deze apparaten "
+"wordt verwezen met een apparaatpad in /etc/fstab, wat niet ideaal is omdat "
+"apparaatpaden door diverse oorzaken kunnen veranderen."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Dit koppelpunt is ongeldig.  De %s map moet zich op het / bestandssysteem "
+"bevinden."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Het koppelpunt %s moet zich op een linux-bestandssysteem bevinden."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Wachtzin:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -616,53 +1394,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Het aangeboden VNC-wachtwoord was niet tenminste 6 karakters lang.\n"
 "Vul een nieuw wachtwoord in. Laat het leeg om zonder wachtwoord te werken."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Instellen van installatiebron mislukte"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Fout bij downloaden van pakket-metadata..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Geen installatiebron beschikbaar"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Bezig met software installeren"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Beginnen met pakketinstallatieproces"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Je hebt meer ruimte nodig op de volgende bestandssystemen:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "De transactie vanaf de installatiebron wordt voorbereid"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Bezig met installeren"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Bezig met downloaden van pakket-metadata..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Bezig met installeren"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Installatie wordt voorbereid"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Bezig met controleren van opslagconfiguratie..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "STANDAARDTITEL"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALISATIE"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALISATIE"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "GEBRUIKERSINSTELLINGEN"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -671,34 +1534,102 @@ msgstr ""
 "Er is niet genoeg ruimte op de bestandssystemen voor de huidige "
 "softwareselectie. Er is nog %s aan ruimte nodig."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Installatiehub"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Geautomatiseerde installatie wordt opgestart"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Vragen zijn in de commandoregel-modus niet mogelijk!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Maak hierboven je keuze uit ['a' om af te sluiten | 'd' om door te gaan]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Maak alle spaken af voor dat je verder gaat"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "a"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Standaard HUB-titel"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "a"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Maak alle spaken af voor dat je verder gaat"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fout"
 
@@ -722,25 +1653,28 @@ msgstr "ja"
 msgid "no"
 msgstr "nee"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Wil je werkelijk afsluiten?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "d"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -748,7 +1682,7 @@ msgid ""
 msgstr ""
 "  Maak hierboven je keuze uit ['a' om af te sluiten | 'd' om door te gaan]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -763,219 +1697,258 @@ msgstr ""
 "computer te verbinden vanaf een andere computer en een grafische installatie "
 "uitvoeren of wil je verder gaan met een tekstmodus-installatie?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "d"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC-wachtwoord"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Bied het VNC-wachtwoord aan. Je moet het tweemaal intypen.\n"
 "Laat veld leeg om zonder wachtwoord te werken"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Wachtwoord:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Wachtwoord (bevestigen):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Wachtwoorden komen niet overeen!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Het wachtwoord moet tenminste zes karakters lang zijn."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Het wachtwoord moet tenminste zes karakters lang zijn."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Tijdzone-instellingen"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Tijdzone is niet ingesteld."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Beschikbare regio's"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Beschikbare regio's"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Bezig met schrijven van netwerkinformatie"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Bekabeld (%s) verbonden"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Bekabeld (%s) verbonden"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Hostnaam:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Hostnaam"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Hostnaam"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Hostnaam is niet geldig: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Configuratie _afmaken"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "bestandssysteemconfiguratie mist een type"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Bezig met configureren van geïnstalleerd systeem"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Rootwachtwoord:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Wachtwoord is ingesteld."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root-account is uitgezet."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Wachtwoord is niet ingesteld."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Selecteer een nieuw rootwachtwoord.  Je moet het tweemaal intypen."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Wachtwoord:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Gebruik alle ruimte"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Vervang bestaand Linux-systeem(systemen)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Gebruik vrije ruimte"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Installatiedoel"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Geen schijven geselecteerd"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Fout ontdekt bij controle van opslagconfiguratie"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Fout ontdekt bij controle van opslagconfiguratie"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automatisch partitioneren geselecteerd"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Aangepast partitioneren geselecteerd"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -983,40 +1956,62 @@ msgstr ""
 "Geen schijven ontdekt.  Zet de computer uit, verbind tenminste één schijf en "
 "start de installatie opnieuw op."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Geen schijven geselecteerd; selecteer tenminste één schijf waarop "
 "geïnstalleerd kan worden."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Opslag onderzoeken..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Selecteer"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Vernieuwde opslagconfiguratie wordt aangemaakt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "opslagconfiguratie mislukte: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Bezig met controleren van opslagconfiguratie..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Automatische partitioneringsopties"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1025,41 +2020,41 @@ msgstr ""
 "Installatie vereist het partitioneren van je harde schijf. Selecteer welke "
 "ruimte je wilt gebruiken als installatiedoel."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Configuratie partitieschema"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Configuratie partitieschema"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Tijdzone-instellingen"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s tijdzone"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Tijdzone is niet ingesteld."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Beschikbare tijdzones in regio %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Beschikbare regio's"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1068,178 +2063,196 @@ msgstr ""
 "Gebruik nummers of geef direct namen op [b voor regio lijst, q om af te "
 "sluiten]:"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Start VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installatievoortgang"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Dichtstbijzijnde spiegel"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "fout bij het instellen van softwarebron"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Niets geselecteerd"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Bezig met verbinding maken..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD-station"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-bestand:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Netwerktijd"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Geen installatiebron beschikbaar"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Instellen van installatiebron mislukte"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Fout bij downloaden van pakket-metadata..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Geen installatiebron beschikbaar"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS-koppelopties:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Instellen van installatiebron mislukte, controleer de repo-url"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "het apparaat dat /boot bevat"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Instellen van installatiebron mislukte"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Verander softwareselectie"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Fout bij controleren van softwareselectie"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Installatiebron niet ingesteld"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Bron is veranderd - controleer dit"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Aangepaste software geselecteerd"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Installatiebron niet ingesteld"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Kies je omgeving"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Authenticatie gebruiken"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Je moet een wachtwoord aanbieden en bevestigen"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Waarschuwing"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1255,36 +2268,36 @@ msgstr "Bezig"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstallatie beëindigd. Duw op <Enter> om af te sluiten "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Standaardspaaktitel"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "bezig met testen van status..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Nieuw apparaat"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Wachtwoord (bevestigen):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1293,7 +2306,7 @@ msgstr ""
 "Je hebt een zwak wachtwoord aangeboden: %s. Klik op 'Klaar' als je het toch "
 "wilt gebruiken."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1302,63 +2315,47 @@ msgstr ""
 "Je hebt een zwak wachtwoord aangeboden: %s. Klik op 'Klaar' als je het toch "
 "wilt gebruiken."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Wachtwoord is ingesteld."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Installatieprogramma _afsluiten"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Hulp"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nee"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Ja"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "STANDAARDTITEL"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALISATIE"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALISATIE"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "GEBRUIKERSINSTELLINGEN"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1366,7 +2363,11 @@ msgstr ""
 "Voltooi items gemarkeerd met dit icoon voordat je verder gaat met de "
 "volgende stap. "
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Compleet!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1375,170 +2376,67 @@ msgstr ""
 "%s is nu met succes op je systeem geïnstalleerd en is klaar voor\n"
 "gebruik!  Ga je gang en herstart om te beginnen met het te gebruiken!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Compleet!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Afsluiten"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nieuwe %s %s installatie"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s is nu met succes op je systeem geïnstalleerd, maar er moet nog wat "
+"configuratie gedaan worden. \n"
+"Maak dat af en klik dan op de 'Configuratie afmaken'-knop."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s is nu met succes op je systeem geïnstalleerd en is klaar voor\n"
+"gebruik!  Ga je gang en herstart om te beginnen met het te gebruiken!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Maak een nieuwe volumegroep aan..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Opnieuw configureren van apparaat is mislukt. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Maak een naam aan voor je volumegroep en selecteer hieronder ten minste één "
-"schijf."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Volumegroep:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "kolom"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Opslagconfiguratie is gereset wegens een niet-oplosbare fout. Klik voor "
 "details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Opnieuw configureren van apparaat is mislukt. Klik voor details."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Vul een geldig koppelpunt in."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Dat koppelpunt is ongeldig. Probeer je iets anders?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Dat koppelpunt is al in gebruik. Probeer je iets anders?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Het RAID-level dat je geselecteerd hebt vereist meer schijven dan je op dit "
-"moment geselecteerd hebt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Vul een geldig koppelpunt in."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Dat koppelpunt is ongeldig. Probeer je iets anders?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standaardpartitie"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Schijf"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Geen"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Verwijder ook alle andere bestandssystemen in de %s root."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Weet je zeker dat je alle data op %s wilt verwijderen?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Weet je zeker dat je alle data op %s wilt verwijderen?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "HANDMATIG PARTITIONEREN"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d opslagapparaat geselecteerd"
 msgstr[1] "%d opslagapparaten geselecteerd"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1547,132 +2445,113 @@ msgstr ""
 "Als je koppelpunten aanmaakt voor je %s %s installatie,\n"
 "kun je hier alle relevante details bekijken."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Het 'swap'-gebied op je computer wordt door het besturingssysteem\n"
-"gebruikt als het geheugen bijna op is."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"In het 'boot'-gebied op je computer bevinden zich bestanden\n"
-"die nodig zijn om het besturingssysteem op te starten."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"In het 'root'-gebied op je computer bevinden zich\n"
-"essentiële systeembestanden en toepassingen."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"In het 'home'-gebied op je computer bevindt zich al\n"
-"je persoonlijke data."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"De BIOS-bootpartitie is vereist voor het opstarten vanaf\n"
-"GPT-gepartitioneerde schijven voor BIOS-hardware."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"De PReP-bootpartitie is vereist als onderdeel van de\n"
-"bootladerconfiguratie op sommige PPC-platforms."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi moet zich op een apparaat van type %s bevinden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s moet zich op een apparaat van type %s bevinden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s kan niet versleuteld worden"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Je moet een nieuw bestandssysteem op het rootapparaat aanmaken."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Apparaten van het type %s vereisen een geldige RAID-level selectie."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Verzoek om grootte van apparaat aan te passen mislukte. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Verzoek om apparaat opnieuw te formatteren mislukte. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Opgegeven naam %s is al in gebruik."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Dit bestandssysteem ondersteunt geen labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Geen schijven geselecteerd"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "De grootte van dit bestandssysteem kan niet aangepast worden."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Fout bij het controleren van opslagconfiguratie. Klik voor details."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Fout bij het controleren van opslagconfiguratie. Klik voor details."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Nieuwe %s toegevoegd aan bestaande container %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Nieuw apparaat toevoegen mislukte. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Ongeldige partitiegrootte ingesteld. Gebruik een geldig geheel getal."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Verzoek om apparaat te verwijderen mislukte. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 "Volumegroepsnaam %s is al in gebruik. Wijzigingen worden niet opgeslagen."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs vrij"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1681,7 +2560,7 @@ msgstr ""
 "Deze software RAID opstelling mist %d van de %d onderdeel partities. Je kunt "
 "het verwijderen of een ander apparaat selecteren."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1690,296 +2569,143 @@ msgstr ""
 "Deze LVM volume groep mist %d van de %d fysieke volumes. Je kunt het "
 "verwijderen of een ander apparaat selecteren."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Geen schijven geselecteerd."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Niet genoeg vrije ruimte op de geselecteerde schijven."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "automatisch partitioneren mislukte. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Verander softwareselectie"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "Openen van versleuteld blokapparaat mislukte. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Je hebt ervoor gekozen om de bestandssystemen voor je nieuwe %(productName)s "
-"installatie handmatig in te stellen. Voordat je begint, zou je een paar "
-"minuten de tijd moeten nemen om de omgeving te verkennen. Er is nogal wat "
-"veranderd.\n"
-"\n"
-"De belangrijkste verandering is dat het aanmaken van bestandssystemen "
-"gestroomlijnd is. Je hoeft geen complexe apparaten meer is fases te bouwen "
-"zoals LVM logische volumes (fysiek volume, daarna volumegroep, daarna "
-"logische volume) -- je kunt nu gewoon een logische volume aanmaken en wij "
-"zullen het voorwerk afhandelen door het instellen van de fysieke volumes en "
-"volumegroepen. Wij zullen ook het aanpassen van de volumegroep afhandelen "
-"als je logische volumes toevoegt, verwijdert of in grootte verandert zodat "
-"je je niet hoeft te bekommeren om alledaagse details.\n"
-"\n"
-"\n"
-"Schermindeling\n"
-"\n"
-"De linkerzijde van het scherm toont de OS installaties die we op deze "
-"computer konden vinden. De nieuwe %(productName)s installatie bevindt zich "
-"bovenin de lijst. Je kunt op de namen van de installaties klikken om te zien "
-"welke bestandssystemen ze bevatten.\n"
-"\n"
-"Onder de verschillende installaties en koppelpunten op de linkerzijde zijn "
-"knoppen voor het toevoegen van een nieuw bestandssysteem, het verwijderen "
-"van het geselecteerde bestandssysteem of het configureren van het "
-"geselecteerde bestandssysteem.\n"
-"\n"
-"Op de rechterzijde van het scherm kun je het huidig geselecteerde koppelpunt "
-"aanpassen.\n"
-"\n"
-"Linksonder zul je een samenvatting zien van de schijven die gekozen hebt om "
-"voor deze installatie te gebruiken. Je kunt op de blauwe tekst klikken om "
-"meer gedetailleerde informatie te krijgen over je geselecteerde schijven.\n"
-"\n"
-"\n"
-"Hoe maak je een nieuw bestandssysteem aan op een nieuw apparaat\n"
-"\n"
-"1. Klik op de + knop.\n"
-"2. Vul het koppelpunt en de grootte in. (Hint: Beweeg de muisaanwijzer over "
-"de tekstinputvelden voor hulp.)\n"
-"3. Selecteer het nieuwe koppelpunt onder \"Nieuwe %(productName)s installatie"
-"\" op de linkerzijde van het scherm en pas het aan naar jouw behoefte.\n"
-"\n"
-"\n"
-"Hoe kun je een apparaat/bestandssysteem dat al op je schijf bestaat opnieuw "
-"formatteren\n"
-"\n"
-"1. Selecteer het bestandssysteem in de linkerzijde van het scherm.\n"
-"2. Klik op de \"Aanpassen\" uitbreiding in het koppelpunt aanpassingsgebied "
-"op de rechterzijde van het scherm.\n"
-"3. Activeer de \"Opnieuw formatteren\" controlevakje, selecteer een "
-"bestandssysteem en, indien van toepassing, een koppelpunt boven in het "
-"\"Koppelpunt\" tekstinputveld.\n"
-"4. Klik op \"Veranderingen toepassen\"\n"
-"\n"
-"\n"
-"Hoe stel je een koppelpunt in voor een bestandssysteem dat zich al op je "
-"schijf bevindt\n"
-"\n"
-"1. Selecteer het bestandssysteem in de linkerkant van het scherm.\n"
-"2. Vul een koppelpunt in het \"Koppelpunt\" tekstinputveld in het koppelpunt "
-"aanpassingsgebied.\n"
-"3. Klik op \"Veranderingen toepassen\"\n"
-"\n"
-"\n"
-"Hoe verwijder je een bestandssysteem dat zich al op je schijf bevindt\n"
-"\n"
-"1. Selecteer het bestandssysteem dat je wilt verwijderen op de linkerzijde "
-"van het scherm.\n"
-"2. Klik op de - knop.\n"
-"\n"
-"Hint: Het verwijderen van een apparaat dat al op je schijf bestaat uit de "
-"\"Nieuwe %(productName)s installatie\" verwijdert het niet van de schijf. "
-"Het herstelt alleen de originele toestand van dat apparaat. Om een apparaat "
-"dat al op je schijf bestaat te verwijderen moet je het selecteren in een van "
-"de andere gedetecteerde installaties (of \"Onbekend\") en op de - knop "
-"klikken.\n"
-"\n"
-"\n"
-"Tips en hints\n"
-"\n"
-"Je kunt afmetingen opgeven voor nieuwe bestandssystemen die groter zijn dan "
-"de totaal beschikbare vrije ruimte. Het installatieprogramma zal proberen zo "
-"dicht mogelijk bij je gevraagde grootte uit te komen.\n"
-"\n"
-"Standaard gebruiken nieuwe apparaten all je geselecteerde schijven.\n"
-"\n"
-"Om te veranderen aan welke schijven een nieuw apparaat toegekend kan worden "
-"kun je op de configuratieknop klikken (de knop met de gereedschap "
-"afbeelding) terwijl dat apparaat geselecteerd is.\n"
-"\n"
-"Bij het toevoegen van een nieuw koppelpunt door op de + knop te klikken, "
-"laat je het grootte ingangsveld leeg om het nieuwe apparaat alle beschikbare "
-"vrije ruimte te laten gebruiken.\n"
-"\n"
-"Als je het laatste apparaat verwijdert uit een container apparaat zoals een "
-"LVM volumegroep, zullen we automatisch dat container apparaat verwijderen om "
-"ruimte te maken voor nieuwe apparaten.\n"
-"\n"
-"Als de laatste partitie van een schijf verwijderd wordt, kan die schijf "
-"opnieuw geïnitialiseerd worden met een nieuwe partitie tabel als we denken "
-"dat er een geschikter type voor die schijf is.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATUM & TIJD"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Je moet eerst het netwerk instellen als je NTP wilt gebruiken"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Je hebt geen werkende NTP-server geconfigureerd"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "BESTEMMING VAN INSTALLATIE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d opslagapparaat geselecteerd"
+msgstr[1] "%d opslagapparaten geselecteerd"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s om indelingen om te schakelen."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TOETSENBORD"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Het testen van indelingsconfiguratie is niet beschikbaar."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "bezig met testen van status..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Indeling omschakelen is niet geconfigureerd."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "TAAL"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Status onbekend (ontbreekt)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Status onbekend"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Niet beheerd"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Niet beschikbaar"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware ontbreekt"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kabel niet aangesloten"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Niet beschikbaar"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Niet verbonden"
@@ -2004,153 +2730,169 @@ msgstr "Verbinding wordt verbroken"
 msgid "Connection failed"
 msgstr "Verbinding mislukte"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "niet aangesloten"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Draadloos"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "niet aangesloten"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4-adres"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6-adres"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Geen"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Authenticatie vereist"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Wachtwoord:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NETWERKCONFIGURATIE"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOTWACHTWOORD"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Wachtwoord is ingesteld."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Rootwachtwoord is ingesteld"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root-account is uitgezet"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Rootwachtwoord is niet ingesteld"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SOFTWARESELECTIE"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Bezig met controleren van softwareafhankelijkheden..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Fout bij controleren van softwareafhankelijkheden"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Bezig met downloaden van pakket-metadata..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Bezig met downloaden van groep-metadata..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Bezig met controleren van softwareafhankelijkheden..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Fout bij controleren van softwareafhankelijkheden"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Fout bij controleren van softwareafhankelijkheden.  Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "De volgende software, gemarkeerd voor installatie, heeft fouten.  Dit wordt "
 "waarschijnlijk veroorzaakt door\n"
@@ -2158,46 +2900,77 @@ msgstr ""
 "installatie te verwijderen,\n"
 "Verander je installatiebron, of sluit het installatieprogramma af."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Afbreken"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Afsluiten"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "Verander _softwarebron"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Verander softwareselectie"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Bezig met instellen van installatiebron..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Fout bij downloaden van pakket-metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Authenticatie vereist"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Dit medium is geschikt om van te installeren."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Dit medium is niet geschikt om van te installeren."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALLATIEBRON"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Instellen van installatiebron mislukte, controleer de repo-url"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Fout bij het instellen van een repository"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "fout bij het instellen van softwarebron"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2205,86 +2978,73 @@ msgstr ""
 "Instellen van installatiebron mislukte, controleer de repo-url en proxy-"
 "instellingen"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Fout bij het instellen van een repository"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "fout bij het instellen van softwarebron"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Apparaat:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-server %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Ongeldige tijdzone"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Ongeldige tijdzone"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Ongeldige tijdzone"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Even wachten... software-metadata wordt nog geladen."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
@@ -2292,12 +3052,7 @@ msgstr ""
 "De schijven die je geselecteerd hebt geven de volgende hoeveelheid vrije "
 "ruimte op:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Even wachten... software-metadata wordt nog geladen."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2309,7 +3064,7 @@ msgstr ""
 "ruimte te verkrijgen door het verkleinen of verwijderen van bestaande "
 "partities."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2320,7 +3075,7 @@ msgstr ""
 "als je alle vrije ruimte\n"
 "gebruikt die beschikbaar is op de geselecteerde schijven."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2335,42 +3090,49 @@ msgstr ""
 "je softwareselectie veranderen om een kleinere versie van <b>%s</b> te "
 "installeren, of het installatieprogramma afsluiten."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "BESTEMMING VAN INSTALLATIE"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Bezig met opslaan van opslagconfiguratie..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Opslaan van opslagconfiguratie mislukte..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD-apparaat formatteren"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "Fout bij het controleren van opslagconfiguratie. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Fout bij het controleren van opslagconfiguratie. Klik voor details."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs vrij"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d schijf geselecteerd; %s capaciteit; %s vrij"
 msgstr[1] "%d schijven geselecteerd; %s capaciteit; %s vrij"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2378,7 +3140,11 @@ msgstr ""
 "Je hebt ervoor gekozen om de bootlader-installatie over te slaan.  Je "
 "systeem kan waarschijnlijk niet opstarten."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2388,11 +3154,19 @@ msgstr ""
 "opslagconfiguratie. Je kunt je opslagindeling veranderen\n"
 "of het installatieprogramma afsluiten."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Afsluiten"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Verander opslagindeling"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2403,76 +3177,80 @@ msgstr ""
 "opslagconfiguratie. Je kunt je opslagindeling veranderen\n"
 "of het installatieprogramma afsluiten."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "GEBRUIKERSINSTELLINGEN"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ongeldige tijdzone"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "WELKOM BIJ %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Je hebt nog geen koppelpunten aangemaakt voor je %s %s installatie:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Klik hier om ze automatisch aan te maken."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Of maak hieronder nieuwe koppelpunten aan met de '+' icoon."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2487,55 +3265,163 @@ msgstr[1] ""
 "<b>%d schijven; %s capaciteit; %s vrije ruimte</b> (niet gepartitioneerd en "
 "in bestandssystemen)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Geen bootlader installeren"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Stel in als bootapparaat"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Het RAID-level dat je geselecteerd hebt vereist meer schijven dan je op dit "
+"moment geselecteerd hebt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Maak een naam aan voor je volumegroep en selecteer hieronder ten minste één "
+"schijf."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Volumegroep:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "kolom"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Het koppelpunt %s moet zich op een linux-bestandssysteem bevinden."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Dat koppelpunt is al in gebruik. Probeer je iets anders?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Vul een geldig koppelpunt in."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Dat koppelpunt is ongeldig. Probeer je iets anders?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Verwijder ook alle andere bestandssystemen in de %s root."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Weet je zeker dat je alle data op %s wilt verwijderen?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Weet je zeker dat je alle data op %s wilt verwijderen?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Ongeldige tijdzone"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Afsluiten"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Je hebt een zwak wachtwoord aangeboden: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Wachtzinnen komen niet overeen."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Behouden"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Verminderen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Dit apparaat bevat de installatiebron."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Bezig met %(type)s aanmaken op %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Niet gereed"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Gebruik vrije ruimte"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2548,14 +3434,14 @@ msgstr ""
 "om plaats te maken voor deze installatie.  Het verwijderen van een "
 "bestandssysteem zal ook alle data hierin permanent verwijderen."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2564,353 +3450,762 @@ msgstr[0] "<b>%s schijf; %s terug te vorderen ruimte</b> (in bestandssystemen)"
 msgstr[1] ""
 "<b>%s schijven; %s terug te vorderen ruimte</b> (in bestandssystemen)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Totaal geselecteerde ruimte om terug te vorderen: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Verwijderen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Behouden"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "DISTRIBUTIE-INSTALLATIE"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "SPAAKNAAM"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PRE-RELEASE / TESTEN"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Nieuw apparaat"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Nieuwe keuzeschakelaar"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Klaar"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Doorgaan"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Veranderingen toepassen"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NETWERKCONFIGURATIE"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Groepsnaam"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Afbreken"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATUM & TIJD"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Toevoegen en markeren voor gebruik van NTP-servers"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Webserver"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Bezig"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Gebruik"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Configureer..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATUM & TIJD"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Regio:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Regio:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Stad:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Stad:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Netwerknaam"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Netwerknaam"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-uurs"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "BESTEMMING VAN INSTALLATIE"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capaciteit"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Niet verbonden"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Geselecteerd apparaat"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Niets geselecteerd"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware ontbreekt"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nee"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN-type"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Geselecteerd apparaat"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "overzicht"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-opstelling"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Standaardroute"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Subnetmasker"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Snelheid"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardware-adres"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "C_onfigureren..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Beveiliging"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Netwerknaam"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Netwerknaam"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Beveiligingssleutel"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Gebruik als hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Stop hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Configureer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Aanbieder"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Configureer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN-type"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Groepsnaam"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Groepswachtwoord"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Configureer..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Methode"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Configuratie URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks host"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Bezig met schrijven van netwerkinformatie"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Openen"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "_Vliegtuigmodus"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Bezig met schrijven van netwerkinformatie"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Hostnaam:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NETWERKCONFIGURATIE"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2920,206 +4215,61 @@ msgstr ""
 "om software-updates\n"
 "beschikbaar voor je te maken."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Standaardroute"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Subnetmasker"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Snelheid"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardware-adres"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "C_onfigureren..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Beveiliging"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Netwerknaam"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Netwerknaam"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Beveiligingssleutel"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Gebruik als hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Stop hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Configureer..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Aanbieder"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN-type"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Groepsnaam"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Groepswachtwoord"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Methode"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Configuratie URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks host"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Openen"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "_Vliegtuigmodus"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Hostnaam:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Authenticatie gebruiken"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Authenticatie vereist"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Verbonden"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SOFTWARESELECTIE"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Kies je omgeving"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "kolom"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Annuleren & meer schijven _toevoegen"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "INSTALLATIE-OPTIES"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Partitietype:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Versleutel mijn data. Ik zal later een wachtzin instellen."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Aangepast partitioneren geselecteerd"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Vorder ruimte terug"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "INSTALLATIE-OPTIES"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3127,79 +4277,145 @@ msgstr ""
 "Hier zullen we beschrijven hoeveel ruimte nodig is voor de huidige "
 "softwareselectie."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "schijf vrij"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Vrije ruimte beschikbaar voor gebruik."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs vrij"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Vrije ruimte niet beschikbaar maar terug te vorderen van bestaande partities."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Hier zullen we beschrijven wat je opties zijn."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Gebruik vrije ruimte"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "Installatieprogramma _afsluiten"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Apparaatomschrijving"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Lokale standaardschijven"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Voltooi partitioneren"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Versleutelen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automatisch partitioneren geselecteerd"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Voltooi partitioneren"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Versleutelen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Versleutel mijn data. Ik zal later een wachtzin instellen."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Automatische partitioneringsopties"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "overzicht"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Volledig schijfoverzicht en opties..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "EEN TOETSENBORDINDELING TOEVOEGEN"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-"Je kunt een toetsenbordindeling toevoegen door het hieronder te selecteren:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Naam"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "TOETSENBORDINDELING"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3208,7 +4424,7 @@ msgstr ""
 "indeling naar de top van de lijst verplaatsen om deze als de standaard te "
 "selecteren."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3217,118 +4433,201 @@ msgstr ""
 "systeem. Gebruik de gereedschappen van het bureaublad om het toetsenbord te "
 "configureren voor het installatieproces."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "naam"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Voeg indeling toe"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Verwijder indeling"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Verplaats geselecteerde indeling naar boven"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Voeg indeling toe"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Verwijder indeling"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Verplaats geselecteerde indeling naar boven"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Verplaats geselecteerde indeling naar beneden"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Bekijk voorbeeld indeling"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Het testen van indelingsconfiguratie is niet beschikbaar."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift om tussen indelingen om te schakelen."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Opties"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "EEN TOETSENBORDINDELING TOEVOEGEN"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+"Je kunt een toetsenbordindeling toevoegen door het hieronder te selecteren:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Naam"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Beschikbare regio's"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Voeg indeling toe"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "INDELING OMSCHAKELEN-OPTIES"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Welke combinatie(s) hebben je voorkeur voor het omschakelen tussen "
 "toetsenbordindelingen?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "gebruik"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "beschrijving"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS-koppelopties:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "TAAL"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "Nederlands"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "Dutch"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Niets geselecteerd"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOTWACHTWOORD"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Rootwachtwoord:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Bevestigen:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC-wachtwoord"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Stel rootwachtwoord in."
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3336,237 +4635,285 @@ msgstr ""
 "Het root-account wordt gebruikt voor het beheren van het systeem. Vul een "
 "wachtwoord in voor de rootgebruiker."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Klaar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MEDIAVERIFICATIE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Bezig met verifiëren van media, even geduld..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Toevoegen"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP proxy _aanzetten"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Voorbeeld:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Authenticatie gebruiken"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Gebruikersnaam</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Gebruikersnaam"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Wachtwoord</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Wachtwoord:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALLATIEBRON"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Welke installatiebron wil je gebruiken?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Automatisch gedetecteerd installatiemedium:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Apparaat:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verifiëren"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-bestand:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Apparaat:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Kies een ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Op het _netwerk:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxy instellen..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Deze URL verwijst naar een _spiegellijst."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS-koppelopties:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Dit veld is optioneel."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People-repositories"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Voeg een nieuw koppelpunt toe"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Toevoegen"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Verwijder de geselecteerde koppelpunt(ten)."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operationele fout."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Stel rootwachtwoord in."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Deze URL verwijst naar een _spiegellijst."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Naam:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Gebruikersnaam"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Wachtwoord:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Dat koppelpunt is ongeldig. Probeer je iets anders?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Haal me hier vandaan!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Ik accepteer mijn lot."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Dit is onstabiele, pre-release software."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3578,204 +4925,264 @@ msgstr ""
 "Bugs waarmee je moet leven.  Dit OS van de toekomst is geen stabiel OS "
 "waarop je kunt rekenen.  Het is er alleen voor testdoeleinden."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "WELKOM BIJ %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Welke taal wil je gebruiken tijdens het installatieproces?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Afsluiten"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Doorgaan"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Gebruikersnaam"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Groepsnaam"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Wachtwoord:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC-wachtwoord"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "Koppelpunt  _toevoegen"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Gewenste capaciteit:</b>"
+msgid "Add a new mount point."
+msgstr "Voeg een nieuw koppelpunt toe"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Koppelpunt:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Toevoegen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "VOEG EEN NIEUW KOPPELPUNT TOE"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Hieronder zijn meer aanpassingsopties beschikbaar\n"
-"na het aanmaken van het koppelpunt."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Dat koppelpunt is al in gebruik.\n"
-"Probeer iets anders?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "bv.: \"20 GB\", \"500mb\" (zonder aanhalingstekens)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Verwijder het"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Opslaan"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CONFIGUREREN KOPPELPUNT"
+msgid "Remove the selected mount point(s)."
+msgstr "Verwijder de geselecteerde koppelpunt(ten)."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Maak een naam aan voor je volumegroep en selecteer hieronder ten minste één "
-"schijf."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "_Verwijderen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Beschikbaar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-opstelling"
+msgid "Reload storage configuration from disk."
+msgstr "opslagconfiguratie mislukte: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Versleutelen"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Geselecteerd apparaat"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Apparaatomschrijving"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Koppelpunt:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Gewenste capaciteit:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Label:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Apparaattype:</b>"
+msgid "Device(s):"
+msgstr "Apparaat:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Bestandssysteem:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Versleutelen"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Opnieuw formatteren"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Volumegroep:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Aanpassen ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Naam:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Apparaattype:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Versleutelen"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Bestandssysteem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Opnieuw formatteren"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Volumegroep:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Aanpassen ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID-opstelling"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3783,17 +5190,19 @@ msgstr ""
 "Dit apparaat is versleuteld en kan zonder een geldige wachtzin niet gelezen "
 "worden. Je kunt het hieronder openen."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Wachtzin:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Openen"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3801,296 +5210,573 @@ msgstr ""
 "Dit apparaat kan niet rechtstreeks bewerkt worden. Je kunt het verwijderen "
 "of een ander apparaat selecteren."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Voeg een nieuw koppelpunt toe"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Verwijder de geselecteerde koppelpunt(ten)."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Configureren geselecteerd koppelpunt."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Configureer..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "opslagconfiguratie mislukte: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Klik voor hulp"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Hulp"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">BESCHIKBARE RUIMTE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TOTALE RUIMTE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Selecteer"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Afbreken"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGUREREN KOPPELPUNT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Selecteer één of meer schijven waarop dit apparaat zich mag bevinden."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-adres"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Je moet een iSCSI-initiatornaam opgeven"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Authenticatie gebruiken"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Voorbeeld:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Gebruikersnaam"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC-wachtwoord"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Gebruikersnaam"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-wachtwoord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Gebruikersnaam"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC-wachtwoord"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Netwerknaam"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Authenticatie gebruiken"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Gebruikersnaam"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-wachtwoord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Gebruikersnaam"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-wachtwoord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Gebruikersnaam"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC-wachtwoord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Verbinding mislukte"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Apparaat:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "GESELECTEERDE SCHIJVEN"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Afsluiten"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Boot"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Beschrijving"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Beschikbaar"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Schijfsamenvatting kan hier"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Verwijder het"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Selecteer"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGUREREN KOPPELPUNT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Selecteer één of meer schijven waarop dit apparaat zich mag bevinden."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "Koppelpunt  _toevoegen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Gewenste capaciteit:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Koppelpunt:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "VOEG EEN NIEUW KOPPELPUNT TOE"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Hieronder zijn meer aanpassingsopties beschikbaar\n"
+"na het aanmaken van het koppelpunt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Dat koppelpunt is al in gebruik.\n"
+"Probeer iets anders?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "bv.: \"20 GB\", \"500mb\" (zonder aanhalingstekens)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Opslaan"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CONFIGUREREN KOPPELPUNT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Maak een naam aan voor je volumegroep en selecteer hieronder ten minste één "
+"schijf."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Naam:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-opstelling"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Versleutelen"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Vul een geldig koppelpunt in."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD-apparaat formatteren"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Tijdens de installatie trad een onbekende fout op. Details vind je hieronder."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "SCHIJFVERSLEUTELINGSWACHTZIN"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Sla wachtzin op"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "SCHIJFVERSLEUTELINGSWACHTZIN"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4100,7 +5786,19 @@ msgstr ""
 "wachtzin aanmaken die je moet gebruiken om toegang tot je data te krijgen "
 "als je de computer opstart."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Wachtzin:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Bevestigen:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4110,117 +5808,172 @@ msgstr ""
 "toetsenbordindeling verandert, kun je na de installatie je schijven "
 "misschien niet meer ontsleutelen."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "SCHIJFRUIMTE TERUGVORDEREN"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Afbreken"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Afbreken"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Vorder ruimte terug"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "SCHIJFRUIMTE TERUGVORDEREN"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Beschrijving kan hier."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Bestandssysteem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Terug te vorderen ruimte"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Actie:"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Behouden"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Verwijderen"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Verminderen"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Aangepast partitioneren geselecteerd"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Veranderingen toepassen"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Apparaat:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "Koppelpunt  _toevoegen"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Installatieprogramma _afsluiten"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nee"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Ja"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4228,51 +5981,50 @@ msgstr ""
 "Weet je zeker dat je het installatieproces\n"
 "wilt afsluiten?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Afsluiten"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "INSTALLATIE-OVERZICHT"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Afsluiten"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Begin met installatie"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "CONFIGURATIE"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Installatie wordt voorbereid"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s is nu met succes op je systeem geïnstalleerd, maar er moet nog wat "
-"configuratie gedaan worden. \n"
-"Maak dat af en klik dan op de 'Configuratie afmaken'-knop."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "Configuratie _afmaken"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s is nu met succes op je systeem geïnstalleerd en is klaar voor\n"
-"gebruik!  Ga je gang en herstart om te beginnen met het te gebruiken!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Opnieuw opstarten"
 
@@ -4288,16 +6040,16 @@ msgstr "Installeren"
 msgid "Install the live CD to your hard disk"
 msgstr "Installeer de Live CD op je harde schijf"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Beginnen met installeren naar harde schijf"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Welkom bij Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4306,26 +6058,27 @@ msgstr ""
 "%s vereist %s MB geheugen voor het installeren, maar je hebt op deze machine "
 "slechts %s MB.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Het %s grafische installatieprogramma vereist %s MB geheugen, maar je hebt "
 "slechts %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Niet voldoende RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4339,25 +6092,25 @@ msgstr ""
 "\n"
 "in een root terminal."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Tekstmodus wordt opgestart."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fout"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY variabele is niet ingesteld. Tekstmodus wordt nu opgestart."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 "Grafische installatie is niet beschikbaar. Tekstmodus wordt nu opgestart."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4368,20 +6121,20 @@ msgstr ""
 "je een eigen partitie-indeling of pakketselecties kiest. Wil je in plaats "
 "hiervan de VNC-modus gebruiken?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Ssh install@%s om de installatie te beginnen."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Ssh install@<host> om de installatie te vervolgen."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Probeer Fedora uit"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4391,7 +6144,7 @@ msgstr ""
 "Je kunt Fedora nu installeren, of je kiest \"Naar harde schijf installeren\" "
 "in het 'Activiteiten'-overzicht op elk later moment."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4399,10 +6152,298 @@ msgstr ""
 "Je kunt kiezen voor \"Naar harde schijf installeren\"\n"
 "in het 'Activiteiten'-overzicht op elk later moment."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Afsluiten"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Hostnaam moet beginnen met een geldig karakter in de reeksen 'a-z', 'A-Z' "
+#~ "of '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Je hebt meer ruimte nodig op de volgende bestandssystemen:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Vragen zijn in de commandoregel-modus niet mogelijk!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Dat koppelpunt is ongeldig. Probeer je iets anders?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Je hebt ervoor gekozen om de bestandssystemen voor je nieuwe "
+#~ "%(productName)s installatie handmatig in te stellen. Voordat je begint, "
+#~ "zou je een paar minuten de tijd moeten nemen om de omgeving te verkennen. "
+#~ "Er is nogal wat veranderd.\n"
+#~ "\n"
+#~ "De belangrijkste verandering is dat het aanmaken van bestandssystemen "
+#~ "gestroomlijnd is. Je hoeft geen complexe apparaten meer is fases te "
+#~ "bouwen zoals LVM logische volumes (fysiek volume, daarna volumegroep, "
+#~ "daarna logische volume) -- je kunt nu gewoon een logische volume aanmaken "
+#~ "en wij zullen het voorwerk afhandelen door het instellen van de fysieke "
+#~ "volumes en volumegroepen. Wij zullen ook het aanpassen van de volumegroep "
+#~ "afhandelen als je logische volumes toevoegt, verwijdert of in grootte "
+#~ "verandert zodat je je niet hoeft te bekommeren om alledaagse details.\n"
+#~ "\n"
+#~ "\n"
+#~ "Schermindeling\n"
+#~ "\n"
+#~ "De linkerzijde van het scherm toont de OS installaties die we op deze "
+#~ "computer konden vinden. De nieuwe %(productName)s installatie bevindt "
+#~ "zich bovenin de lijst. Je kunt op de namen van de installaties klikken om "
+#~ "te zien welke bestandssystemen ze bevatten.\n"
+#~ "\n"
+#~ "Onder de verschillende installaties en koppelpunten op de linkerzijde "
+#~ "zijn knoppen voor het toevoegen van een nieuw bestandssysteem, het "
+#~ "verwijderen van het geselecteerde bestandssysteem of het configureren van "
+#~ "het geselecteerde bestandssysteem.\n"
+#~ "\n"
+#~ "Op de rechterzijde van het scherm kun je het huidig geselecteerde "
+#~ "koppelpunt aanpassen.\n"
+#~ "\n"
+#~ "Linksonder zul je een samenvatting zien van de schijven die gekozen hebt "
+#~ "om voor deze installatie te gebruiken. Je kunt op de blauwe tekst klikken "
+#~ "om meer gedetailleerde informatie te krijgen over je geselecteerde "
+#~ "schijven.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hoe maak je een nieuw bestandssysteem aan op een nieuw apparaat\n"
+#~ "\n"
+#~ "1. Klik op de + knop.\n"
+#~ "2. Vul het koppelpunt en de grootte in. (Hint: Beweeg de muisaanwijzer "
+#~ "over de tekstinputvelden voor hulp.)\n"
+#~ "3. Selecteer het nieuwe koppelpunt onder \"Nieuwe %(productName)s "
+#~ "installatie\" op de linkerzijde van het scherm en pas het aan naar jouw "
+#~ "behoefte.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hoe kun je een apparaat/bestandssysteem dat al op je schijf bestaat "
+#~ "opnieuw formatteren\n"
+#~ "\n"
+#~ "1. Selecteer het bestandssysteem in de linkerzijde van het scherm.\n"
+#~ "2. Klik op de \"Aanpassen\" uitbreiding in het koppelpunt "
+#~ "aanpassingsgebied op de rechterzijde van het scherm.\n"
+#~ "3. Activeer de \"Opnieuw formatteren\" controlevakje, selecteer een "
+#~ "bestandssysteem en, indien van toepassing, een koppelpunt boven in het "
+#~ "\"Koppelpunt\" tekstinputveld.\n"
+#~ "4. Klik op \"Veranderingen toepassen\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Hoe stel je een koppelpunt in voor een bestandssysteem dat zich al op je "
+#~ "schijf bevindt\n"
+#~ "\n"
+#~ "1. Selecteer het bestandssysteem in de linkerkant van het scherm.\n"
+#~ "2. Vul een koppelpunt in het \"Koppelpunt\" tekstinputveld in het "
+#~ "koppelpunt aanpassingsgebied.\n"
+#~ "3. Klik op \"Veranderingen toepassen\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Hoe verwijder je een bestandssysteem dat zich al op je schijf bevindt\n"
+#~ "\n"
+#~ "1. Selecteer het bestandssysteem dat je wilt verwijderen op de "
+#~ "linkerzijde van het scherm.\n"
+#~ "2. Klik op de - knop.\n"
+#~ "\n"
+#~ "Hint: Het verwijderen van een apparaat dat al op je schijf bestaat uit de "
+#~ "\"Nieuwe %(productName)s installatie\" verwijdert het niet van de schijf. "
+#~ "Het herstelt alleen de originele toestand van dat apparaat. Om een "
+#~ "apparaat dat al op je schijf bestaat te verwijderen moet je het "
+#~ "selecteren in een van de andere gedetecteerde installaties (of \"Onbekend"
+#~ "\") en op de - knop klikken.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips en hints\n"
+#~ "\n"
+#~ "Je kunt afmetingen opgeven voor nieuwe bestandssystemen die groter zijn "
+#~ "dan de totaal beschikbare vrije ruimte. Het installatieprogramma zal "
+#~ "proberen zo dicht mogelijk bij je gevraagde grootte uit te komen.\n"
+#~ "\n"
+#~ "Standaard gebruiken nieuwe apparaten all je geselecteerde schijven.\n"
+#~ "\n"
+#~ "Om te veranderen aan welke schijven een nieuw apparaat toegekend kan "
+#~ "worden kun je op de configuratieknop klikken (de knop met de gereedschap "
+#~ "afbeelding) terwijl dat apparaat geselecteerd is.\n"
+#~ "\n"
+#~ "Bij het toevoegen van een nieuw koppelpunt door op de + knop te klikken, "
+#~ "laat je het grootte ingangsveld leeg om het nieuwe apparaat alle "
+#~ "beschikbare vrije ruimte te laten gebruiken.\n"
+#~ "\n"
+#~ "Als je het laatste apparaat verwijdert uit een container apparaat zoals "
+#~ "een LVM volumegroep, zullen we automatisch dat container apparaat "
+#~ "verwijderen om ruimte te maken voor nieuwe apparaten.\n"
+#~ "\n"
+#~ "Als de laatste partitie van een schijf verwijderd wordt, kan die schijf "
+#~ "opnieuw geïnitialiseerd worden met een nieuwe partitie tabel als we "
+#~ "denken dat er een geschikter type voor die schijf is.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "NETWERKCONFIGURATIE"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Fout bij downloaden van pakket-metadata..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Niets geselecteerd"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware ontbreekt"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Authenticatie vereist"
+
+#~ msgid "column"
+#~ msgstr "kolom"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Partitietype:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Gebruikersnaam</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Wachtwoord</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Dat koppelpunt is ongeldig. Probeer je iets anders?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Label:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Bestandssysteem:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-opstelling"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Configureren geselecteerd koppelpunt."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Klik voor hulp"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">BESCHIKBARE RUIMTE</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">TOTALE RUIMTE</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Voltooid"
 
@@ -4456,42 +6497,9 @@ msgstr "Afsluiten"
 #~ msgid "Install on System"
 #~ msgstr "Installeren op systeem"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "De volgende fout is tijdens het instellen van de installatierepository "
-#~ "opgetreden:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "De installatie kan niet verdergaan."
-
 #~ msgid "Exit installer"
 #~ msgstr "Installatieprogramma afsluiten"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "De installatie werd onderbroken omdat er een probleem met je hardware "
-#~ "lijkt te zijn. De exacte foutboodschap is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Het installatieprogramma zal nu afsluiten."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Er is een hardwarefout opgetreden "
-
 #~ msgid "_Exit installer"
 #~ msgstr "Installatieprogramma _afsluiten"
 
@@ -4799,9 +6807,6 @@ msgstr "Afsluiten"
 #~ msgid "Software Development"
 #~ msgstr "Softwareontwikkeling"
 
-#~ msgid "Web Server"
-#~ msgstr "Webserver"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimaal"
 
@@ -4845,50 +6850,6 @@ msgstr "Afsluiten"
 #~ "niet verwijderd kunnen worden:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Je hebt geen rootpartitie (/) gedefinieerd. Deze is echter vereist om "
-#~ "verder te kunnen gaan met de installatie van %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Je rootpartitie is kleiner dan 250 megabytes, wat gewoonlijk te klein is "
-#~ "om %s te kunnen installeren."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Dit platform vereist /boot op een aparte partitie of logische volume. Als "
-#~ "je geen /boot-volume wilt, moet je / op een specifieke niet-LVM partitie "
-#~ "plaatsen."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Je %(mount)s-partitie is kleiner dan %(size)s megabyte, wat kleiner is "
-#~ "dan aanbevolen wordt voor een normale %(productName)s installatie."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Je %(mount)s-partitie is te klein voor het formatteren als %(format)s "
-#~ "(toegestane grootte loopt van %(minSize)d MB tot %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Je %(mount)s-partitie is te groot voor het formatteren als %(format)s "
-#~ "(toegestane grootte loopt van %(minSize)d MB tot %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4905,57 +6866,6 @@ msgstr "Afsluiten"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "je hebt geen bootlader-stage1-doelapparaat aangemaakt"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Je hebt geen opstartpartitie aangemaakt."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Je op BIOS-gebaseerd systeem heeft een speciale partitie nodig om op te "
-#~ "starten met het nieuwe schijflabelformaat (GPT) van %s. Om verder te gaan "
-#~ "moet je een 1 MB 'BIOS Boot' type-partitie aanmaken."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Je hebt geen swappartitie opgegeven.  %(requiredMem)s MB geheugen is "
-#~ "vereist om de installatie voort te zetten zonder een swappartitie, maar "
-#~ "je hebt slechts %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Je hebt geen swappartitie opgegeven.  Hoewel dit niet in alle gevallen "
-#~ "strikt noodzakelijk is, verhoogt het in het algemeen wel de performance "
-#~ "voor de meeste installaties."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Tenminste een van de swapapparaten heeft geen UUID, wat gebruikelijk is "
-#~ "voor swapruimte aangemaakt met oudere versies van mkswap.  Naar deze "
-#~ "apparaten wordt verwezen met een apparaatpad in /etc/fstab, wat niet "
-#~ "ideaal is omdat apparaatpaden door diverse oorzaken kunnen veranderen."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Dit koppelpunt is ongeldig.  De %s map moet zich op het / bestandssysteem "
-#~ "bevinden."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Het koppelpunt %s moet zich op een linux-bestandssysteem bevinden."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux op %s"
 
@@ -4965,11 +6875,6 @@ msgstr "Afsluiten"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s voor %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD-apparaat formatteren"
-#~ msgstr[1] "DASD-apparaten formatteren"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Maak %d DASD-apparaat klaar voor gebruik met Linux..."
@@ -5246,9 +7151,6 @@ msgstr "Afsluiten"
 #~ msgid "Error setting root password"
 #~ msgstr "Fout bij instellen van rootwachtwoord"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Je moet een wachtwoord aanbieden en bevestigen"
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Verwijder pakketten"
 
@@ -5282,24 +7184,12 @@ msgstr "Afsluiten"
 #~ msgid "%s of %s"
 #~ msgstr "%s van %s"
 
-#~ msgid "Region:"
-#~ msgstr "Regio:"
-
-#~ msgid "City:"
-#~ msgstr "Stad:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-uurs"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Kies je add-ons"
 
@@ -5390,9 +7280,6 @@ msgstr "Afsluiten"
 #~ msgid "configureButton"
 #~ msgstr "Configureerknop"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Voltooi partitioneren"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "CONFIGUREREN VOLUMEGROEP"
 
diff --git a/anaconda/po/nso.po b/anaconda/po/nso.po
index c41491a..b4e6eb2 100644
--- a/anaconda/po/nso.po
+++ b/anaconda/po/nso.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,208 +19,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Thoma VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Diriša mokgwa wa sengwalwa"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Go Lokile"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -229,85 +462,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -316,7 +841,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -330,8 +860,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Phološa"
 
@@ -369,28 +899,22 @@ msgstr "Tshepedišo yeo e Phološwago"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Go Lokile"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Etšwa"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -403,7 +927,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -412,28 +936,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mokgwa wa go Phološa"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Tshepedišo ya gago e kgobelantšwe ka tlase ga tšhupetšo ya %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Karolo ya gago ya modu e ka tlase ga di-megapaete tše 250 tšeo ka mo go "
+"tlwaelegilego e lego tše nyenyane kudu gore o ka tsenya %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Ga se wa hlalosa karolo ya modu (/), yeo e nyakegago bakeng sa go tsenya %s "
+"gore o tšwele pele."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Karolo ya gago ya modu e ka tlase ga di-megapaete tše 250 tšeo ka mo go "
+"tlwaelegilego e lego tše nyenyane kudu gore o ka tsenya %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Ga se wa laetša karolo ya go ananya.  Gaešita le ge e sa nyakege ka go mo go "
+"tiilego mabakeng ka moka, e tla kaonafatša go šoma ka tsela e bonagalago "
+"bakeng sa go tsenya go gontši."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -525,84 +1229,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Tsenya Tshepedišong"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Tsenya Tshepedišong"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "E ka se be le potšišo ka mokgwa wa taelo!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Phošo"
 
@@ -626,31 +1475,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -666,447 +1517,522 @@ msgstr ""
 "dire go tsenya ga diswantšho goba o tšwele pele le go tsenya ga mokgwa wa "
 "sengwalwa?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr ""
 "Lentšu-phetišo le swanetše go ba bonyenyane ditlhaka tše tshelela ka "
 "botelele."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr ""
+"Lentšu-phetišo le swanetše go ba bonyenyane ditlhaka tše tshelela ka "
+"botelele."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Thoma VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Tsenya Tshepedišong"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Temošo"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1121,580 +2047,404 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1721,277 +2471,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1999,14 +2772,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2015,128 +2788,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Go Lokile"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2147,68 +2940,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2216,945 +3104,1348 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Tšwela pele"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Go Lokile"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Diriša mokgwa wa sengwalwa"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Sedirišwa sa RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Oketša"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Tšwela pele"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Tšwela pele"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Tšwela pele"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Kgokagantšwe!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Temošo"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Oketša"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Go Lokile"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Oketša"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Go Lokile"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Sedirišwa sa RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Oketša"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3162,645 +4453,1008 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 "Ke leleme lefe leo o tla ratago go le diriša nakong ya mosepelo wo wa go "
 "tsenya?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Tšwela pele"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Se se nago selo"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Sedirišwa sa RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Oketša"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Sedirišwa sa RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Sedirišwa sa RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Sedirišwa sa RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Go Lokile"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Go Lokile"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Sedirišwa sa RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Se se nago selo"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Sedirišwa sa RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Go Lokile"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Go Lokile"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Tsenya Tshepedišong"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Thomo_loša"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3814,40 +5468,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3856,60 +5511,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Phošo"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "E ka se be le potšišo ka mokgwa wa taelo!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Sedirišwa sa RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Phethilwe"
 
@@ -3927,9 +5589,6 @@ msgstr ""
 #~ msgstr[0] "Paete e %s"
 #~ msgstr[1] "Paete e %s"
 
-#~ msgid "Re_boot"
-#~ msgstr "Thomo_loša"
-
 #~ msgid "_Retry"
 #~ msgstr "_Leka gape"
 
@@ -3948,29 +5607,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "O ka se kgone go phumola karolo ya DASD yeo e bopilwego ya LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Ga se wa hlalosa karolo ya modu (/), yeo e nyakegago bakeng sa go tsenya "
-#~ "%s gore o tšwele pele."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Karolo ya gago ya modu e ka tlase ga di-megapaete tše 250 tšeo ka mo go "
-#~ "tlwaelegilego e lego tše nyenyane kudu gore o ka tsenya %s."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Ga se wa laetša karolo ya go ananya.  Gaešita le ge e sa nyakege ka go mo "
-#~ "go tiilego mabakeng ka moka, e tla kaonafatša go šoma ka tsela e "
-#~ "bonagalago bakeng sa go tsenya go gontši."
-
 #~ msgid "Back"
 #~ msgstr "Morago"
 
diff --git a/anaconda/po/or.po b/anaconda/po/or.po
index c26a520..3db9443 100644
--- a/anaconda/po/or.po
+++ b/anaconda/po/or.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/"
@@ -20,211 +20,445 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC କୁ ପ୍ରାରମ୍ଭ କରନ୍ତୁ"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "ପାଠ୍ଯ ଧାରାକୁ ବ୍ଯବହାର କରନ୍ତୁ"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ପ୍ରାକ-ସ୍ଥାପନ ସ୍କ୍ରିପ୍ଟଗୁଡ଼ିକୁ ଚଳାଉଛି"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ଆରମ୍ଭକରୁଅଛି"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "ସ୍ଥାପନ ପରବର୍ତ୍ତୀ ବିନ୍ଯାସକୁ ପରିବେଷଣ କରୁଅଛି"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -236,87 +470,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ପ୍ରାକ-ସ୍ଥାପନ ସ୍କ୍ରିପ୍ଟଗୁଡ଼ିକୁ ଚଳାଉଛି"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ଆଧାରନାମଟି 255 କିମ୍ବା ତଦନିମ୍ନ ଅକ୍ଷର ବିଶିଷ୍ଟ ହୋଇଥିବା ଉଚିତ."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"ଆଧାରନାମଟି 'a-z', 'A-Z' କିମ୍ବା '0-9' ପରିସର ମଧ୍ଯରେ ଥିବା ଗୋଟିଏ ବୈଧ ଅକ୍ଷର ସହିତ ପ୍ରାରମ୍ଭ "
-"ହେବା ଉଚିତ"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -325,7 +849,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s ସ୍ଥାପନ"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "ତନ୍ତ୍ରକୁ ବିସ୍ଥାପିତ କରିବା ପାଇଁ %s କୁ ଚଲାନ୍ତୁ ଯେତେବେଳେ ଆପଣଙ୍କ କାର୍ଯ୍ୟ ସମାପ୍ତ ହେବ।"
@@ -339,8 +868,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "ନିଷ୍ପାଦନ କରିବା ପାଇଁ /bin/shକୁ ଖୋଜିବାରେ ଅସମର୍ଥ!  ସେଲ ଆରମ୍ଭ କରୁନାହିଁ"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "ଉଦ୍ଧାର କରନ୍ତୁ"
 
@@ -378,21 +907,15 @@ msgstr "ଉଦ୍ଧାର କରିବା ପାଇଁ ତନ୍ତ୍ର"
 msgid "Which device holds the root partition of your installation?"
 msgstr "ଆପଣଙ୍କ ତନ୍ତ୍ରର ପ୍ରମୂଖ ଚାଳକ (ରୁଟ) ର ବିଭାଜନକୁ କେଉଁ ବିଭାଜନ ଧାରଣ କରିଅଛି?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ଠିକ ଅଛି"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "ଆପଣ ସେଲରୁ ବାହାରକୁ ଗଲେ ତନ୍ତ୍ରଟି ସ୍ବତଃ ପୁନର୍ଚାଳିତ ହେବ।"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -402,7 +925,7 @@ msgstr ""
 "କରିଛନ୍ତି। ଆପଣଙ୍କ ବିଭାଜନକୁ fsck ଏବଂ ମାଉଣ୍ଟ ସମୟରେ ଆବଶ୍ୟକ ଗୋଟିଏ ଆବରଣକୁ ପାଇବା ପାଇଁ ଫେରନ୍ତୁ "
 "ବଟନକୁ ଦବାନ୍ତୁ। %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -423,7 +946,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -432,29 +955,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "ଆପଣଙ୍କ ପାଖରେ କୌଣସି Linux ବିଭାଜନ ନାହିଁ।  ପୁନଃ ପ୍ରାରମ୍ଭ କରୁଅଛି।\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " ଆପଣ ସେଲରୁ ବାହାରକୁ ଗଲେ ତନ୍ତ୍ରଟି ସ୍ବତଃ ପୁନର୍ଚାଳିତ ହେବ।"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "ଉଦ୍ଧାର ଧାରା"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "ଆପଣଙ୍କ ପାଖରେ କୌଣସି Linux ବିଭାଜନ ନାହିଁ। ଗୋଟିଏ ସେଲ ପାଇବା ପାଇଁ ଫେରିବା ବଟନକୁ ଦବାନ୍ତୁ।%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "%s ଡିରେକ୍ଟୋରି ଅଧୀନରେ ଆପଣଙ୍କ ତନ୍ତ୍ରକୁ ମାଉଣ୍ଟ କରାଯାଇଛି।"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"ଆପଣଙ୍କର ରୁଟ ବିଭାଜନ ୨୫୦ ମେଗା-ବାଇଟରୁ କମ ଅଛି ଯାହାକି ସାଧାରଣତଃ %sର ସ୍ଥାପନ ପାଇଁ ବହୁତ କମ ଅଟେ।"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"ଆପଣ ଗୋଟିଏ ରୁଟ ବିଭାଜନ (/) କୁ ବ୍ଯାଖ୍ଯା କରି ନାହାଁନ୍ତି, ଯାହାକି %s ର ସ୍ଥାପନକୁ ଜାରି ରଖିବା ପାଇଁ "
+"ଆବଶ୍ୟକ।"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"ଆପଣଙ୍କର %(mount)s ବିଭାଜନଟି %(size)s ମେଗା-ବାଇଟରୁ କମ ଅଟେ ଯାହାକି ଗୋଟିଏ ସାଧାରଣ "
+"%(productName)s ସ୍ଥାପନ ପାଇଁ ପ୍ରତ୍ଯାଶିତ ଆକାରରୁ ଛୋଟ ଅଟେ।"
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "ଆପଣ ଗୋଟିଏ ବୁଟ ଯୋଗ୍ୟ ବିଭାଜନ ସୃଷ୍ଟି କରିନାହାନ୍ତି।"
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"ଆପଣ ଗୋଟିଏ swap ବିଭାଜନକୁ ନିର୍ଦ୍ଦିଷ୍ଟ କରି ନାହାଁନ୍ତି। ଯଦିଓ ଏହା ବିଧିବଦ୍ଧ ଭାବରେ ସମସ୍ତ ସ୍ଥିତିରେ ଏହା "
+"ଆବଶ୍ୟକ ନୁହେଁ, ତଥାପି ଏହା ଅଧିକାଂଶ ସ୍ଥାପନର ଉତ୍ପାଦନ ଉଲ୍ଲେଖଯୋଗ୍ଯ ଭାବରେ ବ୍ରୁଦ୍ଧି କରାଇଥାଏ>"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "ଏହି ମାଉଣ୍ଟ ବିନ୍ଦୁଟି ଅବୈଧ ଅଟେ। %s ଡିରେକ୍ଟୋରିଟି / ଫାଇଲ ତନ୍ତ୍ରରେ ଥିବା ଉଚିତ।"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s ମାଉଣ୍ଟ ବିନ୍ଦୁଟି ନିଶ୍ଚିତ ଭାବରେ ଗୋଟିଏ linux ଫାଇଲତନ୍ତ୍ରରେ ଥିବା ଉଚିତ।"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -567,84 +1268,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ସ୍ଥାପନ ଉତ୍ସରୁ ବିନିମୟ ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "ପ୍ଯାକେଜ ସ୍ଥାପନ କରିବା ସମୟରେ ତ୍ରୁଟି"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "ନିମ୍ନଲିଖିତ ଫାଇଲ ତନ୍ତ୍ର ରେ ଆପଣ ଅଧିକ ସ୍ଥାନ ଆବଶ୍ୟକ କରିବେ:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ସ୍ଥାପନ ଉତ୍ସରୁ ବିନିମୟ ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "ପ୍ଯାକେଜ ସ୍ଥାପନ କରିବା ସମୟରେ ତ୍ରୁଟି"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ପଶ୍ଚାତ ସ୍ଥାପନ"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ସ୍ଥାପନ କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ପଶ୍ଚାତ ସ୍ଥାପନ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "ନିର୍ଦ୍ଦେଶ ଧାରାରେ କୌଣସି ପ୍ରଶ୍ନ ରହି ପାରିବ ନାହିଁ!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ତୃଟି"
 
@@ -668,31 +1517,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -707,452 +1558,523 @@ msgstr ""
 "କରିବା ପାଇଁ VNC ପ୍ରାରମ୍ଭ କରି ଗୋଟିଏ ଆଲେଖୀକ ଅନ୍ତରାପୃଷ୍ଠରେ ସ୍ଥାପନ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କିମ୍ବା "
 "ଗୋଟିଏ ପାଠ୍ଯ ଧାରାରେ ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ଜାରି ରଖିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଅତିକମରେ ୬ ଅକ୍ଷର ବିଶିଷ୍ଟ ହେବା ଉଚିତ।"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଅତିକମରେ ୬ ଅକ୍ଷର ବିଶିଷ୍ଟ ହେବା ଉଚିତ।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ଫାଇଲତନ୍ତ୍ର ବିନ୍ୟାସରେ ଗୋଟିଏ ପ୍ରକାର ଅନୁପସ୍ଥିତ ଅଛି"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ସ୍ଥାପନ ପ୍ରକ୍ରିୟାକୁ ପ୍ରାରମ୍ଭ କରୁଅଛି"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "ଉନ୍ନୟନ ପରବର୍ତ୍ତୀ ବିନ୍ଯାସ କୁ ପରିବେଷଣ କରୁଅଛି"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC କୁ ପ୍ରାରମ୍ଭ କରନ୍ତୁ"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ସ୍ଥାପନ ପ୍ରକ୍ରିୟା"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ସ୍ଥାପନ ଉତ୍ସରୁ ବିନିମୟ ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "ପ୍ଯାକେଜ ସ୍ଥାପନ କରିବା ସମୟରେ ତ୍ରୁଟି"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot ଧାରଣ କରିଥିବା ଉପକରଣକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "ସଫଟୱେର ବିକାଶ"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ଚେତାବନୀ"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1168,580 +2090,405 @@ msgstr "ପ୍ରଗତି ପଥେ"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s ସ୍ଥାପନ"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "ସଫଟୱେର ବିକାଶ"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1768,279 +2515,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ଠିକଣା"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ଠିକଣା"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "ସଫଟୱେର ବିକାଶ"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "ସଂଗ୍ରହାଳୟକୁ ବିନ୍ୟାସ କରିବାରେ ତ୍ରୁଟି"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "ସଂଗ୍ରହାଳୟକୁ ବିନ୍ୟାସ କରିବାରେ ତ୍ରୁଟି"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2048,14 +2819,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2064,128 +2835,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ଉପକରଣକୁ ସଜାଡ଼ୁଅଛି"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ଠିକ ଅଛି"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2196,68 +2988,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s ମାଉଣ୍ଟ ବିନ୍ଦୁଟି ନିଶ୍ଚିତ ଭାବରେ ଗୋଟିଏ linux ଫାଇଲତନ୍ତ୍ରରେ ଥିବା ଉଚିତ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s ଉପରେ %(type)s କୁ ନିର୍ମାଣ କରୁଅଛି"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2265,951 +3154,1372 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "ଆଗକୁ ବଢନ୍ତୁ (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ଠିକ ଅଛି"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ୱେବ ସର୍ଭର"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "କୌଣସି ନେଟୱାର୍କ ଉପକରଣ ଉପଲବ୍ଧ ନାହିଁ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ପାଠ୍ଯ ଧାରାକୁ ବ୍ଯବହାର କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "କ୍ଷମତା"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID ଉପକରଣ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "କୌଣସି ନେଟୱାର୍କ ଉପକରଣ ଉପଲବ୍ଧ ନାହିଁ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ଚାଳକ ନାମ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "ସଂଯୋଗ ହୋଇଗଲା"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI ତନ୍ତ୍ର ବିଭାଜନ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ସ୍ଥାପକକୁ ବନ୍ଦ କରନ୍ତୁ (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI ତନ୍ତ୍ର ବିଭାଜନ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "ସଂଗୁପ୍ତ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI ତନ୍ତ୍ର ବିଭାଜନ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID ଉପକରଣ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ପ୍ରୟୋଗାତ୍ମକ ତ୍ରୁଟି।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ପ୍ରୟୋଗାତ୍ମକ ତ୍ରୁଟି।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3217,649 +4527,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ଏହି ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ସମୟରେ ଆପଣ କେଉଁ ଭାଷା ର ପ୍ରୟୋଗ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "ଆଗକୁ ବଢନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ମୁକ୍ତ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID ଉପକରଣ"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "ସଂଗୁପ୍ତ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "କ୍ଷମତା"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID ଉପକରଣ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID ଉପକରଣ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "ସଂଗୁପ୍ତ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID ଉପକରଣ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 ଠିକଣା"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "iSCSI ପ୍ରାରମ୍ଭକର୍ତ୍ତାଙ୍କ ନାମ ପ୍ରଦାନ କରିବା ଉଚିତ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "ଚାଳକ ନାମ"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID ଉପକରଣ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ମୁକ୍ତ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "କ୍ଷମତା"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "ଚାଳକ ନାମ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID ଉପକରଣ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "ସଂଗୁପ୍ତ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ଉପକରଣକୁ ସଜାଡ଼ୁଅଛି"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ଠିକ ଅଛି"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI ତନ୍ତ୍ର ବିଭାଜନ"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ପଶ୍ଚାତ ସ୍ଥାପନ"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ସ୍ଥାପନ କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "ଉନ୍ନୟନ ପରବର୍ତ୍ତୀ ବିନ୍ଯାସ କୁ ପରିବେଷଣ କରୁଅଛି"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "ପୁନର୍ଚାଳନ କରନ୍ତୁ (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3873,16 +5574,16 @@ msgstr "ସ୍ଥାପନ କରନ୍ତୁ"
 msgid "Install the live CD to your hard disk"
 msgstr "ଆପଣଙ୍କ ହାର୍ଡ ଡିସ୍କରେ ପ୍ରତ୍ଯେକ୍ଷ ସି.ଡି.କୁ ସ୍ଥାପନ କରନ୍ତୁ"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "ହାର୍ଡ ଡ୍ରାଇଭରେ ସ୍ଥାପନ ଆରମ୍ଭ କରନ୍ତୁ"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3890,26 +5591,27 @@ msgid ""
 msgstr ""
 "%s ସ୍ଥାପନ କରିବା ପାଇଁ %s MB ସ୍ମୃତିସ୍ଥାନ ଆବଶ୍ୟକ କରିଥାଏ, କିନ୍ତୁ ଏହି ତନ୍ତ୍ରରେ କେବଳ %s MB ଅଛି।\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "ସ୍ଥାପନ କରିବା ପାଇଁ %s ଆଲେଖିକ ସ୍ଥାପକ %s MB ସ୍ମୃତିସ୍ଥାନ ଆବଶ୍ୟକ କରିଥାଏ, କିନ୍ତୁ ଏହି ତନ୍ତ୍ରରେ କେବଳ "
 "%s MB ଅଛି।"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "ଯଥେଷ୍ଟ RAM ନାହିଁ"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3923,24 +5625,24 @@ msgstr ""
 "\n"
 " ମୂଖ୍ୟ ଚାଳକ ଟର୍ମିନାଲରୁ।"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "ପାଠ୍ଯ ଧାରାକୁ ଆରମ୍ଭ କରୁଅଛି।"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ତୃଟି"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ପ୍ରାଚଳ ସେଟ ହୋଇନାହିଁ। ଅକ୍ଷରାବସ୍ଥାକୁ ଆରମ୍ଭ କରୁଅଛି।"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ଆଲେଖୀକ ସ୍ଥାପନ ଉପଲବ୍ଧ ନାହିଁ। ଅକ୍ଷରାବସ୍ଥାକୁ ଆରମ୍ଭ କରୁଅଛି।"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3951,36 +5653,57 @@ msgstr ""
 "ବିନ୍ୟାସକୁ ଉଲ୍ଲେଖ କରିବା ପାଇଁ ଅନୁମତି ଦେଇନଥାଏ। ଆପଣ ଏହା ପରିବର୍ତ୍ତେ VNC ଧାରାକୁ ବ୍ୟବହାର କରିବା "
 "ପାଇଁ ପସନ୍ଦ କରିବେ କି?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "ଆଧାରନାମଟି 'a-z', 'A-Z' କିମ୍ବା '0-9' ପରିସର ମଧ୍ଯରେ ଥିବା ଗୋଟିଏ ବୈଧ ଅକ୍ଷର ସହିତ ପ୍ରାରମ୍ଭ "
+#~ "ହେବା ଉଚିତ"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "ନିମ୍ନଲିଖିତ ଫାଇଲ ତନ୍ତ୍ର ରେ ଆପଣ ଅଧିକ ସ୍ଥାନ ଆବଶ୍ୟକ କରିବେ:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "ନିର୍ଦ୍ଦେଶ ଧାରାରେ କୌଣସି ପ୍ରଶ୍ନ ରହି ପାରିବ ନାହିଁ!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "ଚାଳକ ନାମ"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID ଉପକରଣ"
+
 #~ msgid "Completed"
 #~ msgstr "ସମାପ୍ତ"
 
@@ -4013,9 +5736,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "ସ୍ଥାପକକୁ ବନ୍ଦ କରନ୍ତୁ"
 
-#~ msgid "_Exit installer"
-#~ msgstr "ସ୍ଥାପକକୁ ବନ୍ଦ କରନ୍ତୁ (_E)"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4075,9 +5795,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "ପରିଚୟ ବ୍ୟବହାର କରି, ବିନ୍ୟାସରେ ସଂଗ୍ରହାଳୟ %r ର ନାମ ନାହିଁ"
 
-#~ msgid "No Network Available"
-#~ msgstr "କୌଣସି ନେଟୱାର୍କ ଉପକରଣ ଉପଲବ୍ଧ ନାହିଁ"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4085,9 +5802,6 @@ msgstr ""
 #~ "ଆପଣଙ୍କ ସଫ୍ଟୱେର ସଂଗ୍ରହାଳୟ ମଧ୍ଯରୁ କିଛି ନେଟୱର୍କିଙ୍କ ଆବଶ୍ୟକ କରେ, କିନ୍ତୁ ସେଠାରେ ଆପଣଙ୍କ ତନ୍ତ୍ରରେ "
 #~ "ନେଟୱର୍କକୁ ସକ୍ରିୟ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଥିଲା।"
 
-#~ msgid "Re_boot"
-#~ msgstr "ପୁନର୍ଚାଳନ କରନ୍ତୁ (_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "ବାହାର କରନ୍ତୁ (_E)"
 
@@ -4235,9 +5949,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "ଆଲେଖୀକ ଡେସ୍କଟପ"
 
-#~ msgid "Web Server"
-#~ msgstr "ୱେବ ସର୍ଭର"
-
 #~ msgid "Minimal"
 #~ msgstr "ସର୍ବନିମ୍ନ"
 
@@ -4275,27 +5986,6 @@ msgstr ""
 #~ "କରିହେବ ନାହିଁ:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "ଆପଣ ଗୋଟିଏ ରୁଟ ବିଭାଜନ (/) କୁ ବ୍ଯାଖ୍ଯା କରି ନାହାଁନ୍ତି, ଯାହାକି %s ର ସ୍ଥାପନକୁ ଜାରି ରଖିବା ପାଇଁ "
-#~ "ଆବଶ୍ୟକ।"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "ଆପଣଙ୍କର ରୁଟ ବିଭାଜନ ୨୫୦ ମେଗା-ବାଇଟରୁ କମ ଅଛି ଯାହାକି ସାଧାରଣତଃ %sର ସ୍ଥାପନ ପାଇଁ ବହୁତ କମ "
-#~ "ଅଟେ।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "ଆପଣଙ୍କର %(mount)s ବିଭାଜନଟି %(size)s ମେଗା-ବାଇଟରୁ କମ ଅଟେ ଯାହାକି ଗୋଟିଏ ସାଧାରଣ "
-#~ "%(productName)s ସ୍ଥାପନ ପାଇଁ ପ୍ରତ୍ଯାଶିତ ଆକାରରୁ ଛୋଟ ଅଟେ।"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4309,30 +5999,6 @@ msgstr ""
 #~ "ଅଗ୍ନିକବଚ ଉପକରଣରେ ସ୍ଥାପନ କରୁଅଛି। ଏହା ଗୋଟିଏ କାର୍ଯ୍ଯକ୍ଷମ ତନ୍ତ୍ର ଉତ୍ପାଦନ କରିପାରେ କିମ୍ବା କରି "
 #~ "ନପାରେ।"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "ଆପଣ ଗୋଟିଏ ବୁଟ ଯୋଗ୍ୟ ବିଭାଜନ ସୃଷ୍ଟି କରିନାହାନ୍ତି।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "ଆପଣ ଗୋଟିଏ swap ବିଭାଜନକୁ ନିର୍ଦ୍ଦିଷ୍ଟ କରି ନାହାଁନ୍ତି। ଯଦିଓ ଏହା ବିଧିବଦ୍ଧ ଭାବରେ ସମସ୍ତ ସ୍ଥିତିରେ ଏହା "
-#~ "ଆବଶ୍ୟକ ନୁହେଁ, ତଥାପି ଏହା ଅଧିକାଂଶ ସ୍ଥାପନର ଉତ୍ପାଦନ ଉଲ୍ଲେଖଯୋଗ୍ଯ ଭାବରେ ବ୍ରୁଦ୍ଧି କରାଇଥାଏ>"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "ଏହି ମାଉଣ୍ଟ ବିନ୍ଦୁଟି ଅବୈଧ ଅଟେ। %s ଡିରେକ୍ଟୋରିଟି / ଫାଇଲ ତନ୍ତ୍ରରେ ଥିବା ଉଚିତ।"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s ମାଉଣ୍ଟ ବିନ୍ଦୁଟି ନିଶ୍ଚିତ ଭାବରେ ଗୋଟିଏ linux ଫାଇଲତନ୍ତ୍ରରେ ଥିବା ଉଚିତ।"
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ଉପକରଣକୁ ସଜାଡ଼ୁଅଛି"
-#~ msgstr[1] "DASD ଉପକରଣଗୁଡ଼ିକୁ ସଜାଡ଼ୁଅଛି"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux ସହିତ ବ୍ୟବହାର କରିବା ପାଇଁ %d DASD ଉପକରଣକୁ ପ୍ରସ୍ତୁତ କରୁଅଛି..."
diff --git a/anaconda/po/pa.po b/anaconda/po/pa.po
index 979cb63..524e1f4 100644
--- a/anaconda/po/pa.po
+++ b/anaconda/po/pa.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
@@ -27,11 +27,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ਫਾਇਲ-ਸਿਸਟਮ"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -39,206 +39,473 @@ msgid ""
 msgstr ""
 "RAID ਸੈੱਟ ਦਾ ਰੈੱਡ ਲੈਵਲ ਹੇਠਲਿਆਂ ਵਿੱਚੋਂ ਕੋਈ ਇੱਕ ਹੋਣਾ ਜਰੂਰੀ ਹੈ ਜਿਨਾਂ ਵਿੱਚ '%s' ਸ਼ਾਮਿਲ ਹੈ: %s।"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr "ਰੇਡ (RAID) ਸੈੱਟ, ਜੋ ਕਿ '%s' ਨੂੰ ਅੱਗੇ ਦਿੱਤੇ ਮੇਟਾਡਾਟਾ ਵਰਜਨ ਵਿੱਚੋਂ ਇੱਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ: %s।"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "'%s' ਰੱਖਣ ਵਾਲੇ ਰੇਡ (RAID) ਸੈੱਟ ਲਈ ਅੱਗੇ ਦਿੱਤੇ ਜੰਤਰ ਕਿਸਮਾਂ ਵਿੱਚੋਂ ਇੱਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ: %s।"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s ਦਾ ਅੱਗੇ ਦਿੱਤਾ ਡਿਸਕ-ਲੇਬਕ ਕਿਸਮਾਂ ਵਿੱਚੋਂ ਇੱਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ: %s।"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s %s ਕਿਸਮ ਦਾ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s ਨੂੰ %s ਵਿੱਚੋਂ ਇੱਕ ਉੱਤੇ ਮਾਊਂਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s ਦਾ ਆਕਾਰ %d ਅਤੇ %d MB ਦੇ ਵਿੱਚ ਹੀ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s %dMB ਤੋਂ ਛੋਟਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s %dMB ਤੋਂ ਵੱਡਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s ਡਿਸਕ ਦੇ ਪਹਿਲੇ %dMB ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s ਪ੍ਰਾਇਮਰੀ ਪਾਰਟੀਸ਼ਨ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ਇੰਕ੍ਰਿਪਟ ਬਲਾਕ ਜੰਤਰ ਉੱਤੇ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ਦੀ %s ਕਿਸਮ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s ਉੱਤੇ grub2 ਲਈ core.img ਰੱਖਣ ਲਈ ਲੋੜੀਂਦੀ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ, ਜਦੋਂ %s ਫਾਇਲਸਿਸਟਮ ਨੂੰ %s ਉੱਤੇ "
 "ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC ਸ਼ੁਰੂ ਕਰੋ"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "ਟੈਕਸਟ ਮੋਡ ਵਰਤੋਂ"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "%s: ਤੁਸੀਂ ਹਲਕਾ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ। ਇਸੇ ਨੂੰ ਵਰਤਣ ਲਈ ਮੁੜ ਮੁਕੰਮਲ ਨੂੰ ਦਬਾਉ।"
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "%s: ਤੁਸੀਂ ਹਲਕਾ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ। ਇਸੇ ਨੂੰ ਵਰਤਣ ਲਈ ਮੁੜ ਮੁਕੰਮਲ ਨੂੰ ਦਬਾਉ।"
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "ਹਲਕਾ"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "ਠੀਕ-ਠਾਕ"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "ਚੰਗਾ"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "ਮਜ਼ਬੂਤ"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "ਹਾਂ(_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "ਨਹੀਂ(_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"ਇੰਸਟਾਲੇਸ਼ਨ ਰਿਪੋਜ਼ਟਰੀ ਸੈਟ ਅੱਪ ਕਰਨ ਦੌਰਾਨ ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਆਈ:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਨਹੀਂ ਰਹਿ ਸਕਦੀ ਹੈ।"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"ਇੰਸਟਾਲੇਸ਼ਨ ਰਿਪੋਜ਼ਟਰੀ ਸੈਟ ਅੱਪ ਕਰਨ ਦੌਰਾਨ ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਆਈ:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਨਹੀਂ ਰਹਿ ਸਕਦੀ ਹੈ।"
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸਾਫਟਵੇਅਰ ਵਿੱਚ ਗਲਤੀਆਂ ਹਨ।  ਇਹ ਤੁਹਾਡੇ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਨਾਲ ਗਲਤੀਆਂ\n"
+"ਦੇ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।  ਤੁਸੀਂ ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿੱਚੋਂ ਇਹਨਾਂ ਪੈਕੇਜਾਂ ਨੂੰ ਹਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।\n"
+"ਆਪਣਾ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਬਦਲੋ ਜਾਂ ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ।"
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"ਇੰਸਟਾਲੇਸ਼ਨ ਰੁਕ ਗਈ ਸੀ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਹਾਰਡਵੇਅਰ ਨਾਲ ਸਮੱਸਿਆ ਜਾਪਦੀ ਹੈ। ਸਹੀਂ ਗਲਤੀ ਸੁਨੇਹਾ ਹੈ:\n"
+"\n"
+" %s।\n"
+"\n"
+" ਇੰਸਟਾਲਰ ਹੁਣ ਬੰਦ ਹੋਵੇਗਾ।"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"ਇੰਸਟਾਲੇਸ਼ਨ ਰੁਕ ਗਈ ਸੀ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਹਾਰਡਵੇਅਰ ਨਾਲ ਸਮੱਸਿਆ ਜਾਪਦੀ ਹੈ। ਸਹੀਂ ਗਲਤੀ ਸੁਨੇਹਾ ਹੈ:\n"
+"\n"
+" %s।\n"
+"\n"
+" ਇੰਸਟਾਲਰ ਹੁਣ ਬੰਦ ਹੋਵੇਗਾ।"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "ਹਾਰਡਵੇਅਰ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"ਇੰਸਟਾਲੇਸ਼ਨ ਰੁਕ ਗਈ ਸੀ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਹਾਰਡਵੇਅਰ ਨਾਲ ਸਮੱਸਿਆ ਜਾਪਦੀ ਹੈ। ਸਹੀਂ ਗਲਤੀ ਸੁਨੇਹਾ ਹੈ:\n"
+"\n"
+" %s।\n"
+"\n"
+" ਇੰਸਟਾਲਰ ਹੁਣ ਬੰਦ ਹੋਵੇਗਾ।"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "ਇੰਸਟਾਲ ਹੋਏ ਸਿਸਟਮ ਦੀ ਸੰਰਚਨਾ"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਲਿਖਣਾ"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "ਯੂਜ਼ਰ ਬਣਾ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "ਇੰਸਟਾਲ ਹੋਏ ਸਿਸਟਮ ਦੀ ਸੰਰਚਨਾ"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ਪੋਸਟ-ਇੰਸਟਾਲੇਸ਼ਨ ਸਕਰਿਪਟਾਂ ਚੱਲ ਰਹੀਆਂ ਹਨ"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਸੈੱਟਅੱਪ ਹੋ ਰਿਹਾ ਹੈ..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "ਬੂਟ-ਲੋਡਰ ਇੰਸਟਾਲ ਹੋ ਰਿਹਾ ਹੈ"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "ਇੰਸਟਾਲ ਕਰਨ ਦੇ ਬਾਅਦ ਸੈਟਅੱਪ ਟਾਸਕ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "ਬੂਟ-ਲੋਡਰ ਇੰਸਟਾਲ ਹੋ ਰਿਹਾ ਹੈ"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow ਸਰਟੀਫਿਕੇਟ %s ਲਈ ਨੈੱਟਵਰਕ ਚਾਹੀਦਾ ਹੈ।"
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -250,30 +517,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s ਗੈਰ-ਮੌਜੂਦ ਹੈ। ਫਾਇਰਵਾਲ ਸੈੱਟਅੱਪ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s ਗੈਰ-ਮੌਜੂਦ ਹੈ। ਫਾਇਰਵਾਲ ਸੈੱਟਅੱਪ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਲੇਬਲ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "ਦਿੱਤਾ ਨਾਂ %s ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ ਨਾਂ %s ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ। ਤਬਦੀਲੀ ਨਹੀਂ ਸੰਭਾਲ ਰਿਹਾ ਹੈ।"
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ਪੋਸਟ-ਇੰਸਟਾਲੇਸ਼ਨ ਸਕਰਿਪਟਾਂ ਚੱਲ ਰਹੀਆਂ ਹਨ"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "ਹੋਸਟ-ਨਾਂ ਕੋਈ ਨਹੀਂ ਜਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ।"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ਹੋਸਟ-ਨਾਂ 255  ਜਾਂ ਘੱਟ ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "ਹੋਸਟ-ਨਾਂ ਇਹਨਾਂ ਅੱਖਰਾ 'a-z' ਜਾਂ 'A-Z' ਜਾਂ '0-9' ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -281,55 +840,55 @@ msgid ""
 msgstr ""
 "ਮੇਜ਼ਬਾਨ-ਨਾਂ ਦੇ ਨਾਂ ਵਿੱਚ ਸਿਰਫ 'a-z', 'A-Z', '0-9', '-', ਜਾਂ '' ਅੱਖਰ ਹੀ ਵਰਤਣੇ ਚਾਹੀਦੇ ਹਨ।"
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "ਜੁਡ਼ ਰਿਹਾ ਹੈ..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "ਤਾਰ (%s) ਕੁਨੈਕਟ ਹੈ"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "ਬੇਤਾਰ %s ਨਾਲ ਕੁਨੈਕਟ ਹੈ"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "ਕੁਨੈਕਟ ਨਹੀਂ"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "ਕੋਈ ਨੈੱਟਵਰਕ ਜੰਤਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
@@ -338,7 +897,12 @@ msgstr "ਕੋਈ ਨੈੱਟਵਰਕ ਜੰਤਰ ਉਪਲੱਬਧ ਨਹ
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s INSTALLATION"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "ਨਵੀਂ %s %s ਇੰਸਟਾਲੇਸ਼ਨ"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "ਮੁਕੰਮਲ ਹੋਣ ਤੇ ਸਿਸਟਮ ਅਨ-ਮਾਊਂਟ ਕਰਨ ਲਈ %s ਚਲਾਓ।"
@@ -351,8 +915,8 @@ msgstr "ਜਦੋਂ ਵੀ ਸਮਾਪਤ ਹੋ ਗਿਆ ਤਾਂ ਸ਼ੈੱ
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "ਚਲਾਉਣ ਲਈ /bin/sh ਨੂੰ ਲੱਭ ਨਹੀਂ ਸਕਿਆ! ਸ਼ੈੱਲ ਚਾਲੂ ਨਹੀਂ ਕਰ ਰਿਹਾ"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "ਸੰਕਟਕਾਲੀਨ"
 
@@ -401,21 +965,15 @@ msgstr "ਸੰਕਟਕਾਲੀਨ ਲਈ ਸਿਸਟਮ"
 msgid "Which device holds the root partition of your installation?"
 msgstr "ਕਿਹਡ਼ਾ ਪਾਰਟੀਸ਼ਨ ਤੁਹਾਡੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੇ ਰੂਟ (root) ਪਾਰਟੀਸ਼ਨ ਰੱਖਦਾ ਹੈ?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ਠੀਕ"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "ਬਾਹਰ"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "ਸ਼ੈੱਲ ਤੋਂ ਬਾਹਰ ਆਉਣ ਸਮੇਂ ਸਿਸਟਮ ਮੁਡ਼ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ।"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -424,7 +982,7 @@ msgstr ""
 "ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਨਿਕਾਰਾ ਫਾਇਲ ਸਿਸਟਮ ਹੈ, ਜੋ ਤੁਸੀਂ ਮਾਊਂਟ ਨਹੀਂ ਕਰਨ ਲਈ ਚੁਣਿਆ। ਐਂਟਰ ਦਬਾਕੇ ਸ਼ੈੱਲ "
 "ਵਿੱਚ ਜਾਉ ਅਤੇ fsck ਨਾਲ ਆਪਣੇ ਪਾਰਟੀਸ਼ਨ ਮਾਊਂਟ ਕਰੋ।  %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -445,7 +1003,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -457,28 +1015,232 @@ msgstr ""
 "ਕੀਤਾ ਹੋਇਆ ਹੋ ਸਕਦਾ ਹੈ।\n"
 "ਸ਼ੈੱਲ ਉੱਤੇ ਜਾਣ ਲਈ <return> ਦੱਬੋ।"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਲੀਨਕਸ ਭਾਗ ਨਹੀਂ ਹੈ। ਮੁੜ-ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ।\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "ਸ਼ੈੱਲ ਤੋਂ ਬਾਹਰ ਆਉਣ ਸਮੇਂ ਸਿਸਟਮ ਮੁਡ਼ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ।"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "ਸੰਕਟਕਾਲੀਨ ਮੋਡ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਲੀਨਕਸ ਭਾਗ ਨਹੀਂ ਹੈ। ਸ਼ੈੱਲ ਤੇ ਜਾਣ ਲਈ ਐਂਟਰ ਦਬਾਓ।%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "ਤੁਹਾਡਾ ਸਿਸਟਮ %s ਡਾਇਰੈਕਟਰੀ ਦੇ ਅਧੀਨ ਮਾਊਂਟ ਹੈ।"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "ਸਟੈਂਡਰਡ ਪਾਰਟੀਸ਼ਨ"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "ਡਿਸਕ"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਸਵੈਪ ('swap') ਖੇਤਰ ਨੂੰ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਵਲੋਂ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਮੈਮੋਰੀ ਘੱਟ "
+"ਜਾਂਦੀ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ 'boot' ਖੇਤਰ ਉਹ ਖੇਤਰ ਹੈ, ਜਿੱਥੇ ਓਪਰੇਟਿੰਗ\n"
+"ਸਿਸਟਮ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਲੋੜੀਦੀਆਂ ਫਾਇਲਾਂ ਰੱਖੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਰੂਟ ('root') ਖੇਤਰ ਹੈ, ਜਿੱਥੇ ਮੁੱਢਲੀਆਂ ਸਿਸਟਮ ਫਾਇਲਾਂ\n"
+"ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ 'home' ਖੇਤਰ ਹੈ, ਜਿੱਥੇ ਤੁਹਾਡੇ ਨਿੱਜੀ ਡਾਟੇ ਨੂੰ\n"
+"ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS ਬੂਟ ਭਾਗ  BIOS ਹਾਰਡਵੇਅਰ ਉੱਤੇ GPT-ਭਾਗ ਵਾਲੀਆਂ ਡਿਸਕਾਂ ਤੋਂ ਬੂਟ ਕਰਨ ਨੂੰ ਯੋਗ ਕਰਨ ਲਈ ਲੋੜੀਦਾ "
+"ਹੈ।"
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PReP ਬੂਟ ਪਾਰਟੀਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਕਿਉਂਕਿ ਕੁਝ PPC ਪਲੇਟਫਾਰਮ ਉੱਤੇ ਬੂਟ ਸੰਰਚਨਾ ਦੇ ਭਾਗ ਵਜੋਂ ਚਾਹੀਦਾ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "ਤੁਸੀਂ ਰੂਟ (root) ਪਾਰਟੀਸ਼ਨ 250 ਮੈਗਾਬਾਈਟ ਤੋਂ ਘੱਟ ਹੈ, ਜੋ ਕਿ ਇੰਸਟਾਲ %s ਲਈ ਬਹੁਤ ਘੱਟ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"ਤੁਸੀਂ ਇੱਕ ਰੂਟ (root)ਪਾਰਟੀਸ਼ਨ (/) ਨਹੀਂ ਦਿੱਤਾ ਹੈ, ਜੋ ਕਿ %s ਦੀ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ "
+"ਜ਼ਰੂਰੀ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"ਇਹ ਪਲੇਟਫਾਰਮ ਲਈ /boot ਵਾਸਤੇ ਖਾਸ ਪਾਰਟੀਸ਼ਨ ਜਾਂ ਲਾਜ਼ੀਕਲ ਵਾਲੀਅਮ ਚਾਹੀਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ /boot "
+"ਵਾਲੀਅਮ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਤੁਹਾਨੂੰ / ਨੂੰ ਗ਼ੈਰ-LVM ਪਾਰਟੀਸ਼ਨ ਉੱਤੇ ਰੱਖਣਾ ਪਵੇਗਾ।"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"ਤੁਹਾਡਾ %(mount)s ਪਾਰਟੀਸ਼ਨ %(size)s ਮੈਗਾਬਾਈਟ ਤੋਂ ਘੱਟ ਹੈ, ਜੋ ਕਿ ਸਧਾਰਨ %(productName)s "
+"ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸਿਫ਼ਾਰਸ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"ਤੁਹਾਡਾ %(mount)s ਪਾਰਟੀਸ਼ਨ  %(format)s ਫਾਰਮੈਟ ਲਈ ਬਹੁਤ ਛੋਟਾ ਹੈ (ਮਨਜ਼ੂਰ ਆਕਾਰ  "
+"%(minSize)d MB ਤੋਂ %(maxSize)d MB ਹੈ)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"ਤੁਹਾਡਾ %(mount)s ਪਾਰਟੀਸ਼ਨ  %(format)s ਫਾਰਮੈਟ ਲਈ ਬਹੁਤ ਵੱਡਾ ਹੈ (ਮਨਜ਼ੂਰ ਆਕਾਰ  "
+"%(minSize)d MB ਤੋਂ %(maxSize)d MB ਹੈ)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "ਨਵਾਂ ਜੰਤਰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "ਤੁਸੀਂ ਬੂਟ ਭਾਗ ਨਹੀਂ ਬਣਾਇਆ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"ਤੁਹਾਡੇ BIOS-ਅਧਾਰਿਤ ਸਿਸਟਮ ਲਈ %s ਦੇ ਨਵੇਂ ਡਿਸਕ ਲੇਬਲ ਫਾਰਮੈਟ (GPT) ਨੂੰ ਬੂਟ ਕਰਨ ਲਈ ਖਾਸ "
+"ਪਾਰਟੀਸ਼ਨ ਦੀ ਲੋੜ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ, 1MB 'BIOS Boot' ਕਿਸਮ ਦਾ ਪਾਰਟੀਸ਼ਨ ਬਣਾਉ ਜੀ।"
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"ਤੁਸੀਂ ਸਵੈਪ (swap) ਪਾਰਟੀਸ਼ਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਸਵੈਪ ਪਾਰਟੀਸ਼ਨ ਦੇ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖਣ ਲਈ "
+"%(requiredMem)s MB ਦੀ ਮੈਮੋਰੀ ਚਾਹੀਦੀ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ %(installedMem)s MB ਹੀ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"ਤੁਸੀਂ ਇੱਕ ਸਵੈਪ ਪਾਰਟੀਸ਼ਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਭਾਵੇਂ ਕਿ ਇਹ ਹਰ ਹਾਲਤ ਵਿੱਚ ਕੋਈ ਜ਼ਰੂਰੀ ਨਹੀਂ ਹੈ, ਪਰ ਇਹ ਸਭ "
+"ਇੰਸਟਾਲੇਸ਼ਨ ਵਿੱਚ ਵਧੀਆ ਕਾਰਗੁਜ਼ਾਰੀ ਲਈ ਮਹੱਤਵਪੂਰਨ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"ਤੁਹਾਡੇ ਸਵੈਪ ਜੰਤਰਾਂ ਵਿੱਚੋਂ ਇੱਕ ਲਈ UUID ਨਹੀਂ ਹੈ, ਜੋ ਕਿ mkswap ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨਾਲ ਬਣਾਈ ਸਵੈਪ ਥਾਂ "
+"ਵਿੱਚ ਆਮ ਹੈ। ਇਹ ਜੰਤਰਾਂ ਨੂੰ /etc/fstab ਵਿੱਚ ਜੰਤਰ ਮਾਰਗ ਨਾਲ ਦਰਸਾਇਆ ਜਾਵੇਗਾ, ਜੋ ਕਿ ਠੀਕ ਨਹੀਂ "
+"ਹੈ, ਕਿਉਂਕਿ ਜੰਤਰ ਮਾਰਗ ਕਈ ਮਾਰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹਨ।"
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "ਇਹ ਮਾਊਂਟ ਪੁਆਂਇਟ ਗਲਤ ਹੈ।  %s ਡਾਇਰੈਕਟਰੀ / ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਹੋਣੀ ਜਰੂਰੀ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "ਮਾਊਂਟ ਪੁਆਇੰਟ %s ਲੀਨਕਸ ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਹੋਣਾ ਜਰੂਰੀ ਹੈ।"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "ਵਾਕ:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -589,87 +1351,239 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "ਦਿੱਤਾ ਗਿਆ VNC ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਨਹੀਂ ਸੀ।\n"
 "ਨਵਾਂ ਦਿਉ ਜੀ। ਬਿਨਾਂ ਪਾਸਵਰਡ ਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਖਾਲੀ ਛੱਡੋ।"
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "ਫੇਡੋਰਾ(_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ਇੰਸਟਾਲ ਸਰੋਤ ਸੈਟ ਅੱਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "...ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "ਕੋਈ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "ਸਾਫਟਵੇਅਰ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਸ਼ੁਰੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੇ ਫਾਇਲ ਸਿਸਟਮਾਂ ਉੱਤੇ ਹੋਰ ਥਾਂ ਲਈ ਹੈ:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਤੋਂ ਸੰਚਾਰ ਲਈ ਤਿਆਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "...ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "...ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਜਾਂਚੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "ਡਿਫਾਲਟ ਨਾਂ"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "ਅਨੁਵਾਦ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "ਅਨੁਵਾਦ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "ਸਾਫਟਵੇਅਰ"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "ਸਿਸਟਮ"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "ਯੂਜ਼ਰ ਸੈਟਿੰਗ"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr "ਇੱਥੇ ਅਸੀਂ ਦਰਸਾਉਂਦੇ ਹਾਂ ਕਿ ਮੌਜੂਦਾ ਸਾਫਟਵੇਅਰ ਚੋਣ %s ਲਈ ਕਿੰਨੀ ਥਾਂ ਚਾਹੀਦੀ ਹੈ।"
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਹੱਬ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "ਆਟੋਮੈਟਿਕ ਇੰਸਟਾਲ ਕਰਨਾ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "ਕਮਾਂਡ ਲਾਈਨ ਮੋਡ ਵਿੱਚ ਸਵਾਲ ਨਹੀਂ ਹੋ ਸਕਦਾ!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "ਉੱਤੇ ਵਿੱਚੋਂ ਆਪਣੀ ਚੋਣ ਕਰੋ ਜੀ [ਬੰਦ ਕਰਨ ਲਈ 'q'| ਜਾਰੀ ਰੱਖਣ ਲਈ 'c']"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਸਾਰੇ ਕੰਮ ਪੂਰੇ ਕਰੋ ਜੀ"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "ਡਿਫਾਲਟ ਹੱਬ ਨਾਂ।"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਸਾਰੇ ਕੰਮ ਪੂਰੇ ਕਰੋ ਜੀ"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
@@ -693,32 +1607,35 @@ msgstr "ਹਾਂ"
 msgid "no"
 msgstr "ਨਹੀਂ"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "ਕੀ ਤੁਸੀਂ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "ਉੱਤੇ ਵਿੱਚੋਂ ਆਪਣੀ ਚੋਣ ਕਰੋ ਜੀ [ਬੰਦ ਕਰਨ ਲਈ 'q'| ਜਾਰੀ ਰੱਖਣ ਲਈ 'c']"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -733,219 +1650,258 @@ msgstr ""
 "ਨੂੰ ਹੋਰ ਕੰਪਿਊਟਰ ਨਾਲ ਜੋੜਿਆ ਜਾ ਸਕੇ ਤੇ ਗਰਾਫੀਕਲ ਜਾਂ ਟੈਕਸਟ ਮੋਡ ਨਾਲ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ "
 "ਸਕੇ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC ਪਾਸਵਰਡ"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "VNC ਪਾਸਵਰਡ ਦਿਉ ਜੀ। ਤੁਹਾਨੂੰ ਇਹ ਦੋ ਵਾਰ ਦੇਣਾ ਪਵੇਗਾ।\n"
 "ਬਿਨਾਂ ਪਾਸਵਰਡ ਜਾਰੀ ਰੱਖਣ ਲਈ ਖਾਲੀ ਛੱਡ ਦਿਉ।"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "ਪਾਸਵਰਡ (ਪੁਸ਼ਟੀ):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "ਸਮਾਂ-ਖੇਤਰ ਸੈਟਿੰਗ"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "ਸਮਾਂ-ਖੇਤਰ ਸੈੱਟ ਨਹੀਂ ਹੈ।"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਲਿਖਣਾ"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "ਤਾਰ (%s) ਕੁਨੈਕਟ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "ਤਾਰ (%s) ਕੁਨੈਕਟ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "ਹੋਸਟ-ਨਾਂ:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "ਹੋਸਟ-ਨਾਂ"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "ਹੋਸਟ-ਨਾਂ"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "ਹੋਸਟ-ਨਾਂ ਠੀਕ ਨਹੀਂ ਹੈ: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "ਸੰਰਚਨਾ ਪੂਰੀ(_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "ਗੇਟਵੇ"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ਫਾਇਲ-ਸਿਸਟਮ ਸੰਰਚਨਾ ਵਿੱਚ ਕਿਸਮ ਗੈਰ-ਮੌਜੂਦ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "ਇੰਸਟਾਲ ਹੋਏ ਸਿਸਟਮ ਦੀ ਸੰਰਚਨਾ"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "ਰੂਟ ਅਕਾਊਂਟ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ।"
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "ਪਾਸਵਰਡ ਸੈੱਟ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "ਨਵਾਂ ਰੂਟ ਪਾਸਵਰਡ ਦਿਉ ਜੀ। ਤੁਹਾਨੂੰ ਇਹ ਦੋ ਵਾਰ ਲਿਖਣਾ ਪਵੇਗਾ।"
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "ਸਭ ਥਾਂ ਵਰਤੋਂ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "ਮੌਜੂਦਾ ਲੀਨਕਸ ਸਿਸਟਮ ਨੂੰ ਬਦਲੋ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "ਖਾਲੀ ਥਾਂ ਵਰਤੋਂ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ਇੰਸਟਾਲ ਟਿਕਾਣਾ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "ਕੋਈ ਡਿਸਕ ਨਹੀਂ ਚੁਣੀ ਗਈ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ "
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ "
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "ਆਟੋਮੈਟਿਕ ਪਾਰਟੀਸ਼ਨ ਦੀ ਚੋਣ ਕੀਤੀ ਗਈ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "ਪਸੰਦੀਦਾ ਪਾਰਟੀਸ਼ਨ ਦੀ ਚੋਣ ਕੀਤੀ ਗਈ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -953,38 +1909,60 @@ msgstr ""
 "ਕੋਈ ਡਿਸਕ ਨਹੀਂ ਲੱਭੀ। ਕਿਰਪਾ ਕਰਕੇ ਕੰਪਿਊਟਰ ਸ਼ੱਟਡਾਊਨ ਕਰੋ, ਘੱਟੋ-ਘੱਟ ਇੱਕ ਡਿਸਕ ਜੋੜੋ, ਅਤੇ ਇੰਸਟਾਲੇਸ਼ਨ "
 "ਮੁਕੰਮਲ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ।"
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "ਕੋਈ ਡਿਸਕ ਨਹੀਂ ਚੁਣੀ ਗਈ, ਜਾਰੀ ਰੱਖਣ ਲਈ "
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "...ਸਟੋਰੇਜ਼ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "ਚੁਣੋ(_S)"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "ਅੱਪਡੇਟ ਕੀਤੀ ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਫੇਲ ਹੋਈ: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "...ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਜਾਂਚੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "ਆਪੇ-ਪਾਰਟੀਸ਼ਨ ਕਰਨ ਚੋਣਾਂ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -993,41 +1971,41 @@ msgstr ""
 "ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਤੁਹਾਡੀ ਹਾਰਡ ਡਰਾਇਵ ਦੇ ਪਾਰਟੀਸ਼ਨ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ।  ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ "
 "ਥਾਂ ਦੀ ਚੋਣ ਕਰੋ।"
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "ਵਿਭਾਗੀਕਰਨ ਸਕੀਮ ਸੰਰਚਨਾ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "ਵਿਭਾਗੀਕਰਨ ਸਕੀਮ ਸੰਰਚਨਾ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "ਸਮਾਂ-ਖੇਤਰ ਸੈਟਿੰਗ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s ਸਮਾਂ-ਖੇਤਰ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "ਸਮਾਂ-ਖੇਤਰ ਸੈੱਟ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "%s ਖੇਤਰ ਵਿੱਚ ਉਪਲੱਬਧ ਸਮਾਂ-ਖੇਤਰ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1035,178 +2013,196 @@ msgstr ""
 "ਸਮਾਂ-ਖੇਤਰ ਚੁਣੋ ਜੀ।\n"
 "ਨੰਬਰ ਚੁਣੋ ਜਾਂ ਨਾਂ ਸਿੱਧਾ ਚੁਣੋ [b ਖੇਤਰ ਸੂਚੀ ਲਈ, q ਬੰਦ ਕਰਨ ਲਈ]"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC ਸ਼ੁਰੂ ਕਰੋ"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਤਰੱਕੀ"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "ਸਭ ਤੋਂ ਨੇੜਲਾ "
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS ਸਰਵਰ %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਸੈਟਅੱਪ ਕਰਨ ਦੇ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "ਕੋਈ ਚੋਣ ਨਹੀਂ ਕੀਤੀ"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "ਜੁਡ਼ ਰਿਹਾ ਹੈ..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD ਡਰਾਇਵ"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO ਫਾਇਲ:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ ਸਮਾਂ"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "ਕੋਈ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ਇੰਸਟਾਲ ਸਰੋਤ ਸੈਟ ਅੱਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "...ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "ਕੋਈ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS ਸਰਵਰ %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS ਮਾਊਂਟ ਚੋਣਾਂ:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "ਇੰਸਟਾਲ ਸਰੋਤ ਸੈਟ ਅੱਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਰਿਪੋ url ਜਾਂਚੋ ਜੀ"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "ਜੰਤਰ /boot ਰੱਖਦਾ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "ਇੰਸਟਾਲ ਸਰੋਤ ਸੈਟ ਅੱਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "ਸਾਫਟਵੇਅਰ ਚੋਣ ਸੋਧ(_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "ਸਾਫਟਵੇਅਰ ਚੋਣ ਜਾਂਚਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਸੈਟਅੱਪ ਨਹੀਂ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "ਸਰੋਤ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ - ਜਾਂਚ ਕਰੋ ਜੀ"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "ਪਸੰਦੀਦਾ ਸਾਫਟਵੇਅਰ ਚੁਣੇ ਗਏ"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਸੈਟਅੱਪ ਨਹੀਂ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "ਇੰਵਾਇਰਨਮੈਂਟ ਚੁਣੋ"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "ਤੁਹਾਨੂੰ ਪਾਸਵਰਡ ਦੇਣਾ ਅਤੇ ਪੁਸ਼ਟੀ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ਚੇਤਾਵਨੀ"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1222,112 +2218,100 @@ msgstr "ਜਾਰੀ ਹੈ"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tਇੰਸਟਾਲੇਸ਼ਨ ਪੂਰੀ ਹੋਈ। ਬੰਦ ਕਨ ਲਈ ਐਂਟਰ ਦੱਬੋ।"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "ਮੂਲ ਕੰਮ ਨਾਂ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "...ਸਥਿਤੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "ਨਵਾਂ ਜੰਤਰ"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "ਪਾਸਵਰਡ (ਪੁਸ਼ਟੀ):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "%s: ਤੁਸੀਂ ਹਲਕਾ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ। ਇਸੇ ਨੂੰ ਵਰਤਣ ਲਈ ਮੁੜ ਮੁਕੰਮਲ ਨੂੰ ਦਬਾਉ।"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "%s: ਤੁਸੀਂ ਹਲਕਾ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ। ਇਸੇ ਨੂੰ ਵਰਤਣ ਲਈ ਮੁੜ ਮੁਕੰਮਲ ਨੂੰ ਦਬਾਉ।"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ(_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "ਮੱਦਦ"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "ਬੰਦ ਕਰੋ(_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "ਨਹੀਂ(_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "ਹਾਂ(_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "ਡਿਫਾਲਟ ਨਾਂ"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "ਅਨੁਵਾਦ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "ਅਨੁਵਾਦ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "ਸਾਫਟਵੇਅਰ"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "ਸਿਸਟਮ"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "ਯੂਜ਼ਰ ਸੈਟਿੰਗ"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "ਅਗਲੇ ਪੜਾਅ ਉੱਤੇ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਇਹ ਆਈਕਾਨ ਲੱਗੇ ਵਾਲੀਆਂ ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਪੂਰੀਆਂ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "ਪੂਰਾ!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1336,164 +2320,64 @@ msgstr ""
 "%s ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੋ ਗਿਆ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਵਲੋਂ ਵਰਤਣ\n"
 "ਲਈ ਤਿਆਰ ਹੈ। ਇਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "ਪੂਰਾ!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "ਨਵੀਂ %s %s ਇੰਸਟਾਲੇਸ਼ਨ"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"ਹੁਣ %s ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੋ ਗਿਆ, ਪਰ ਕੁਝ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਹਾਲੇ ਲੋੜ ਹੈ।\n"
+"ਇਹ ਪੂਰੀ ਕਰੋ ਅਤੇ ਤਦ ਸੰਰਚਨਾ ਪੂਰੀ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੋ ਗਿਆ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਵਲੋਂ ਵਰਤਣ\n"
+"ਲਈ ਤਿਆਰ ਹੈ। ਇਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "...ਨਵਾਂ ਵਾਲੀਅਮ ਗਰੁੱਪ ਬਣਾਓ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr "ਆਪਣੇ ਵਾਲੀਆਮ ਗਰੁੱਪ ਲਈ ਇੱਕ ਨਾਂ ਬਣਾਓ ਅਤੇ  ਹੇਠਾਂ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਡਿਸਕ ਚੁਣੋ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "ਕਾਲਮ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਨਾ-ਪ੍ਰਾਪਤੀਯੋਗ ਗਲਤੀ ਕਰਕੇ ਮੁੜ-ਸੈੱਟ ਹੋਈ ਹੈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr "ਜੰਤਰ ਮੁੜ-ਸਰ"
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "ਠੀਕ ਮਾਊਂਟ ਪੁਆਇੰਟ ਦਿਉ ਜੀ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਗਲਤ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "RAID ਲੈਵਲ ਜੋ ਤੁਸੀਂ ਚੁਣਿਆ ਹੈ ਲਈ ਤੁਹਾਡੇ ਚੁਣੇ ਤੋਂ ਜਿਆਦਾ ਡਿਸਕਾਂ ਦੀ ਲੋੜ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "ਠੀਕ ਮਾਊਂਟ ਪੁਆਇੰਟ ਦਿਉ ਜੀ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਗਲਤ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
+"Storage configuration reset due to unrecoverable error. Click for details."
+msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਨਾ-ਪ੍ਰਾਪਤੀਯੋਗ ਗਲਤੀ ਕਰਕੇ ਮੁੜ-ਸੈੱਟ ਹੋਈ ਹੈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "ਸਟੈਂਡਰਡ ਪਾਰਟੀਸ਼ਨ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "ਡਿਸਕ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s ਉੱਪਰ root ਦੇ ਨਾਲ-ਨਾਲ ਹੋਰ ਫਾਇਲਸਿਸਟਮ ਲਈ ਹਟਾਓ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "ਕੀ ਤੁਸੀਂ %s ਉੱਪਰ ਸਾਰਾ ਡਾਟਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "ਕੀ ਤੁਸੀਂ %s ਉੱਪਰ ਸਾਰਾ ਡਾਟਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "ਖੁਦ ਪਾਰਟੀਸ਼ਨ ਬਣਾਉ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d ਸਟੋਰੇਜ਼ ਜੰਤਰ ਚੁਣਿਆ"
 msgstr[1] "%d ਸਟੋਰੇਜ਼ ਜੰਤਰ ਚੁਣੇ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1502,128 +2386,110 @@ msgstr ""
 "ਜਦੋਂ ਤੁਸੀਂ ਆਪਣੇ %s %s ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਮਾਊਂਟ ਪੁਆਇੰਟ ਬਣਾਉਂਦੇ ਹੋ ਤਾਂ ਤੁਸੀਂ ਉਹਨਾਂ ਦਾ ਵੇਰਵਾ ਇੱਥੇ ਵੇਖ "
 "ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਸਵੈਪ ('swap') ਖੇਤਰ ਨੂੰ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਵਲੋਂ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਮੈਮੋਰੀ ਘੱਟ "
-"ਜਾਂਦੀ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ 'boot' ਖੇਤਰ ਉਹ ਖੇਤਰ ਹੈ, ਜਿੱਥੇ ਓਪਰੇਟਿੰਗ\n"
-"ਸਿਸਟਮ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਲੋੜੀਦੀਆਂ ਫਾਇਲਾਂ ਰੱਖੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਰੂਟ ('root') ਖੇਤਰ ਹੈ, ਜਿੱਥੇ ਮੁੱਢਲੀਆਂ ਸਿਸਟਮ ਫਾਇਲਾਂ\n"
-"ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ 'home' ਖੇਤਰ ਹੈ, ਜਿੱਥੇ ਤੁਹਾਡੇ ਨਿੱਜੀ ਡਾਟੇ ਨੂੰ\n"
-"ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS ਬੂਟ ਭਾਗ  BIOS ਹਾਰਡਵੇਅਰ ਉੱਤੇ GPT-ਭਾਗ ਵਾਲੀਆਂ ਡਿਸਕਾਂ ਤੋਂ ਬੂਟ ਕਰਨ ਨੂੰ ਯੋਗ ਕਰਨ ਲਈ ਲੋੜੀਦਾ "
-"ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PReP ਬੂਟ ਪਾਰਟੀਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਕਿਉਂਕਿ ਕੁਝ PPC ਪਲੇਟਫਾਰਮ ਉੱਤੇ ਬੂਟ ਸੰਰਚਨਾ ਦੇ ਭਾਗ ਵਜੋਂ ਚਾਹੀਦਾ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi %s ਕਿਸਮ ਦੇ ਜੰਤਰ ਤੇ ਹੋਣੀ ਜਰੂਰੀ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s %s ਕਿਸਮ ਦੇ ਜੰਤਰ ਤੇ ਹੋਣੀ ਜਰੂਰੀ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s ਇਨਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੋ ਸਕਦੀ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "ਤੁਹਾਨੂੰ ਰੂਟ ਜੰਤਰ ਉੱਤੇ ਨਵਾਂ ਫਾਇਲ-ਸਿਸਟਮ ਬਣਾਉਣਾ ਪਵੇਗਾ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "ਕਿਸਮ %s ਵਾਲੇ ਜੰਤਰਾਂ ਲਈ ਯੋਗ RAID ਲੈਵਲ ਚੁਣਨ ਦੀ ਲੋੜ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "ਜੰਤਰ ਦਾ ਆਕਾਰ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "ਜੰਤਰ ਮੁੜ-ਫਾਰਮੈਟ ਮੰਗ ਫੇਲ੍ਹ ਹੋਈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "ਦਿੱਤਾ ਨਾਂ %s ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਲੇਬਲ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "ਕੋਈ ਡਿਸਕ ਨਹੀਂ ਚੁਣੀ ਗਈ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਦਾ ਆਕਾਰ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਜਾਂਚਣ ਵਿੱਚ ਗਲਤੀ।   ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਜਾਂਚਣ ਵਿੱਚ ਗਲਤੀ।   ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "ਨਵਾਂ %s ਮੌਜੂਦਾ %s ਵਿੱਚ ਜੋੜਿਆ ਗਿਆ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "ਨਵਾਂ ਜੰਤਰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "ਗਲਤ ਪਾਰਟੀਸ਼ਨ ਅਕਾਰ ਸੈੱਟ ਕੀਤਾ ਹੈ। ਇੱਕ ਯੋਗ ਪੂਰਨਅੰਕ ਵਰਤੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "ਜੰਤਰ ਹਟਾਉਣ ਦੀ ਮੰਗ ਫੇਲ੍ਹ ਹੋਈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ ਨਾਂ %s ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ। ਤਬਦੀਲੀ ਨਹੀਂ ਸੰਭਾਲ ਰਿਹਾ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs  ਖਾਲੀ"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1632,7 +2498,7 @@ msgstr ""
 "ਇਹ ਸਾਫਟਵੇਅਰ RAID ਐਰੇ ਵਿੱਚ %d ਪਾਰਟੀਸ਼ਨ %d ਮੈਂਬਰ ਪਾਰਟੀਸ਼ਨ ਦੇ ਗੈਰਮੌਜੂਦ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ ਹਟਾ ਸਕਦੇ "
 "ਹੋ ਜਾਂ ਵੱਖਰਾ ਜੰਤਰ ਚੁਣ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1641,288 +2507,143 @@ msgstr ""
 "ਇਸ LVM ਵਾਲੀਅਮ ਗਰੁੱਪ ਵਿੱਚ %d ਭੌਤਿਕ ਵਾਲੀਅਮ %d ਵਿੱਚੋਂ ਗੈਰਮੌਜੂਦ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ ਹਟਾ ਸਕਦੇ ਹੋ ਜਾਂ "
 "ਵੱਖਰਾ ਜੰਤਰ ਚੁਣ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "ਕੋਈ ਡਿਸਕ ਨਹੀਂ ਚੁਣੀ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "ਚੁਣੀਆਂ ਡਿਸਕਾਂ ਉੱਤੇ ਲੋੜੀਦੀ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "ਆਟੋਮੈਟਿਕ ਪਾਰਟੀਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ। ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "ਸਾਫਟਵੇਅਰ ਚੋਣ ਸੋਧ(_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "ਬਲਾਕ ਜੰਤਰ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ। ਵੇਰਵੇ ਲਈ ਜਾਂਚ ਕਰੋ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "ਗਲਤ ਸਮਾਂ-ਖੇਤਰ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "ਸ਼ਾਮ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "ਜੇ ਤੁਸੀਂ NTP ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਤੁਹਾਨੂੰ ਨੈੱਟਵਰਕ ਪਹਿਲਾਂ ਸੈੱਟ ਕਰਨਾ ਪਵੇਗਾ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "ਤੁਹਾਡਾ ਕੋਲ ਚੱਲਦੀ NTP ਸਰਵਰ ਸੰਰਚਨਾ ਨਹੀਂ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਟਿਕਾਣਾ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d ਸਟੋਰੇਜ਼ ਜੰਤਰ ਚੁਣਿਆ"
+msgstr[1] "%d ਸਟੋਰੇਜ਼ ਜੰਤਰ ਚੁਣੇ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "ਲੇਆਉਟ ਬਦਲਣ ਲਈ %s"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "ਕੀਬੋਰਡ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "ਲੇਆਉਟ ਸੰਰਚਨਾ ਟੈਸਟਿੰਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "...ਸਥਿਤੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "ਲੇਆਊਟ ਤਬਦੀਲੀ ਸੰਰਚਿਤ ਨਹੀਂ ਕੀਤੀ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "ਭਾਸ਼ਾ"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "ਹਾਲਤ ਅਣਜਾਣ (ਗੁੰਮ)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "ਹਾਲਤ ਅਣਜਾਣ"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "ਪ੍ਰਬੰਧ ਅਧੀਨ ਨਹੀਂ"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "ਨਾ-ਉਪਲੱਬਧ"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "ਫਿਰਮਵੇਅਰ ਗੁੰਮ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "ਤਾਰ ਕੱਢੀ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "ਨਾ-ਉਪਲੱਬਧ"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਹੈ"
@@ -1947,295 +2668,324 @@ msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Connection failed"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "ਅਣ-ਪਲੱਗ ਕੀਤਾ"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "ਈਥਰਨੈੱਟ"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "ਬੇਤਾਰ"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "ਅਣ-ਪਲੱਗ ਕੀਤਾ"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ਐਡਰੈੱਸ"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ਐਡਰੈੱਸ"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP ਐਡਰੈਸ"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "ਇੰਟਰਪਰਾਈਜ਼"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ ਸੈੱਟ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "ਰੂਟ ਅਕਾਊਂਟ ਬੰਦ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ ਸੈੱਟ ਨਹੀਂ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "ਸਾਫਟਵੇਅਰ ਚੋਣ"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "...ਸਾਫਟਵੇਅਰ ਨਿਰਭਰਤਾ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "ਸਾਫਟਵੇਅਰ ਨਿਰਭਰਤਾ ਜਾਂਚਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "...ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "...ਗਰੁੱਪ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "...ਸਾਫਟਵੇਅਰ ਨਿਰਭਰਤਾ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "ਸਾਫਟਵੇਅਰ ਨਿਰਭਰਤਾ ਜਾਂਚਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "ਸਾਫਟਵੇਅਰ ਨਿਰਭਰਤਾ ਚੈੱਕ ਕ"
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸਾਫਟਵੇਅਰ ਵਿੱਚ ਗਲਤੀਆਂ ਹਨ।  ਇਹ ਤੁਹਾਡੇ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਨਾਲ ਗਲਤੀਆਂ\n"
 "ਦੇ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।  ਤੁਸੀਂ ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿੱਚੋਂ ਇਹਨਾਂ ਪੈਕੇਜਾਂ ਨੂੰ ਹਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।\n"
 "ਆਪਣਾ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਬਦਲੋ ਜਾਂ ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਸੋਧੋ(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "ਸਾਫਟਵੇਅਰ ਚੋਣ ਸੋਧ(_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਸੈੱਟਅੱਪ ਹੋ ਰਿਹਾ ਹੈ..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "...ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "ਇਹ ਮੀਡਿਆ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਚੰ"
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "ਇਹ ਮੀਡਿਆ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਚੰਗਾ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "ਇੰਸਟਾਲ ਸਰੋਤ ਸੈਟ ਅੱਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਰਿਪੋ url ਜਾਂਚੋ ਜੀ"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸੈੱਟ ਕਰਨ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਸੈਟਅੱਪ ਕਰਨ ਦੇ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "ਇੰਸਟਾਲ ਸਰੋਤ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ, ਰੈਪੋ url ਅਤੇ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਜਾਂਚ ਕਰੋ"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸੈੱਟ ਕਰਨ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਸੈਟਅੱਪ ਕਰਨ ਦੇ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "ਜੰਤਰ:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS ਸਰਵਰ %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "ਗਲਤ ਸਮਾਂ-ਖੇਤਰ"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "ਗਲਤ ਸਮਾਂ-ਖੇਤਰ"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "ਗਲਤ ਸਮਾਂ-ਖੇਤਰ"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "ਉਡੀਕੋ ਜੀ... ਸਾਫਟਵੇਅਰ ਮੇਟਾਡਾਟਾ ਹਾਲੇ ਵੀ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀਆਂ ਡਿਸਕਾਂ ਉੱਤੇ ਅੱਗੇ ਦਿੱਤੀ ਖਾਲੀ ਥਾਂ ਉਪਲੱਬਧ ਹੈ:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "ਉਡੀਕੋ ਜੀ... ਸਾਫਟਵੇਅਰ ਮੇਟਾਡਾਟਾ ਹਾਲੇ ਵੀ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2245,7 +2995,7 @@ msgstr ""
 "<b>ਤੁਹਾਡੇ ਕੋਲ %s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਥਾਂ ਨਹੀਂ ਹੈ</b>, ਪਰ ਅਸੀਂ ਮੌਜੂਦਾ ਪਾਰਟੀਸ਼ਨ ਆਕਾਰ ਨੂੰ "
 "ਘਟਾ ਕੇ ਜਾਂ ਹਟਾ ਕੇ ਥਾਂ ਤੁਹਾਡੇ ਲਈ ਥਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਮੱਦਦ ਕਰ ਸਕਦੇ ਹਾਂ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2255,7 +3005,7 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ <b>%s</b> ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਥਾਂ ਨਹੀਂ ਹੈ, ਭਾਵੇਂ ਕਿ ਤੁਸੀਂ ਚੁਣੀਆਂ ਡਿਸਕਾਂ ਤੋਂ ਉਪਲੱਬਧ "
 "ਸਾਰੀ ਥਾਂ ਨੂੰ ਵਰਤੋਂ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2267,48 +3017,59 @@ msgstr ""
 "ਡਿਸਕਾਂ ਤੋਂ ਉਪਲੱਬਧ ਸਾਰੀ ਥਾਂ ਨੂੰ ਵਰਤ ਲਵੋ। ਤੁਸੀਂ ਵਾਧੂ ਥਾਂ ਲਈ ਹੋਰ ਡਿਸਕ ਨੂੰ ਜੋੜ ਸਕਦੇ ਹੋ, <b>%s</b> "
 "ਦੇ ਛੋਟੇ ਵਰਜਨ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਆਪਣੀ ਸਾਫਟਵੇਅਰ ਚੋਣ ਸੋਧ ਸਕਦੇ ਹੋ ਜਾਂ ਇੰਸਟਾਲਰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਟਿਕਾਣਾ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "...ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਸੰਭਾਲਣ ਤੋਂ ਫੇਲ ਹੋਇਆ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD ਜੰਤਰ ਫਾਰਮੈਟ ਹੋ ਰਿਹਾ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਜਾਂਚਣ ਵਿੱਚ ਗਲਤੀ।   ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਜਾਂਚਣ ਵਿੱਚ ਗਲਤੀ।   ਵੇਰਵੇ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs  ਖਾਲੀ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d ਡਿਸਕ ਚੁਣੀ ਗਈ ਹੈ; %s ਸਮਰੱਥਾ; %s ਖਾਲੀ"
 msgstr[1] "%d ਡਿਸਕਾਂ ਚੁਣੀਆਂ ਗਈਆਂ ਹਨ; %s ਸਮਰੱਥਾ; %s ਖਾਲੀ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr "ਤੁਸੀਂ ਬੂਟ-ਲੋਡਰ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਛੱਡਣ ਦੀ ਚੋਣ ਕਰ ਸਕਦੇ ਹੋ।  ਤੁਹਾਡਾ ਸਿਸਟਮ ਬੂਟਯੋਗ ਨਹੀਂ ਹੋਵੇਗਾ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2318,11 +3079,19 @@ msgstr ""
 "ਸਕਦੇ ਹੋ\n"
 "ਜਾਂ ਇੰਸਟਾਲਰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "ਸਟੋਰੇਜ਼ ਲੇਆਉਟ ਸੋਧ(_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2333,76 +3102,80 @@ msgstr ""
 "ਸਕਦੇ ਹੋ\n"
 "ਜਾਂ ਇੰਸਟਾਲਰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ਠੀਕ"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "ਯੂਜ਼ਰ ਸੈਟਿੰਗ"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "ਗਲਤ ਸਮਾਂ-ਖੇਤਰ"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ।"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "ਡਾਟਾ"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "ਤੁਸੀਂ ਆਪਣੀ %s %s ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਹਾਲੇ ਕੋਈ ਵੀ ਮਾਊਂਟ ਪੁਆਇੰਟ ਨਹੀਂ ਬਣਾਇਆ ਹੈ:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "ਆਟੋਮੈਟਿਕ ਬਣਾਉਣ ਲਈ ਦਬਾਓ।"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "ਜਾਂ '+' ਆਈਕਾਨ ਦੀ ਵਰਤੋਂ ਨਾਲ ਹੇਠਾਂ ਨਵੇਂ ਮਾਊਂਟ ਪੁਆਇੰਟ ਬਣਾਉ।"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2413,55 +3186,159 @@ msgid_plural ""
 msgstr[0] "<b>%d ਡਿਸਕ; %s ਸਮਰੱਥਾ; %s ਖਾਲੀ ਸਪੇਸ</b> (ਨਾ-ਵੰਡਿਆ ਅਤੇ ਫਾਇਲਸਿਸਟਮ ਵਿੱਚ)"
 msgstr[1] "<b>%d ਡਿਸਕਾਂ; %s ਸਮਰੱਥਾ; %s ਖਾਲੀ ਸਪੇਸ</b> (ਨਾ-ਵੰਡਿਆ ਅਤੇ ਫਾਇਲਸਿਸਟਮਾਂ ਵਿੱਚ)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "ਬੂਟਲੋਡਰ ਇੰਸਟਾਲ ਨਾ ਕਰੋ(_D)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "ਬੂਟ ਜੰਤਰ ਵਜੋਂ ਸੈੱਟ ਕਰੋ(_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "RAID ਲੈਵਲ ਜੋ ਤੁਸੀਂ ਚੁਣਿਆ ਹੈ ਲਈ ਤੁਹਾਡੇ ਚੁਣੇ ਤੋਂ ਜਿਆਦਾ ਡਿਸਕਾਂ ਦੀ ਲੋੜ ਹੈ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr "ਆਪਣੇ ਵਾਲੀਆਮ ਗਰੁੱਪ ਲਈ ਇੱਕ ਨਾਂ ਬਣਾਓ ਅਤੇ  ਹੇਠਾਂ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਡਿਸਕ ਚੁਣੋ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "ਕਾਲਮ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "ਮਾਊਂਟ ਪੁਆਇੰਟ %s ਲੀਨਕਸ ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਹੋਣਾ ਜਰੂਰੀ ਹੈ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "ਠੀਕ ਮਾਊਂਟ ਪੁਆਇੰਟ ਦਿਉ ਜੀ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਗਲਤ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s ਉੱਪਰ root ਦੇ ਨਾਲ-ਨਾਲ ਹੋਰ ਫਾਇਲਸਿਸਟਮ ਲਈ ਹਟਾਓ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "ਕੀ ਤੁਸੀਂ %s ਉੱਪਰ ਸਾਰਾ ਡਾਟਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "ਕੀ ਤੁਸੀਂ %s ਉੱਪਰ ਸਾਰਾ ਡਾਟਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "ਗਲਤ ਸਮਾਂ-ਖੇਤਰ"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "ਤੁਸੀਂ ਹਲਕਾ ਵਾਕ ਦਿੱਤਾ ਹੈ: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "ਵਾਕ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "ਰੱਖੋ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "ਸੁੰਘੜੋ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "ਇਸ ਜੰਤਰ ਵਿੱਚ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਸ਼ਾਮਿਲ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s ਨੂੰ %(device)s ਉੱਤੇ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "ਤਿਆਰ ਨਹੀਂ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "ਖਾਲੀ ਥਾਂ ਵਰਤੋਂ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2473,14 +3350,14 @@ msgstr ""
 "ਤੁਸੀਂ ਮੌਜੂਦਾ ਫਾਇਲ ਸਿਸਟਮ ਹਟਾ ਸਕਦੇ ਹੋ, ਤੁਹਾਨੂੰ ਇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਲੋੜ ਨਹੀਂ "
 "ਪਵੇਗੀ। ਫਾਇਲ ਸਿਸਟਮ ਹਟਾਉਣ ਨਾਲ ਇਸ ਉੱਪਰਲਾ ਸਾਰਾ ਡਾਟਾ ਪੱਕੇ ਤੌਰ ਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2488,353 +3365,762 @@ msgid_plural ""
 msgstr[0] "<b>%s ਡਿਸਕ; %s ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਥਾਂ</b> (ਫਾਇਲ-ਸਿਸਟਮਾਂ ਵਿੱਚੋਂ)"
 msgstr[1] "<b>%s ਡਿਸਕਾਂ; %s ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਥਾਂ</b> (ਫਾਇਲ-ਸਿਸਟਮਾਂ ਵਿੱਚੋਂ)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤਯੋਗ ਲਈ ਕੁੱਲ ਚੁਣੀ ਥਾਂ: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "ਹਟਾਓ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "ਰੱਖੋ"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਇੰਸਟਾਲੇਸ਼ਨ"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "ਸਪੋਕ ਨਾਂ"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "ਪ੍ਰੀ-ਰੀਲਿਜ਼ / ਟੈਸਟਿੰਗ"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "ਨਵਾਂ ਜੰਤਰ"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "ਨਵਾਂ ਚੋਣਕਾਰ"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "ਮੁਕੰਮਲ(_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "ਜਾਰੀ ਰੱਖੋ(_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "ਬਦਲਾਅ ਲਾਗੂ ਕਰੋ(_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "ਗਰੁੱਪ ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ਠੀਕ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "ਸ਼ਾਮ"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "NTP ਸਰਵਰ ਦੀ ਵਰਤੋਂ ਲਈ ਸ਼ਾਮਿਲ ਅਤੇ ਨਿਸ਼ਾਨਬੱਧ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ਵੈੱਬ ਸਰਵਰ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "ਵਰਤੋਂ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "...ਸੰਰਚਨਾ(_C)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "ਖੇਤਰ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "ਖੇਤਰ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "ਸ਼ਹਿਰ:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "ਸ਼ਹਿਰ:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "ਸਵੇਰ/ਸ਼ਾਮ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "ਸਵੇਰ/ਸ਼ਾਮ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "23-ਘੰਟੇ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "ਸਵੇਰ/ਸ਼ਾਮ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਟਿਕਾਣਾ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ਸਮਰੱਥਾ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "ਕੁਨੈਕਟ ਨਹੀਂ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "ਚੁਣੇ ਜੰਤਰ"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "ਕੋਈ ਚੋਣ ਨਹੀਂ ਕੀਤੀ"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>ਲੇਬਲ:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "ਫਿਰਮਵੇਅਰ ਗੁੰਮ ਹੈ"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "ਨਹੀਂ(_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN ਕਿਸਮ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "ਚੁਣੇ ਜੰਤਰ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "ਸਾਰ"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "ਰੇਡ ਜੰਤਰ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "ਸ਼ਾਮਲ(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "ਡਿਫਾਲਟ ਰੂਟ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "ਸਬ-ਨੈੱਟ ਮਾਸਕ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "ਗਤੀ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈਸ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "...ਸੰਰਚਨਾ(_n)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "ਸੁਰੱਖਿਆ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "ਸੁਰੱਖਿਆ ਕੁੰਜੀ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "...ਹਾਟਸਪਾਟ ਵਜੋਂ ਵਰਤੋਂ(_U)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "...ਹਾਟਸਪਾਟ ਰੋਕੋ(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "...ਸੰਰਚਨਾ(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "ਪਰੋਵਾਈਡਰ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "...ਸੰਰਚਨਾ(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN ਕਿਸਮ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "ਗੇਟਵੇ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "ਗਰੁੱਪ ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "ਗਰੁੱਪ ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "...ਸੰਰਚਨਾ(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "ਢੰਗ(_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "ਸੰਰਚਨਾ UR_L"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP ਪਰਾਕਸੀ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS ਪਰਾਕਸੀ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP ਪਰਾਕਸੀ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "ਸਾਕਟ ਹੋਸਟ(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਲਿਖਣਾ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "ਅਣ-ਲਾਕ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "ਏਅਰ-ਪਲ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਲਿਖਣਾ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "ਹੋਸਟ-ਨਾਂ:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2842,282 +4128,204 @@ msgid ""
 msgstr ""
 "ਸਾਨੂੰ ਨੈੱਟਵਰਕ ਦੀ ਲੋੜ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਦੀ ਜਾਣਕਾਰੀ ਅਤੇ ਤੁਹਾਡੇ ਲਈ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕਰਨ ਦੇ ਲਈ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "ਡਿਫਾਲਟ ਰੂਟ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "ਸਬ-ਨੈੱਟ ਮਾਸਕ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "ਗਤੀ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈਸ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "...ਸੰਰਚਨਾ(_n)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "ਸੁਰੱਖਿਆ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "ਨੈੱਟਵਰਕ ਨਾਂ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "ਸੁਰੱਖਿਆ ਕੁੰਜੀ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "...ਹਾਟਸਪਾਟ ਵਜੋਂ ਵਰਤੋਂ(_U)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "...ਹਾਟਸਪਾਟ ਰੋਕੋ(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "...ਸੰਰਚਨਾ(_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "ਪਰੋਵਾਈਡਰ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN ਕਿਸਮ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "ਗੇਟਵੇ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "ਗਰੁੱਪ ਨਾਂ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "ਗਰੁੱਪ ਪਾਸਵਰਡ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "ਢੰਗ(_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "ਸੰਰਚਨਾ UR_L"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP ਪਰਾਕਸੀ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS ਪਰਾਕਸੀ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP ਪਰਾਕਸੀ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "ਸਾਕਟ ਹੋਸਟ(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "ਅਣ-ਲਾਕ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "ਏਅਰ-ਪਲ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "ਹੋਸਟ-ਨਾਂ:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "ਕੁਨੈਕਟ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "ਸਾਫਟਵੇਅਰ ਚੋਣ"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "ਇੰਵਾਇਰਨਮੈਂਟ ਚੁਣੋ"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "ਕਾਲਮ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "ਰੱਦ ਕਰੋ ਅਤੇ ਹੋਰ ਡਿਸਕਾਂ ਸ਼ਾਮਿਲ(_a)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਚੋਣਾਂ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>ਭਾਗ ਕਿਸਮ:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "ਮੇਰਾ ਡਾਟਾ ਇੰਕ੍ਰਪਟ ਕਰੋ। ਮੈਂ ਵਾਕ ਬਾਅਦ ਵਿੱਚ ਦੇਵਾਂਗਾ।"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "ਪਸੰਦੀਦਾ ਪਾਰਟੀਸ਼ਨ ਦੀ ਚੋਣ ਕੀਤੀ ਗਈ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਥਾਂ(_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਚੋਣਾਂ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "ਇੱਥੇ ਅਸੀਂ ਦਰਸਾਉਂਦੇ ਹਾਂ ਕਿ ਮੌਜੂਦਾ ਸਾਫਟਵੇਅਰ ਚੋਣ ਲਈ ਕਿੰਨੀ ਥਾਂ ਚਾਹੀਦੀ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "ਖਾਲੀ ਡਿਸਕ"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "ਵਰਤਣ ਲਈ ਉਪਲੱਬਧ ਖਾਲੀ ਥਾਂ"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs  ਖਾਲੀ"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "ਖਾਲੀ ਥਾਂ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਪਰ ਮੌਜੂਦਾ ਪਾਰਟੀਸ਼ਨ ਤੋਂ ਪ੍ਰਾਪਤੀਯੋਗ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "ਇੱਥੇ ਅਸੀਂ ਦਰਸਾਉਂਦੇ ਹਾਂ ਕਿ ਤੁਹਾਡੇ ਕੋਲ ਕੀ ਚੋਣਾਂ ਹਨ।"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "ਖਾਲੀ ਥਾਂ ਵਰਤੋਂ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ(_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "ਜੰਤਰ ਵੇਰਵਾ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "ਲੋਕਲ ਸਟੈਂਡਰਡ ਡਿਸਕਾਂ"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "ਵਿਭਾਗੀਕਰਨ ਮੁਕੰਮਲ(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "ਇੰਕ੍ਰਿਪਟ(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "ਆਟੋਮੈਟਿਕ ਪਾਰਟੀਸ਼ਨ ਦੀ ਚੋਣ ਕੀਤੀ ਗਈ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "ਵਿਭਾਗੀਕਰਨ ਮੁਕੰਮਲ(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "ਇੰਕ੍ਰਿਪਟ(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "ਮੇਰਾ ਡਾਟਾ ਇੰਕ੍ਰਪਟ ਕਰੋ। ਮੈਂ ਵਾਕ ਬਾਅਦ ਵਿੱਚ ਦੇਵਾਂਗਾ।"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "ਆਪੇ-ਪਾਰਟੀਸ਼ਨ ਕਰਨ ਚੋਣਾਂ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "ਸਾਰ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "...ਪੂਰੀ ਡਿਸਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚੋਣਾਂ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ ਸ਼ਾਮਿਲ ਕਰੋ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "ਤੁਸੀਂ ਕੀਬੋਰਡ ਨੂੰ ਹੇਠਾਂ ਤੋਂ ਚੋਣ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "ਨਾਂ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3125,7 +4333,7 @@ msgstr ""
 "ਤੁਸੀਂ ਇਸ ਸਿਸਟਮ ਲਈ ਕਿਹੜਾ ਕੀਬੋਰਡ ਲੇਆਊਟ ਵਰਤਣਾ ਪਸੰਦ ਕਰੋਗੇ?  ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਲੇਆਊਟ ਨੂੰ ਮੂਲ ਬਣਾਉਣ "
 "ਲਈ ਸੂਚੀ ਵਿੱਚ ਸਿਖਰ ਤੇ ਲਿਜਾ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3133,353 +4341,483 @@ msgstr ""
 "ਇੱਥੇ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਸਿਰਫ ਇੰਸਟਾਲੇ ਕੀਤੇ ਸਿਸਟਮ ਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ। ਡਿਸਕਟਾਪ ਟੂਲ ਨੂੰ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ "
 "ਕੀਬੋਰਡ ਸੰਰਚਨਾ ਲਈ ਵਰਤੋ।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "ਲੇਆਉਟ ਸ਼ਾਮਿਲ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "ਲੇਆਉਟ ਹਟਾਓ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "ਚੁਣੇ ਲੇਆਊਟ ਨੂੰ ਉੱਪਰ ਲਿਜਾਓ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "ਲੇਆਉਟ ਸ਼ਾਮਿਲ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "ਲੇਆਉਟ ਹਟਾਓ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "ਚੁਣੇ ਲੇਆਊਟ ਨੂੰ ਉੱਪਰ ਲਿਜਾਓ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "ਚੁਣੇ ਲੇਆਊਟ ਨੂੰ ਹੇਠਾਂ ਲਿਜਾਓ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "ਲੇਆਊਟ ਝਲਕ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "ਲੇਆਉਟ ਸੰਰਚਨਾ ਟੈਸਟਿੰਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "ਲੇਆਉਟ ਬਦਲਣ ਲਈ Alt+Shift"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "ਚੋਣਾਂ(_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "ਸ਼ਾਮਲ(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "ਤੁਸੀਂ ਕੀਬੋਰਡ ਨੂੰ ਹੇਠਾਂ ਤੋਂ ਚੋਣ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "ਲੇਆਉਟ ਸ਼ਾਮਿਲ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ਲੇਆਉਟ ਬਦਲਣ ਚੋਣਾਂ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "ਤੁਸੀਂ ਕੀਬੋਰਡ ਲੇਆਊਟਾਂ ਵਿਚਕਾਰ ਤਬਦੀਲ ਹੋਣ ਲਈ ਕਿਹੜਾ ਕੰਬੀਨੇਸ਼ਨ ਵਰਤਣਾ ਪਸੰਦ ਕਰੋਗੇ?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "ਵਰਤੋ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "ਵੇਰਵਾ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS ਮਾਊਂਟ ਚੋਣਾਂ:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "ਭਾਸ਼ਾ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "ਨੇਟਿਵ-ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "ਅੰਗਰੇਜ਼ੀ-ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "ਕੋਈ ਚੋਣ ਨਹੀਂ ਕੀਤੀ"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "ਪੁਸ਼ਟੀ:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "ਰੂਟ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 "ਰੂਟ (root) ਅਕਾਊਂਟ ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੇ ਪਰਸ਼ਾਸ਼ਨ ਵਾਸਤੇ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ। root ਯੂਜ਼ਰ ਲਈ ਪਾਸਵਰਡ ਭਰੋ।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "ਮੁਕੰਮਲ(_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "ਮੀਡਿਆ ਜਾਂਚ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "ਮੀਡਿਆ ਦੀ ਜਾਂਚ ਜਾਰੀ, ਉਡੀਕੋ ਜੀ..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "ਸ਼ਾਮਲ(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTT_P ਪਰਾਕਸੀ ਯੋਗ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>ਪਰਾਕਸੀ URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>ਜਿਵੇਂ:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>ਯੂਜ਼ਰ ਨਾਂ</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>ਪਾਸਵਰਡ</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "ਕਿਹੜੇ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਨੂੰ ਤੁਸੀਂ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "ਆਪਣੇ-ਆਪ ਇੰਸਟਾਲੇਸ਼ਨ ਮੀਡਿਆ(_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "ਜੰਤਰ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>ਲੇਬਲ:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "ਜਾਂਚ(_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO ਫਾਇਲ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "ਜੰਤਰ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ISO ਚੁਣੋ(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ(_n):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "ਪਰਾਕਸੀ ਸੈਟਅੱਪ(_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "ਇਹ URL ਇੱਕ ਮਿਰਰ ਸੂਚੀ ਤੇ ਜਾਂਦਾ ਹੈ(_m)।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS ਮਾਊਂਟ ਚੋਣਾਂ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "ਇਹ ਖੇਤਰ ਚੋਣਵਾਂ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "ਫੇਡੋਰਾ ਪੀਪਲ ਰਿਪੋਜ਼ਟਰੀਆਂ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "ਨਵਾਂ ਮਾਊਂਟਪੁਆਂਇਟ ਜੋੜੋ।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "ਸ਼ਾਮਲ(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "ਚੁਣਿਆ ਮਾਊਂਟਪੁਆਂਇਟ ਹਟਾਓ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ਕਾਰਵਾਈ ਗਲਤੀ।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ਰੂਟ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "ਇਹ URL ਇੱਕ ਮਿਰਰ ਸੂਚੀ ਤੇ ਜਾਂਦਾ ਹੈ(_m)।"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "ਨਾਂ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>ਪਰਾਕਸੀ URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਗਲਤ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "ਮੈਨੂੰ ਇੱਥੋਂ ਕੱਢੋ(_G)"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "ਮੈਨੂੰ ਮਨਜ਼ੂਰ ਹੈ(_I)।"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "ਇਹ ਅਸਥਿਰ, ਪ੍ਰੀ-ਰੀਲਿਜ਼ ਸਾਫਟਵੇਅਰ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3490,81 +4828,697 @@ msgstr ""
 "ਬੱਗ ਹੈ, ਅਤੇ ਹਰ ਥਾਂ ਬੱਗ ਹਨ। ਇਹਨਾਂ ਬੱਗ ਨਾਲ ਤੁਹਾਨੂੰ ਰਹਿਣਾ ਪਵੇਗਾ। ਇਹ ਭਵਿੱਖ ਦਾ ਓਐਸ ਸਥਿਰ ਓਐਸ "
 "ਨਹੀਂ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਵਰਤ ਸਕੋ।  ਇਹ ਕੇਵਲ ਟੈਸਟ ਕਰਨ ਲਈ ਹੀ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ।"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਦੌਰਾਨ ਤੁਸੀਂ ਕਿਹਡ਼ੀ ਭਾਸ਼ਾ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "ਜਾਰੀ ਰੱਖੋ(_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "ਗਰੁੱਪ ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC ਪਾਸਵਰਡ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "ਨਵਾਂ ਮਾਊਂਟਪੁਆਂਇਟ ਜੋੜੋ।"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "ਸ਼ਾਮਲ(_A)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "ਚੁਣਿਆ ਮਾਊਂਟਪੁਆਂਇਟ ਹਟਾਓ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+#, fuzzy
+msgid "Reload storage configuration from disk."
+msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਫੇਲ ਹੋਈ: %s"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
+msgid "Selected Device"
+msgstr "ਚੁਣੇ ਜੰਤਰ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
+msgid "Device description"
+msgstr "ਜੰਤਰ ਵੇਰਵਾ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+#, fuzzy
+msgid "Mount _Point:"
+msgstr "<b>ਮਾਊਂਟ ਪੁਆਇੰਟ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>ਚਾਹੀਦੀ ਸਮਰੱਥਾ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
+msgstr "<b>ਲੇਬਲ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "ਜੰਤਰ:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
+msgid "_Modify..."
+msgstr "...ਸੋਧ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+#, fuzzy
+msgid "_Name:"
+msgstr "ਨਾਂ:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>ਜੰਤਰ ਕਿਸਮ:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "ਇੰਕ੍ਰਿਪਟ(_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "ਫਾਇਲ-ਸਿਸਟਮ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "ਮੁੜ-ਫਾਰਮੈਟ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "...ਸੋਧ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "ਰੇਡ ਜੰਤਰ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
+msgid "_Update Settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:969
+msgid ""
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
+msgid ""
+"This device is encrypted and cannot be read without a valid passphrase. You "
+"may unlock it below."
+msgstr ""
+"ਇਹ ਜੰਤਰ ਇਨਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਗੁਪਤਕੋਡ ਤੋਂ ਬਿਨਾਂ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਹੇਠਾਂ ਲਾਕ ਖੋਲ ਸਕਦੇ ਹੋ।"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Passphrase:"
+msgstr "ਵਾਕ:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Unlock"
+msgstr "ਅਣਲਾਕ(_U)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
+msgid ""
+"This device cannot be edited directly. You can remove it or select a "
+"different device."
+msgstr "ਇਹ ਜੰਤਰ ਸਿੱਧਾ ਨਹੀਂ ਸੋਧਿਆ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਇਸਨੂੰ ਹਟਾ ਸਕਦੇ ਹੋ ਜਾਂ ਵੱਖਰਾ ਜੰਤਰ ਚੁਣੋ।"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
+msgid "_Reset All"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
+msgid ""
+"Please select the network interface which is connected to your FCoE switch."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_NIC:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use _DCB"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use auto _vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Add FCoE Disk(s)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
+msgid ""
+"The following error occurred while attempting to add an FCoE SAN.  Please "
+"check your configuration and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
+msgid "ADD iSCSI STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
+msgid ""
+"To use iSCSI disks, you must provide the address of your iSCSI target and "
+"the iSCSI initiator name you've configured for your host."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Target IP Address:"
+msgstr "IP ਐਡਰੈਸ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "iSCSI _Initiator Name:"
+msgstr "ਇੱਕ iSCSI ਇੰਨੀਸ਼ੀਏਟਰ ਨਾਂ ਦੇਣਾ ਜਰੂਰੀ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
+msgid "No credentials (discovery authentication disabled)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
+msgid "CHAP pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
+msgid "CHAP pair and a reverse pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Discovery Authentication Type:"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
+#, fuzzy
+msgid ""
+"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
+"a8675309</span>"
+msgstr "<span size=\"small\"><b>ਜਿਵੇਂ:</b> squid.mysite.org:3128</span>"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Username:"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP User_name:"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
+msgid "Discovering iSCSI targets.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
+msgid ""
+"The following error occurred discovering iSCSI targets.  Please double check "
+"your authorization information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Bind targets to network interfaces"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
+#, fuzzy
+msgid "Node Name"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
+msgid "Interface"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
+msgid "_Node login authentication type:"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
+msgid "Use the credentials from discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC ਪਾਸਵਰਡ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
+msgid "_Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
+msgid ""
+"The following error occurred logging into the selected iSCSI node.  Please "
+"double check your authorization information and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
+msgid "Retry _Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "ਜੰਤਰ:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
+msgid "SELECTED DISKS"
+msgstr "ਚੁਣੀਆਂ ਡਿਸਕਾਂ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
+msgid "Boot"
+msgstr "ਬੂਟ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
+msgid "Description"
+msgstr "ਵੇਰਵਾ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ਖਾਲੀ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
+msgid "Disk summary goes here"
+msgstr "ਡਿਸਕ ਸਾਰ ਇੱਥੇ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "ਇਹ ਹਟਾਓ(_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "ਚੁਣੋ(_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGURE MOUNT POINT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "ਇੱਕ ਜਾਂ ਜਿਆਦਾ ਡਿਸਕਾਂ ਚੁਣੋ ਜਿਨਾਂ ਤੇ ਜੰਤਰ ਹੋ ਸਕਦਾ ਹੈ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
 msgid "_Add mount point"
 msgstr "ਮਾਊਂਟ ਪੁਆਇੰਟ ਸ਼ਾਮਿਲ(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
 msgstr "<b>ਚਾਹੀਦੀ ਸਮਰੱਥਾ:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
 msgstr "<b>ਮਾਊਂਟ ਪੁਆਇੰਟ:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
 msgid "ADD A NEW MOUNT POINT"
 msgstr "ਨਵਾਂ ਮਾਊਂਟ ਪੁਆਇੰਟ ਸ਼ਾਮਿਲ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
 msgid ""
 "More customization options are available\n"
 "after creating the mount point below."
 msgstr "ਹੇਠਾਂ ਮਾਊਂਟ ਪੁਆਇੰਟ ਬਣਾਉਣ ਦੇ ਬਾਅਦ ਹੋਰ ਕਸਟਮਾਈਜ਼ੇਸ਼ਨ ਚੋਣਾਂ ਉਪਲੱਬਧ ਹੁੰਦੀਆਂ ਹਨ।"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
 msgid ""
 "That mount point is already in\n"
 "use.  Try something else?"
@@ -3572,429 +5526,152 @@ msgstr ""
 "ਇਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ\n"
 "ਜਾ ਰਿਹਾ ਹੈ। ਕੁਝ ਹੋਰ ਹੋਰ ਵਰਤੋਂ?"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
 msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
 msgstr "ਜਿਵੇਂ: \"20 GB\", \"500mb\" (ਕੌਮੇ ਨਹੀਂ ਪਾਉਣੇ)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "ਇਹ ਹਟਾਓ(_D)"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
 #, fuzzy
 msgid "CONFIGURE CONTAINER"
 msgstr "CONFIGURE MOUNT POINT"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
 #, fuzzy
 msgid ""
 "Please create a name for this container and select at least one disk below."
 msgstr "ਆਪਣੇ ਵਾਲੀਆਮ ਗਰੁੱਪ ਲਈ ਇੱਕ ਨਾਂ ਬਣਾਓ ਅਤੇ  ਹੇਠਾਂ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਡਿਸਕ ਚੁਣੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ਖਾਲੀ"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "ਨਾਂ:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
 #, fuzzy
 msgid "RAID Level:"
 msgstr "ਰੇਡ ਜੰਤਰ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
 #, fuzzy
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ(_E)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "ਠੀਕ ਮਾਊਂਟ ਪੁਆਇੰਟ ਦਿਉ ਜੀ।"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "Si_ze policy:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
 msgid "Automatic"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
 msgid "As large as possible"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
 msgid "Fixed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
-msgid "Selected Device"
-msgstr "ਚੁਣੇ ਜੰਤਰ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
-msgid "Device description"
-msgstr "ਜੰਤਰ ਵੇਰਵਾ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-#, fuzzy
-msgid "<b>_Label:</b>"
-msgstr "<b>ਲੇਬਲ:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-#, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>ਜੰਤਰ ਕਿਸਮ:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>ਫਾਇਲ ਸਿਸਟਮ:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "ਇੰਕ੍ਰਿਪਟ(_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "ਮੁੜ-ਫਾਰਮੈਟ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
-#, fuzzy
-msgid "_Modify..."
-msgstr "...ਸੋਧ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
-#, fuzzy
-msgid "R_AID Level:"
-msgstr "ਰੇਡ ਜੰਤਰ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
-msgid "_Update Settings"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD ਜੰਤਰ ਫਾਰਮੈਟ ਹੋ ਰਿਹਾ ਹੈ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
 msgid ""
-"This device is encrypted and cannot be read without a valid passphrase. You "
-"may unlock it below."
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
 msgstr ""
-"ਇਹ ਜੰਤਰ ਇਨਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਗੁਪਤਕੋਡ ਤੋਂ ਬਿਨਾਂ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਹੇਠਾਂ ਲਾਕ ਖੋਲ ਸਕਦੇ ਹੋ।"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
-#, fuzzy
-msgid "_Passphrase:"
-msgstr "ਵਾਕ:"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
-msgid "_Unlock"
-msgstr "ਅਣਲਾਕ(_U)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
 msgid ""
-"This device cannot be edited directly. You can remove it or select a "
-"different device."
-msgstr "ਇਹ ਜੰਤਰ ਸਿੱਧਾ ਨਹੀਂ ਸੋਧਿਆ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਇਸਨੂੰ ਹਟਾ ਸਕਦੇ ਹੋ ਜਾਂ ਵੱਖਰਾ ਜੰਤਰ ਚੁਣੋ।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "ਨਵਾਂ ਮਾਊਂਟਪੁਆਂਇਟ ਜੋੜੋ।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "ਚੁਣਿਆ ਮਾਊਂਟਪੁਆਂਇਟ ਹਟਾਓ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "ਚੁਣੇ ਮਾਊਂਟਪੁਆਂਇਟ ਸੰਰਚਿਤ ਕਰੋ।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "...ਸੰਰਚਨਾ(_C)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ ਫੇਲ ਹੋਈ: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "ਮੱਦਦ ਲਈ ਦਬਾਓ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "ਮੱਦਦ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ਉਪਲੱਬਧ ਥਾਂ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ਕੁੱਲ ਥਾਂ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
-msgid "_Reset All"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "ਚੁਣੋ(_S)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGURE MOUNT POINT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "ਇੱਕ ਜਾਂ ਜਿਆਦਾ ਡਿਸਕਾਂ ਚੁਣੋ ਜਿਨਾਂ ਤੇ ਜੰਤਰ ਹੋ ਸਕਦਾ ਹੈ।"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
 msgid ""
-"Please select the network interface which is connected to your FCoE switch."
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
-msgid "_NIC:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
-msgid "Use _DCB"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
-msgid "Use auto _vlan"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
-msgid "_Add FCoE Disk(s)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
-msgid ""
-"The following error occurred while attempting to add an FCoE SAN.  Please "
-"check your configuration and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
-msgid "ADD iSCSI STORAGE TARGET"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
-msgid ""
-"To use iSCSI disks, you must provide the address of your iSCSI target and "
-"the iSCSI initiator name you've configured for your host."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
-#, fuzzy
-msgid "_Target IP Address:"
-msgstr "IP ਐਡਰੈਸ"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
-#, fuzzy
-msgid "iSCSI _Initiator Name:"
-msgstr "ਇੱਕ iSCSI ਇੰਨੀਸ਼ੀਏਟਰ ਨਾਂ ਦੇਣਾ ਜਰੂਰੀ ਹੈ"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
-msgid "No credentials (discovery authentication disabled)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
-msgid "CHAP pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
-msgid "CHAP pair and a reverse pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
-#, fuzzy
-msgid "_Discovery Authentication Type:"
-msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
-#, fuzzy
-msgid ""
-"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
-"a8675309</span>"
-msgstr "<span size=\"small\"><b>ਜਿਵੇਂ:</b> squid.mysite.org:3128</span>"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
-#, fuzzy
-msgid "CHAP _Username:"
-msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
-#, fuzzy
-msgid "CHAP _Password:"
-msgstr "VNC ਪਾਸਵਰਡ"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
-msgid "Reverse CHAP User_name:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
-msgid "Reverse CHAP Pass_word:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
-msgid "_Start Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
-msgid "Discovering iSCSI targets.  This may take a moment..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
-msgid ""
-"The following error occurred discovering iSCSI targets.  Please double check "
-"your authorization information and try again."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
-msgid "_Retry Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
-msgid "_Bind targets to network interfaces"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
-#, fuzzy
-msgid "Node Name"
-msgstr "ਨੈੱਟਵਰਕ ਨਾਂ"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
-msgid "Interface"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
-#, fuzzy
-msgid "_Node login authentication type:"
-msgstr "ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ(_U)"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
-msgid "Use the credentials from discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
-msgid "_Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
-msgid ""
-"The following error occurred logging into the selected iSCSI node.  Please "
-"double check your authorization information and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
-msgid "Retry _Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
-msgid "SELECTED DISKS"
-msgstr "ਚੁਣੀਆਂ ਡਿਸਕਾਂ"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
-msgid "_Close"
-msgstr "ਬੰਦ ਕਰੋ(_C)"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
-msgid "Boot"
-msgstr "ਬੂਟ"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
-msgid "Description"
-msgstr "ਵੇਰਵਾ"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr "ਹਟਾਓ(_R)"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
-msgid "Disk summary goes here"
-msgstr "ਡਿਸਕ ਸਾਰ ਇੱਥੇ ਹੈ"
-
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਦੇ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ। ਵੇਰਵਾ ਹੇਠਾਂ ਦਿੱਤਾ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ਡਿਸਕ ਇੰਕ੍ਰਪਸ਼ਨ ਵਾਕ"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "ਵਾਕ ਸੰਭਾਲੋ"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ਡਿਸਕ ਇੰਕ੍ਰਪਸ਼ਨ ਵਾਕ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4003,7 +5680,19 @@ msgstr ""
 "ਤੁਸੀਂ ਆਪਣਾ ਕੁਝ ਡਾਟਾ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਚੁਣਿਆ ਹੈ। ਤੁਹਾਨੂੰ ਗੁਪਤਕੋਡ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ ਜੋ ਤੁਸੀਂ ਡਾਟਾ "
 "ਪੜ੍ਹਨ ਵੇਲੇ ਵਰਤੋਗੇ।"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "ਵਾਕ:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "ਪੁਸ਼ਟੀ:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4012,117 +5701,172 @@ msgstr ""
 "ਚੇਤਾਵਨੀ: ਤੁਹਾਡਾ ਮੌਜੂਦਾ ਕੀਬੋਰਡ ਲੇਆਊਟ <b>%s</b>ਹੈ। ਜੇ ਤੁਸੀਂ ਆਪਣਾ ਕੀਬੋਰਡ ਲੇਆਊਟ ਤਬਦੀਲ ਕਰਦੇ ਹੋ, "
 "ਤੁਸੀਂ ਇੰਸਟਾਲ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਡਿਸਕ ਡੀਕ੍ਰਿਪਟ ਨਹੀਂ ਕਰ ਸਕਦੇ।"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਡਿਸਕ ਥਾਂ"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ਠੀਕ"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_Cs)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਥਾਂ(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਡਿਸਕ ਥਾਂ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "ਵੇਰਵਾ ਇੱਥੇ ਹੈ।"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "ਫਾਇਲ-ਸਿਸਟਮ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ ਥਾਂ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "ਕਾਰਵਾਈ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "ਰੱਖੋ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "ਹਟਾਓ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "ਸੁੰਘੜੋ"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "ਪਸੰਦੀਦਾ ਪਾਰਟੀਸ਼ਨ ਦੀ ਚੋਣ ਕੀਤੀ ਗਈ"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "ਬਦਲਾਅ ਲਾਗੂ ਕਰੋ(_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "ਜੰਤਰ:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "ਮਾਊਂਟ ਪੁਆਇੰਟ ਸ਼ਾਮਿਲ(_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ(_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "ਨਹੀਂ(_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "ਹਾਂ(_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4130,50 +5874,50 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ\n"
 "ਬੰਦ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਣਕਾਰੀ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸ਼ੁਰੂ(_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "ਸੰਰਚਨਾ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"ਹੁਣ %s ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੋ ਗਿਆ, ਪਰ ਕੁਝ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਹਾਲੇ ਲੋੜ ਹੈ।\n"
-"ਇਹ ਪੂਰੀ ਕਰੋ ਅਤੇ ਤਦ ਸੰਰਚਨਾ ਪੂਰੀ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "ਸੰਰਚਨਾ ਪੂਰੀ(_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੋ ਗਿਆ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਵਲੋਂ ਵਰਤਣ\n"
-"ਲਈ ਤਿਆਰ ਹੈ। ਇਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "ਮੁਡ਼ ਚਾਲੂ(_R)"
 
@@ -4189,16 +5933,16 @@ msgstr "ਇੰਸਟਾਲ"
 msgid "Install the live CD to your hard disk"
 msgstr "ਆਪਣੀ ਹਾਰਡ ਡਰਾਈਵ ਤੇ ਲਾਈਵ CD ਇੰਸਟਾਲ ਕਰੋ"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "ਹਾਰਡ ਡਰਾਈਵ ਤੇ ਇੰਸਟਾਲ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "ਫੇਡੋਰਾ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4206,24 +5950,25 @@ msgid ""
 msgstr ""
 "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s MB ਮੈਮੋਰੀ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਇਸ ਮਸ਼ੀਨ ਉੱਪਰ ਸਿਰਫ %s MB ਹੈ।\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s ਗਰਾਫੀਕਲ ਇੰਸਟਾਲਰ ਲਈ %s MB ਮੈਮੋਰੀ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਕੋਲ ਸਿਰਫ %s MB ਹੈ।"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "ਲੋੜੀਂਦੀ RAM ਨਹੀਂ ਹੈ"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4237,24 +5982,24 @@ msgstr ""
 "\n"
 " ਰੂਟ ਟਰਮੀਨਲ ਤੋਂ।"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " ਟੈਕਸਟ ਮੋਡ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ।"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "ਗਲਤੀ"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY ਵੇਰੀਏਬਲ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਟੈਕਸਟ ਮੋਡ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ!"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ਗਰਾਫੀਕਲ ਇੰਸਟਾਲੇਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਟੈਕਸਟ ਮੋਡ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ।"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4264,20 +6009,20 @@ msgstr ""
 "ਟੈਕਸਟ ਢੰਗ ਵਿੱਚ ਸੀਮਿਤ ਇੰਸਟਾਲੇਸ਼ਨ ਚੋਣਾਂ ਦਿੱਤੀਆਂ ਗਈਆਂ ਹਨ। ਇਹ ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਸੰਦੀਦਾ ਖਾਕਾ ਜਾਂ ਪੈਕੇਜ "
 "ਚੋਣ ਨਿਰਧਾਰਤ ਨਹੀਂ ਕਰਨ ਦਿੰਦਾ। ਕੀ ਤੁਸੀਂ VNC ਢੰਗ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "ਇੰਸਟਾਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ssh install@%s ਵਰਤੋਂ।"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਰੱਖਣ ਲਈ ssh install@<host> ਕਰੋ।"
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "ਫੇਡੋਰਾ ਵਰਤੋ"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4287,7 +6032,7 @@ msgstr ""
 "ਤੁਸੀਂ ਫੇਡੋਰਾ ਹੁਣੇ ਇੰਸਟਾਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਅਦ ਵਿੱਚ ਕਦੇ ਵੀ ਸਰਗਰਮੀਆਂ ਵਿੱਚੋਂ \"ਹਾਰਡ ਡਰਾਇਵਰ ਉੱਤੇ "
 "ਇੰਸਟਾਲ ਕਰੋ\" ਰਾਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4295,10 +6040,289 @@ msgstr ""
 "ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਕਦੇ ਵੀ ਸਰਗਰਮੀਆਂ ਝਲਕ ਵਿੱਚੋਂ\n"
 "\"ਹਾਰਡ ਡਰਾਇਵਰ ਉੱਤੇ ਇੰਸਟਾਲ ਕਰੋ\" ਰਾਹੀਂ ਚੁਣ ਸਕਦੇ ਹੋ।"
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "ਹੋਸਟ-ਨਾਂ ਇਹਨਾਂ ਅੱਖਰਾ 'a-z' ਜਾਂ 'A-Z' ਜਾਂ '0-9' ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੇ ਫਾਇਲ ਸਿਸਟਮਾਂ ਉੱਤੇ ਹੋਰ ਥਾਂ ਲਈ ਹੈ:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "ਕਮਾਂਡ ਲਾਈਨ ਮੋਡ ਵਿੱਚ ਸਵਾਲ ਨਹੀਂ ਹੋ ਸਕਦਾ!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਗਲਤ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "...ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "ਕੋਈ ਚੋਣ ਨਹੀਂ ਕੀਤੀ"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "ਫਿਰਮਵੇਅਰ ਗੁੰਮ ਹੈ"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#~ msgid "column"
+#~ msgstr "ਕਾਲਮ"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>ਭਾਗ ਕਿਸਮ:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>ਪਰਾਕਸੀ URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>ਯੂਜ਼ਰ ਨਾਂ</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>ਪਾਸਵਰਡ</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "ਉਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਗਲਤ ਹੈ। ਵੱਖਰੀ ਤਰ੍ਹਾਂ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>ਲੇਬਲ:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>ਫਾਇਲ ਸਿਸਟਮ:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "ਰੇਡ ਜੰਤਰ"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "ਚੁਣੇ ਮਾਊਂਟਪੁਆਂਇਟ ਸੰਰਚਿਤ ਕਰੋ।"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "ਮੱਦਦ ਲਈ ਦਬਾਓ"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ਉਪਲੱਬਧ ਥਾਂ</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ਕੁੱਲ ਥਾਂ</span>"
+
 #~ msgid "Completed"
 #~ msgstr "ਮੁਕੰਮਲ"
 
@@ -4349,40 +6373,9 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "Install on System"
 #~ msgstr "ਸਿਸਟਮ 'ਤੇ ਇੰਸਟਾਲ ਕਰੋ"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "ਇੰਸਟਾਲੇਸ਼ਨ ਰਿਪੋਜ਼ਟਰੀ ਸੈਟ ਅੱਪ ਕਰਨ ਦੌਰਾਨ ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਆਈ:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਨਹੀਂ ਰਹਿ ਸਕਦੀ ਹੈ।"
-
 #~ msgid "Exit installer"
 #~ msgstr "ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "ਇੰਸਟਾਲੇਸ਼ਨ ਰੁਕ ਗਈ ਸੀ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਹਾਰਡਵੇਅਰ ਨਾਲ ਸਮੱਸਿਆ ਜਾਪਦੀ ਹੈ। ਸਹੀਂ ਗਲਤੀ ਸੁਨੇਹਾ ਹੈ:\n"
-#~ "\n"
-#~ " %s।\n"
-#~ "\n"
-#~ " ਇੰਸਟਾਲਰ ਹੁਣ ਬੰਦ ਹੋਵੇਗਾ।"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "ਹਾਰਡਵੇਅਰ ਗਲਤੀ ਆਈ ਹੈ"
-
 #~ msgid "_Exit installer"
 #~ msgstr "ਇੰਸਟਾਲਰ ਬੰਦ ਕਰੋ(_E)"
 
@@ -4672,9 +6665,6 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "Software Development"
 #~ msgstr "ਸਾਫਟਵੇਅਰ ਡਿਵੈਲਪਮੈਂਟ"
 
-#~ msgid "Web Server"
-#~ msgstr "ਵੈੱਬ ਸਰਵਰ"
-
 #~ msgid "Minimal"
 #~ msgstr "ਘੱਟੋ-ਘੱਟ"
 
@@ -4717,48 +6707,6 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ "ਇਹ ਜੰਤਰ ਇੱਕ ਫੈਲਿਆ ਭਾਗ ਹੈ, ਜਿਸ ਵਿੱਚ ਲਾਜ਼ੀਕਲ ਭਾਗ ਹਨ, ਜੋ ਹਟਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "ਤੁਸੀਂ ਇੱਕ ਰੂਟ (root)ਪਾਰਟੀਸ਼ਨ (/) ਨਹੀਂ ਦਿੱਤਾ ਹੈ, ਜੋ ਕਿ %s ਦੀ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ "
-#~ "ਜ਼ਰੂਰੀ ਹੈ।"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "ਤੁਸੀਂ ਰੂਟ (root) ਪਾਰਟੀਸ਼ਨ 250 ਮੈਗਾਬਾਈਟ ਤੋਂ ਘੱਟ ਹੈ, ਜੋ ਕਿ ਇੰਸਟਾਲ %s ਲਈ ਬਹੁਤ ਘੱਟ ਹੈ।"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "ਇਹ ਪਲੇਟਫਾਰਮ ਲਈ /boot ਵਾਸਤੇ ਖਾਸ ਪਾਰਟੀਸ਼ਨ ਜਾਂ ਲਾਜ਼ੀਕਲ ਵਾਲੀਅਮ ਚਾਹੀਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ /"
-#~ "boot ਵਾਲੀਅਮ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਤੁਹਾਨੂੰ / ਨੂੰ ਗ਼ੈਰ-LVM ਪਾਰਟੀਸ਼ਨ ਉੱਤੇ ਰੱਖਣਾ ਪਵੇਗਾ।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "ਤੁਹਾਡਾ %(mount)s ਪਾਰਟੀਸ਼ਨ %(size)s ਮੈਗਾਬਾਈਟ ਤੋਂ ਘੱਟ ਹੈ, ਜੋ ਕਿ ਸਧਾਰਨ "
-#~ "%(productName)s ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸਿਫ਼ਾਰਸ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "ਤੁਹਾਡਾ %(mount)s ਪਾਰਟੀਸ਼ਨ  %(format)s ਫਾਰਮੈਟ ਲਈ ਬਹੁਤ ਛੋਟਾ ਹੈ (ਮਨਜ਼ੂਰ ਆਕਾਰ  "
-#~ "%(minSize)d MB ਤੋਂ %(maxSize)d MB ਹੈ)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "ਤੁਹਾਡਾ %(mount)s ਪਾਰਟੀਸ਼ਨ  %(format)s ਫਾਰਮੈਟ ਲਈ ਬਹੁਤ ਵੱਡਾ ਹੈ (ਮਨਜ਼ੂਰ ਆਕਾਰ  "
-#~ "%(minSize)d MB ਤੋਂ %(maxSize)d MB ਹੈ)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4774,52 +6722,6 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "ਤੁਸੀਂ ਸਟੇਜ1 ਟਾਰਗੇਟ ਜੰਤਰ ਲਈ ਬੂਟ-ਲੋਡਰ ਨਹੀਂ ਬਣਾਇਆ ਹੈ।"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "ਤੁਸੀਂ ਬੂਟ ਭਾਗ ਨਹੀਂ ਬਣਾਇਆ ਹੈ।"
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "ਤੁਹਾਡੇ BIOS-ਅਧਾਰਿਤ ਸਿਸਟਮ ਲਈ %s ਦੇ ਨਵੇਂ ਡਿਸਕ ਲੇਬਲ ਫਾਰਮੈਟ (GPT) ਨੂੰ ਬੂਟ ਕਰਨ ਲਈ ਖਾਸ "
-#~ "ਪਾਰਟੀਸ਼ਨ ਦੀ ਲੋੜ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ, 1MB 'BIOS Boot' ਕਿਸਮ ਦਾ ਪਾਰਟੀਸ਼ਨ ਬਣਾਉ ਜੀ।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "ਤੁਸੀਂ ਸਵੈਪ (swap) ਪਾਰਟੀਸ਼ਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਸਵੈਪ ਪਾਰਟੀਸ਼ਨ ਦੇ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖਣ "
-#~ "ਲਈ %(requiredMem)s MB ਦੀ ਮੈਮੋਰੀ ਚਾਹੀਦੀ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ %(installedMem)s MB ਹੀ "
-#~ "ਹੈ।"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "ਤੁਸੀਂ ਇੱਕ ਸਵੈਪ ਪਾਰਟੀਸ਼ਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਭਾਵੇਂ ਕਿ ਇਹ ਹਰ ਹਾਲਤ ਵਿੱਚ ਕੋਈ ਜ਼ਰੂਰੀ ਨਹੀਂ ਹੈ, ਪਰ ਇਹ "
-#~ "ਸਭ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿੱਚ ਵਧੀਆ ਕਾਰਗੁਜ਼ਾਰੀ ਲਈ ਮਹੱਤਵਪੂਰਨ ਹੈ।"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "ਤੁਹਾਡੇ ਸਵੈਪ ਜੰਤਰਾਂ ਵਿੱਚੋਂ ਇੱਕ ਲਈ UUID ਨਹੀਂ ਹੈ, ਜੋ ਕਿ mkswap ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨਾਲ ਬਣਾਈ ਸਵੈਪ "
-#~ "ਥਾਂ ਵਿੱਚ ਆਮ ਹੈ। ਇਹ ਜੰਤਰਾਂ ਨੂੰ /etc/fstab ਵਿੱਚ ਜੰਤਰ ਮਾਰਗ ਨਾਲ ਦਰਸਾਇਆ ਜਾਵੇਗਾ, ਜੋ ਕਿ ਠੀਕ "
-#~ "ਨਹੀਂ ਹੈ, ਕਿਉਂਕਿ ਜੰਤਰ ਮਾਰਗ ਕਈ ਮਾਰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹਨ।"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "ਇਹ ਮਾਊਂਟ ਪੁਆਂਇਟ ਗਲਤ ਹੈ।  %s ਡਾਇਰੈਕਟਰੀ / ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਹੋਣੀ ਜਰੂਰੀ ਹੈ।"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "ਮਾਊਂਟ ਪੁਆਇੰਟ %s ਲੀਨਕਸ ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਹੋਣਾ ਜਰੂਰੀ ਹੈ।"
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s ਉੱਤੇ ਲੀਨਕਸ"
 
@@ -4829,11 +6731,6 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(arch)s ਨਾਲ %(product)s ਲੀਨਕਸ %(version)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD ਜੰਤਰ ਫਾਰਮੈਟ ਹੋ ਰਿਹਾ ਹੈ"
-#~ msgstr[1] "DASD ਜੰਤਰ ਫਾਰਮੈਟ ਹੋ ਰਹੇ ਹਨ"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD ਜੰਤਰ ਨੂੰ ਲੀਨਕਸ ਨਾਲ ਵਰਤਣ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
@@ -5098,9 +6995,6 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "Error setting root password"
 #~ msgstr "ਰੂਟ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "ਤੁਹਾਨੂੰ ਪਾਸਵਰਡ ਦੇਣਾ ਅਤੇ ਪੁਸ਼ਟੀ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"
-
 #~ msgid "_Remove Packages"
 #~ msgstr "ਪੈਕੇਜ ਹਟਾਓ(_R)"
 
@@ -5132,24 +7026,12 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "%s of %s"
 #~ msgstr "%s ਵਿੱਚੋਂ %1s"
 
-#~ msgid "Region:"
-#~ msgstr "ਖੇਤਰ"
-
-#~ msgid "City:"
-#~ msgstr "ਸ਼ਹਿਰ:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "23-ਘੰਟੇ"
-
-#~ msgid "AM/PM"
-#~ msgstr "ਸਵੇਰ/ਸ਼ਾਮ"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "ਆਪਣੇ ਐਡ-ਆਨ ਚੁਣੋ"
 
@@ -5233,9 +7115,6 @@ msgstr "ਬੰਦ ਕਰੋ"
 #~ msgid "configureButton"
 #~ msgstr "ਸੰਰਚਨਾ-ਬਟਨ"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "ਵਿਭਾਗੀਕਰਨ ਮੁਕੰਮਲ(_F)"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "ਵਾਲੀਅਮ ਗਰੁੱਪ ਸੰਰਚਨਾ"
 
diff --git a/anaconda/po/pl.po b/anaconda/po/pl.po
index 05b5de1..c9b70a9 100644
--- a/anaconda/po/pl.po
+++ b/anaconda/po/pl.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-05 00:04+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -29,11 +29,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "system plików /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -42,7 +42,7 @@ msgstr ""
 "Zestawy RAID zawierające \"%s\" muszą być jednego z następujących poziomów "
 "RAID: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -51,7 +51,7 @@ msgstr ""
 "Zestawy RAID zawierające \"%s\" muszą posiadać jedną z poniższych wersji "
 "metadanych: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -60,108 +60,129 @@ msgstr ""
 "Zestawy RAID zawierające \"%s\" muszą posiadać jeden z poniższych typów "
 "urządzeń: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s musi posiadać jeden z poniższych typów etykiet dysków: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s nie może być typu %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s musi być zamontowane na jednym z %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s musi mieć rozmiar między %d a %d MB"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s nie może być mniejsze niż %d MB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s nie może być większe niż %d MB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s musi znajdować się w pierwszych %d MB dysku."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s musi być partycją podstawową."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s nie może znajdować się na zaszyfrowanym urządzeniu blokowym."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s nie może być typu %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s może nie posiadać wystarczającej ilości miejsca, aby GRUB2 mógł osadzić "
 "core.img podczas używania systemu plików %s na %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Uruchom VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Użyj trybu tekstowego"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Hasło jest ustawione."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Hasła się nie zgadzają."
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Podano słabe hasło: %s. Proszę nacisnąć przycisk Gotowe ponownie, aby użyć "
 "je mimo to."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -169,87 +190,335 @@ msgstr ""
 "je mimo to."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Słabe"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Dostateczne"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Dobre"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Silne"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Tak"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nie"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Wystąpił poniższy błąd podczas ustawiania repozytorium instalacji:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Instalacja nie może być kontynuowana."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Wystąpił poniższy błąd podczas ustawiania repozytorium instalacji:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Instalacja nie może być kontynuowana."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Poniższe oprogramowanie zaznaczone do instalacji posiada błędy. Jest to "
+"prawdopodobnie spowodowane\n"
+"przez błąd w źródle instalacji. Można spróbować usunąć te pakiety z "
+"instalacji, zmienić źródło\n"
+"instalacji lub zakończyć instalator."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Instalacja została zatrzymana z powodu błędu sprzętu. Komunikat błędu:\n"
+"\n"
+"%s.\n"
+"\n"
+" Instalator zostanie zakończony."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Instalacja została zatrzymana z powodu błędu sprzętu. Komunikat błędu:\n"
+"\n"
+"%s.\n"
+"\n"
+" Instalator zostanie zakończony."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Wystąpił błąd sprzętu"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Instalacja została zatrzymana z powodu błędu sprzętu. Komunikat błędu:\n"
+"\n"
+"%s.\n"
+"\n"
+" Instalator zostanie zakończony."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Konfigurowanie zainstalowanego systemu"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Zapisywanie konfiguracji sieci"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Tworzenie użytkowników"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Konfigurowanie zainstalowanego systemu"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Wykonywanie skryptów przedinstalacyjnych"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Ustawianie źródła instalacji..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Instalowanie programu startowego"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Wykonywanie ustawień poinstalacyjnych"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Instalowanie programu startowego"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Certyfikat escrow %s wymaga sieci."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -261,32 +530,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "Brak %s. Nie można ustawić zapory sieciowej."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "Brak %s. Nie można ustawić zapory sieciowej."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Ten system plików nie obsługuje etykiet."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Podana nazwa %s jest już używana."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Nawa grupy woluminów %s jest już używana. Zmiany nie zostaną zapisane."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Wykonywanie skryptów przedinstalacyjnych"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Nazwa komputera nie może wynosić wartość None lub być pustym ciągiem."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Nazwa komputera musi składać się z 255 znaków lub mniej."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Nazwa komputera musi rozpoczynać się od prawidłowego znaku z zakresu \"a-z"
-"\", \"A-Z\" lub \"0-9\""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -296,55 +855,55 @@ msgstr ""
 "lub \".\", części między kropkami muszą coś zawierać i nie może się zaczynać "
 "lub kończyć znakiem \"-\"."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Rozłączanie..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Połączono przewodowe (%s)"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Bezprzewodowe połączono z %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Nie połączono"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Brak dostępnych urządzeń sieciowych"
 
@@ -353,7 +912,12 @@ msgstr "Brak dostępnych urządzeń sieciowych"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "INSTALACJA SYSTEMU %(productName)s %(productVersion)s"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nowa instalacja systemu %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Należy wykonać polecenie %s, aby odmontować system po ukończeniu."
@@ -368,8 +932,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "Nie można odnaleźć /bin/sh do wykonania. Powłoka nie zostanie uruchomiona"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Ratowanie systemu"
 
@@ -416,22 +980,16 @@ msgstr "System do ratowania"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Które urządzenie zawiera partycję root instalacji?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Zakończ"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 "Po wyjściu z powłoki system zostanie automatycznie uruchomiony ponownie."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -441,7 +999,7 @@ msgstr ""
 "Proszę nacisnąć klawisz return, aby uzyskać powłokę, z której będzie można "
 "uruchomić fsck i zamontować partycje. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -462,7 +1020,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -475,31 +1033,247 @@ msgstr ""
 "\n"
 "Naciśnięcie klawisza <return> spowoduje przejście do powłoki."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Brak partycji systemu Linux. Ponowne uruchamianie.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 " Po wyjściu z powłoki system zostanie automatycznie uruchomiony ponownie."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Tryb ratunkowy"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Brak partycji systemu Linux. Naciśnięcie klawisza return spowoduje przejście "
 "do powłoki.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "System został zamontowany w katalogu %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standardowa partycja"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Dysk"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Obszar wymiany (\"swap\") komputera jest używany przez\n"
+"system operacyjny wtedy, gdy zabraknie pamięci."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Obszar startowy (\"boot\") komputera jest miejscem, gdzie\n"
+"przechowywane są pliki wymagane do uruchomienia systemu."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"Obszar \"root\" komputera jest miejscem, gdzie\n"
+"przechowywane są główne pliki systemu i aplikacje."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"Obszar domowy (\"home\") komputera jest miejscem, gdzie\n"
+"przechowywane są wszystkie osobiste dane użytkownika."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Partycja startowa BIOS jest wymagana, aby umożliwić uruchamianie \n"
+"z dysków partycjonowanych jako GPT na sprzęcie typu BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"Partycja startowa PReP jest wymagana jako część konfiguracji\n"
+"programu startowego na niektórych platformach PPC."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Główna partycja ma mniej niż 250 megabajtów, a to zwykle za mało, aby "
+"zainstalować system %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Nie wybrano głównej partycji (\"/\"), która jest niezbędna do kontynuowania "
+"instalacji systemu %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Ta platforma wymaga /boot na oddzielnej partycji lub woluminie logicznym. "
+"Jeśli /boot nie ma znajdować się na własnym woluminie, to należy umieścić / "
+"na oddzielnej partycji nie będącej LVM."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Partycja %(mount)s ma mniej niż %(size)s MB, czyli mniej niż jest zalecane "
+"do zwykłej instalacji systemu %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Partycja %(mount)s jest za mała dla formatowania %(format)s (dozwolony jest "
+"rozmiar od %(minSize)d MB do %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Partycja %(mount)s jest za duża dla formatowania %(format)s (dozwolony jest "
+"rozmiar od %(minSize)d MB do %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+"Dodanie nowego urządzenia się nie powiodło. Kliknięcie wyświetli szczegóły."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Nie utworzono partycji startowej."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Komputer oparty na BIOS-ie wymaga specjalnej partycji do uruchamiania za "
+"pomocą nowego formatu etykiet dysków %s (GPT). Aby kontynuować, proszę "
+"utworzyć partycję typu \"Partycja startowa BIOS\" o rozmiarze 1 MB."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Nie podano partycji wymiany. Wymagane jest %(requiredMem)s MB pamięci, aby "
+"kontynuować instalację bez partycji wymiany, a w komputerze jest tylko "
+"%(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Nie podano partycji wymiany. Chociaż nie zawsze jest ona ściśle wymagana, w "
+"większości przypadków znacznie poprawia wydajność systemu."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Co najmniej jedno z urządzeń wymiany nie posiada UUID, co jest częste w "
+"przypadku przestrzeni wymiany utworzonych używając starszych wersji programu "
+"mkswap. Te urządzenia będą nazywane według ścieżek do nich w pliku /etc/"
+"fstab, co nie jest najlepsze, ponieważ ścieżki te mogą się zmieniać w wielu "
+"okolicznościach. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Ten punkt montowania jest nieprawidłowy. Katalog %s musi znajdować się w "
+"systemie plików /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+"Punkt montowania %s musi znajdować się na systemie plików systemu Linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Hasło:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -616,53 +1390,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Podane hasło VNC nie ma mniej niż 6 znaków.\n"
 "Proszę podać nowe. Pozostawienie pustego pola oznacza brak hasła."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Ustawienie źródła instalacji się nie powiodło"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Błąd podczas pobierania metadanych pakietów..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Brak dostępnych źródeł instalacji"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Instalowanie oprogramowania"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Rozpoczynanie procesu instalacji pakietów"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Wymagane jest więcej miejsca na następujących systemach plików:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Przygotowywanie transakcji ze źródła instalacji"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Instalowanie"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Pobieranie metadanych pakietów..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instalowanie"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Przygotowywanie do instalacji"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Sprawdzanie konfiguracji urządzeń do przechowywania danych..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "DOMYŚLNY TYTUŁ"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALIZACJA"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALIZACJA"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "OPROGRAMOWANIE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "USTAWIENIA UŻYTKOWNIKA"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -671,34 +1530,103 @@ msgstr ""
 "Brak wystarczającej ilości miejsca na systemach plików, aby zmieścić bieżący "
 "wybór oprogramowania. Wymagane jest dodatkowe %s."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Główny ekran instalacji"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Uruchamianie instalacji automatycznej"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Nie można korzystać ze znaku zapytania w trybie wiersza poleceń."
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Proszę wybrać jedno z powyższych [\"q\" zakończy | \"c\" kontynuuje]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Proszę wypełnić wszystkie ekrany przed kontynuowaniem"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Domyślny tytuł ekranu głównego"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Proszę wypełnić wszystkie ekrany przed kontynuowaniem"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Błąd"
 
@@ -722,25 +1650,28 @@ msgstr "tak"
 msgid "no"
 msgstr "nie"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Na pewno zakończyć?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -748,7 +1679,7 @@ msgid ""
 msgstr ""
 "  Proszę wybrać jedno z powyższych [\"q\" zakończy | \"c\" kontynuuje]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -763,221 +1694,260 @@ msgstr ""
 "komputerem z innego i wykonać instalację w trybie graficznym, czy "
 "kontynuować instalację w trybie tekstowym?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Hasło VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Proszę podać hasło VNC. Należy je podać dwukrotnie.\n"
 "Pozostawienie pustego pola oznacza brak hasła."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Hasło: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Hasło (potwierdzenie): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Hasła się nie zgadzają."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Hasło musi zawierać co najmniej sześć znaków."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Hasło musi zawierać co najmniej sześć znaków."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Ustawienia strefy czasowej"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Strefa czasowa nie jest ustawiona."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Dostępne regiony"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Dostępne regiony"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Zapisywanie konfiguracji sieci"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Połączono przewodowe (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Połączono przewodowe (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Nazwa komputera:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Nazwa komputera"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Nazwa komputera"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Nazwa komputera jest nieprawidłowa: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Za_kończ konfigurację"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Brama"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "brak typu w konfiguracji systemu plików"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Konfigurowanie zainstalowanego systemu"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Hasło roota:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Hasło jest ustawione."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Konto roota jest wyłączone."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Hasło nie jest ustawione."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Proszę wybrać nowe hasło roota. Należy je podać dwukrotnie."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Hasło: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Użyj całego miejsca"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Zastąp istniejące systemy Linux"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Użyj wolnego miejsca"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Cel instalacji"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nie wybrano dysku"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 "Błąd podczas sprawdzania konfiguracji urządzeń do przechowywania danych"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr ""
 "Błąd podczas sprawdzania konfiguracji urządzeń do przechowywania danych"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Wybrano automatyczne partycjonowanie"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Wybrano partycjonowanie użytkownika"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -985,39 +1955,61 @@ msgstr ""
 "Nie wykryto dysku. Proszę wyłączyć komputer, podłączyć co najmniej jeden "
 "dysk i uruchomić ponownie, aby ukończyć instalację."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Nie wybrano dysku. Proszę wybrać co najmniej jeden dysk do instalacji."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Wykrywanie urządzeń do przechowywania danych..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "_Wybierz"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 "Tworzenie zaktualizowanej konfiguracji urządzeń do przechowywania danych"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "konfiguracja urządzeń do przechowywania danych się nie powiodła: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Sprawdzanie konfiguracji urządzeń do przechowywania danych..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Opcje automatycznego partycjonowania"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1026,41 +2018,41 @@ msgstr ""
 "Instalacja wymaga partycjonowania dysku twardego. Proszę wybrać, jakiego "
 "miejsca użyć do instalacji."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Konfiguracja schematu partycji"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Konfiguracja schematu partycji"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Ustawienia strefy czasowej"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Strefa czasowa %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Strefa czasowa nie jest ustawiona."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Dostępne strefy czasowe w regionie %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Dostępne regiony"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1069,180 +2061,198 @@ msgstr ""
 "Należy użyć liczb lub podać nazwy bezpośrednio [b wyświetli listę regionów, "
 "q zakończy]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Uruchom VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Postęp instalacji"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Najbliższy serwer źródlany"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Serwer NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Błąd podczas ustawiania źródła oprogramowania"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Nic nie wybrano"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Łączenie..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Napęd CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "Plik _ISO:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Czas sieciowy"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Brak dostępnych źródeł instalacji"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Ustawienie źródła instalacji się nie powiodło"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Błąd podczas pobierania metadanych pakietów..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Brak dostępnych źródeł instalacji"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Serwer NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Opcje montowania NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Ustawienie źródła instalacji się nie powiodło. Proszę sprawdzić adres URL "
 "repozytorium"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "urządzenie zawierające /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Ustawienie źródła instalacji się nie powiodło"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Modyfikuj wybór oprogramowania"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Błąd podczas sprawdzania wyboru oprogramowania"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Nie ustawiono źródła instalacji"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Zmieniono źródło - proszę sprawdzić"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Wybrano oprogramowanie użytkownika"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Nie ustawiono źródła instalacji"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Wybór środowiska"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Użycie uwierzytelniania"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Należy podać i potwierdzić hasło."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Ostrzeżenie"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1258,36 +2268,36 @@ msgstr "W trakcie wykonywania"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tUkończono instalację. Naciśnięcie przycisku Return zakończy"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Domyślny tytuł ekranu"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "testowanie stanu..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Nowe urządzenie"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Hasło (potwierdzenie): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1296,7 +2306,7 @@ msgstr ""
 "Podano słabe hasło: %s. Proszę nacisnąć przycisk Gotowe ponownie, aby użyć "
 "je mimo to."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1305,63 +2315,47 @@ msgstr ""
 "Podano słabe hasło: %s. Proszę nacisnąć przycisk Gotowe ponownie, aby użyć "
 "je mimo to."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Hasło jest ustawione."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Za_kończ instalator"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Pomoc"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nie"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Tak"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "DOMYŚLNY TYTUŁ"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALIZACJA"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALIZACJA"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "OPROGRAMOWANIE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "USTAWIENIA UŻYTKOWNIKA"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1369,7 +2363,11 @@ msgstr ""
 "Proszę wypełnić elementy oznaczone tą ikoną przed kontynuowaniem do "
 "następnego kroku."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Ukończono."
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1378,171 +2376,70 @@ msgstr ""
 "System %s został pomyślnie zainstalowany na komputerze i jest gotowy do "
 "użycia. Należy ponownie uruchomić komputer."
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Ukończono."
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "Za_kończ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nowa instalacja systemu %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"System %s został pomyślnie zainstalowany na komputerze, ale wymagane jest "
+"skonfigurowanie jeszcze kilku rzeczy. \n"
+"Proszę je skonfigurować, a następnie nacisnąć przycisk Zakończ konfigurację."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"System %s został pomyślnie zainstalowany na komputerze i jest gotowy do "
+"użycia. Należy ponownie uruchomić komputer."
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Utwórz nową grupę woluminów..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Proszę utworzyć nazwę dla grupy woluminów i wybrać co najmniej jeden dysk "
-"poniżej."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Grupa woluminów:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "kolumna"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-"Przywrócono konfigurację urządzeń do przechowywania danych z powodu "
-"nieodwracalnego błędu. Kliknięcie wyświetli szczegóły."
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 "Ponowna konfiguracja urządzenia się nie powiodła. Kliknięcie wyświetli "
 "szczegóły."
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Proszę podać prawidłowy punkt montowania."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Punkt montowania jest nieprawidłowy. Proszę spróbować użyć innego."
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Punkt montowania jest już używany. Proszę spróbować użyć innego."
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "Wybrany poziom RAID wymaga więcej dysków, niż obecnie wybrano."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Proszę podać prawidłowy punkt montowania."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Punkt montowania jest nieprawidłowy. Proszę spróbować użyć innego."
+"Storage configuration reset due to unrecoverable error. Click for details."
+msgstr ""
+"Przywrócono konfigurację urządzeń do przechowywania danych z powodu "
+"nieodwracalnego błędu. Kliknięcie wyświetli szczegóły."
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standardowa partycja"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Dysk"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Brak"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Usunięcie także wszystkich innych systemów plików w roocie %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Na pewno usunąć wszystkie dane na urządzeniu %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Na pewno usunąć wszystkie dane na urządzeniu %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "RĘCZNE PARTYCJONOWANIE"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "Wykryto %d urządzenie do przechowywania danych"
 msgstr[1] "Wykryto %d urządzenia do przechowywania danych"
 msgstr[2] "Wykryto %d urządzeń do przechowywania danych"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1551,138 +2448,124 @@ msgstr ""
 "Po utworzeniu punktów montowania dla instalacji\n"
 "systemu %s %s ich szczegóły zostaną tutaj wyświetlone."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Obszar wymiany (\"swap\") komputera jest używany przez\n"
-"system operacyjny wtedy, gdy zabraknie pamięci."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Obszar startowy (\"boot\") komputera jest miejscem, gdzie\n"
-"przechowywane są pliki wymagane do uruchomienia systemu."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"Obszar \"root\" komputera jest miejscem, gdzie\n"
-"przechowywane są główne pliki systemu i aplikacje."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"Obszar domowy (\"home\") komputera jest miejscem, gdzie\n"
-"przechowywane są wszystkie osobiste dane użytkownika."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Partycja startowa BIOS jest wymagana, aby umożliwić uruchamianie \n"
-"z dysków partycjonowanych jako GPT na sprzęcie typu BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"Partycja startowa PReP jest wymagana jako część konfiguracji\n"
-"programu startowego na niektórych platformach PPC."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi musi być na urządzeniu typu %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s musi być na urządzeniu typu %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s nie może być szyfrowane"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Należy utworzyć nowy system plików na głównym urządzeniu."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Urządzenia typu %s wymagają prawidłowego wyboru poziomu RAID."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Żądanie zmiany rozmiaru urządzenia się nie powiodło. Kliknięcie wyświetli "
 "szczegóły."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Żądanie ponownego sformatowania urządzenia się nie powiodło. Kliknięcie "
 "wyświetli szczegóły."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Podana nazwa %s jest już używana."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Ten system plików nie obsługuje etykiet."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nie wybrano dysku"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Rozmiar tego systemu plików nie może być zmieniany."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Błąd podczas sprawdzania konfiguracji urządzeń do przechowywania danych. "
+"Kliknięcie wyświetli więcej informacji."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Błąd podczas sprawdzania konfiguracji urządzeń do przechowywania danych. "
+"Kliknięcie wyświetli więcej informacji."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Dodano nową %s do istniejącego kontenera %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 "Dodanie nowego urządzenia się nie powiodło. Kliknięcie wyświetli szczegóły."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "Ustawiono nieprawidłowy rozmiar partycji. Należy użyć prawidłowej liczby "
 "całkowitej."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "Żądanie usunięcia urządzenia się nie powiodło. Kliknięcie wyświetli "
 "szczegóły."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Nawa grupy woluminów %s jest już używana. Zmiany nie zostaną zapisane."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "wolny system plików"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1691,7 +2574,7 @@ msgstr ""
 "W tej macierzy programowego RAID brakuje %d z %d partycji. Można ją usunąć "
 "lub wybrać inną."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1700,198 +2583,148 @@ msgstr ""
 "W tej grupie woluminów LVM brakuje %d z %d woluminów fizycznych. Można ją "
 "usunąć lub wybrać inną."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nie wybrano dysku."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Brak wystarczającej ilości wolnego miejsca na zaznaczonych dyskach."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 "Automatyczne partycjonowanie się nie powiodło. Kliknięcie wyświetli "
 "szczegóły."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Modyfikuj wybór oprogramowania"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Odblokowanie zaszyfrowanego urządzenia blokowego się nie powiodło. "
 "Kliknięcie wyświetli szczegóły."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATA I CZAS"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Należy najpierw ustawić sieć, jeśli ma być używane NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Nie skonfigurowano działającego serwera NTP"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "CEL INSTALACJI"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "Wykryto %d urządzenie do przechowywania danych"
+msgstr[1] "Wykryto %d urządzenia do przechowywania danych"
+msgstr[2] "Wykryto %d urządzeń do przechowywania danych"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s przełącza układy."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KLAWIATURA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Testowanie konfiguracji układów jest niedostępne."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "testowanie stanu..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Przełączanie układów nie jest skonfigurowane."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "JĘZYK"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Nieznany stan (brak)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Nieznany stan"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Niezarządzane"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Niedostępne"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Brak oprogramowania sprzętowego"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Kabel jest niepodłączony"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Niedostępne"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Rozłączono"
@@ -1916,155 +2749,171 @@ msgstr "Rozłączanie"
 msgid "Connection failed"
 msgstr "Połączenie się nie powiodło"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "niepodłączone"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Bezprzewodowe"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "niepodłączone"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Adres IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Adres IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "Adres IP"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Brak"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Wymagane jest uwierzytelnienie"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Hasło: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "KONFIGURACJA SIECI"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "HASŁO ROOTA"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Hasło jest ustawione."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Hasło roota jest ustawione"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Konto roota jest wyłączone"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Hasło roota nie jest ustawione"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "WYBÓR OPROGRAMOWANIA"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Sprawdzanie zależności oprogramowania..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Błąd podczas sprawdzania zależności oprogramowania"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Pobieranie metadanych pakietów..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Pobieranie metadanych grup..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Sprawdzanie zależności oprogramowania..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Błąd podczas sprawdzania zależności oprogramowania"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Błąd podczas sprawdzania zależności oprogramowania. Kliknięcie wyświetli "
 "więcej informacji."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Poniższe oprogramowanie zaznaczone do instalacji posiada błędy. Jest to "
 "prawdopodobnie spowodowane\n"
@@ -2072,48 +2921,79 @@ msgstr ""
 "instalacji, zmienić źródło\n"
 "instalacji lub zakończyć instalator."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Anuluj"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "Za_kończ"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Modyfikuj źródło oprogramowania"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Modyfikuj wybór oprogramowania"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Ustawianie źródła instalacji..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Błąd podczas pobierania metadanych pakietów..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Wymagane jest uwierzytelnienie"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Z tego nośnika można instalować."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Z tego nośnika nie można instalować."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ŹRÓDŁO INSTALACJI"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Ustawienie źródła instalacji się nie powiodło. Proszę sprawdzić adres URL "
 "repozytorium"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Błąd podczas ustawiania repozytorium"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Błąd podczas ustawiania źródła oprogramowania"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2121,98 +3001,80 @@ msgstr ""
 "Ustawienie źródła instalacji się nie powiodło. Proszę sprawdzić adres URL "
 "repozytorium i ustawienia pośrednika"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Błąd podczas ustawiania repozytorium"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Błąd podczas ustawiania źródła oprogramowania"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Urządzenie:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Serwer NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Nieprawidłowa strefa czasowa"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Nieprawidłowa strefa czasowa"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Proszę czekać, metadane oprogramowania są jeszcze wczytywane."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Wybrane dyski posiadają następujące ilości wolnego miejsca:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Proszę czekać, metadane oprogramowania są jeszcze wczytywane."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2222,7 +3084,7 @@ msgstr ""
 "<b>Brak wystarczającego miejsca, aby zainstalować %s</b>, ale można\n"
 "odzyskać je przez zmniejszenie lub usunięcie istniejących partycji."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2232,7 +3094,7 @@ msgstr ""
 "Brak wystarczającego miejsca, aby zainstalować <b>%s</b>, nawet jeśli użyte\n"
 "zostanie całe wolne miejsce dostępne na wybranych dyskach."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2246,40 +3108,47 @@ msgstr ""
 "oprogramowania, aby zainstalować mniejszą wersję systemu <b>%s</b> lub\n"
 "zakończyć instalator."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "CEL INSTALACJI"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Zapisywanie konfiguracji urządzeń do przechowywania danych..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 "Zapisanie konfiguracji urządzeń do przechowywania danych się nie powiodło..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatowanie urządzenia DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Błąd podczas sprawdzania konfiguracji urządzeń do przechowywania danych. "
 "Kliknięcie wyświetli więcej informacji."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Błąd podczas sprawdzania konfiguracji urządzeń do przechowywania danych. "
 "Kliknięcie wyświetli więcej informacji."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "wolny system plików"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2287,7 +3156,7 @@ msgstr[0] "Wybrano %d dysk; pojemność %s; %s wolnego miejsca"
 msgstr[1] "Wybrano %d dyski; pojemność %s; %s wolnego miejsca"
 msgstr[2] "Wybrano %d dysków; pojemność %s; %s wolnego miejsca"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2295,7 +3164,11 @@ msgstr ""
 "Wybrano pominięcie instalacji programu startowego. Być może nie będzie można "
 "uruchomić systemu."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2305,11 +3178,19 @@ msgstr ""
 "przechowywania danych. Można zmodyfikować układ\n"
 "partycjonowania lub zakończyć instalator."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "Za_kończ"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "Z_modyfikuj układ urządzeń do przechowywania danych"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2320,53 +3201,53 @@ msgstr ""
 "przechowywania danych. Można zmodyfikować układ\n"
 "partycjonowania lub zakończyć instalator."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "USTAWIENIA UŻYTKOWNIKA"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "WITAJ W SYSTEMIE %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DANE"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2375,24 +3256,28 @@ msgstr ""
 "Nie utworzono jeszcze żadnych punktów montowania dla instalacji systemu %s "
 "%s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Kliknięcie tutaj utworzy je automatycznie."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 "Można też poniżej utworzyć nowe punkty montowania za pomocą ikony \"+\"."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2410,55 +3295,162 @@ msgstr[2] ""
 "<b>%d dysków; pojemność %s; %s wolnego miejsca</b> (niepartycjonowane i na "
 "systemach plików)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Bez instalowania programu startowego"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Ustaw jako urządzenie startowe"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "Wybrany poziom RAID wymaga więcej dysków, niż obecnie wybrano."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Proszę utworzyć nazwę dla grupy woluminów i wybrać co najmniej jeden dysk "
+"poniżej."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Grupa woluminów:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "kolumna"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr ""
+"Punkt montowania %s musi znajdować się na systemie plików systemu Linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Punkt montowania jest już używany. Proszę spróbować użyć innego."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Proszę podać prawidłowy punkt montowania."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Punkt montowania jest nieprawidłowy. Proszę spróbować użyć innego."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Usunięcie także wszystkich innych systemów plików w roocie %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Na pewno usunąć wszystkie dane na urządzeniu %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Na pewno usunąć wszystkie dane na urządzeniu %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Nieprawidłowa strefa czasowa"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "Za_kończ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Podano słabe hasło: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Hasła się nie zgadzają."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Zachowaj"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Zmniejsz"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Usuń"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "To urządzenie zawiera źródło instalacji."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Tworzenie %(type)s na urządzeniu %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Niegotowe"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Użyj wolnego miejsca"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2471,14 +3463,14 @@ msgstr ""
 "dla tej instalacji. Usunięcie systemu plików trwale usunie wszystkie "
 "znajdujące się na nim dane."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2490,353 +3482,762 @@ msgstr[1] ""
 msgstr[2] ""
 "<b>%s dysków; %s miejsca możliwego do odzyskania</b> (w systemach plików)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Razem wybranego miejsca do odzyskania: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Usuń"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Zachowaj"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALACJA DYSTRYBUCJI"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "NAZWA EKRANU"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "WYDANIE TESTOWE"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Nowe urządzenie"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Nowy wybór"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Gotowe"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Zastosuj zmiany"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "KONFIGURACJA SIECI"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Nazwa grupy"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Anuluj"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATA I CZAS"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Proszę dodać i oznaczyć serwery NTP do użycia"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Serwer WWW"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Działanie"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Użyj"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "S_konfiguruj..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATA I CZAS"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Miasto:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Miasto:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Nazwa sieci"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nazwa sieci"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "12-godzinny"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "12-godzinny"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-godzinny"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "12-godzinny"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "CEL INSTALACJI"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Pojemność"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Nie połączono"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "Identyfikator"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Wybrane urządzenie"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Nic nie wybrano"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etykieta:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Brak oprogramowania sprzętowego"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nie"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Typ VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Wybrane urządzenie"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "podsumowanie"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Urządzenie RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Domyślna trasa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Maska podsieci"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Prędkość"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Adres sprzętowy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Sk_onfiguruj..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Zabezpieczenia"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Nazwa sieci"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Nazwa sieci"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Klucz zabezpieczeń"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Użyj jako hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Zatrzymaj hotspot"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "S_konfiguruj..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Dostawca"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "S_konfiguruj..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Typ VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Brama"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Nazwa grupy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Hasło grupy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "S_konfiguruj..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metoda"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "Adres URL _konfiguracji"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "Pośrednik _HTTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "Pośrednik H_TTPS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "Pośrednik _FTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Komputer _SOCKS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Zapisywanie konfiguracji sieci"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Odblokuj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Tryb _samolotowy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Zapisywanie konfiguracji sieci"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nazwa komputera:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "KONFIGURACJA SIECI"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2845,206 +4246,61 @@ msgstr ""
 "Wymagany jest dostęp sieciowy, aby uzyskać informacje o położeniu i\n"
 "udostępnić aktualizacje oprogramowania."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Domyślna trasa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Maska podsieci"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Prędkość"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Adres sprzętowy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "Sk_onfiguruj..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Zabezpieczenia"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Nazwa sieci"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Nazwa sieci"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Klucz zabezpieczeń"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Użyj jako hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Zatrzymaj hotspot"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "S_konfiguruj..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Dostawca"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Typ VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Brama"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Nazwa grupy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Hasło grupy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metoda"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "Adres URL _konfiguracji"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "Pośrednik _HTTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "Pośrednik H_TTPS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "Pośrednik _FTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Komputer _SOCKS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Odblokuj"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Tryb _samolotowy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Nazwa komputera:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Użycie uwierzytelniania"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Wymagane jest uwierzytelnienie"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Połączono"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "WYBÓR OPROGRAMOWANIA"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Wybór środowiska"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "kolumna"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "_Anuluj i dodaj więcej dysków"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "OPCJE INSTALACJI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Typ partycji:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Zaszyfrowanie danych. Hasło zostanie ustawione później."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Wybrano partycjonowanie użytkownika"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Odzyskaj miejsce"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "OPCJE INSTALACJI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3052,78 +4308,145 @@ msgstr ""
 "Tutaj zostanie opisane, ile miejsca jest wymagane dla obecnego wyboru "
 "oprogramowania."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "wolny dysk"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Wolne miejsce możliwe do użycia."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "wolny system plików"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Niedostępne wolne miejsce, ale możliwe do odzyskania z istniejących partycji."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Tutaj zostaną opisane dostępne opcje."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Użyj wolnego miejsca"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "Za_kończ instalator"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Opis urządzenia"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Standardowe, lokalne dyski"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Zakończ partycjonowanie"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Za_szyfrowane"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Wybrano automatyczne partycjonowanie"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Zakończ partycjonowanie"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "Za_szyfrowane"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Zaszyfrowanie danych. Hasło zostanie ustawione później."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Opcje automatycznego partycjonowania"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "podsumowanie"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Pełne podsumowanie dysków i opcje..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "DODAJ UKŁAD KLAWIATURY"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Można dodać układ klawiatury przez wybranie go poniżej:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nazwa"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "UKŁAD KLAWIATURY"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3131,7 +4454,7 @@ msgstr ""
 "Których układów klawiatury używać w tym systemie? Można przesunąć dowolny "
 "układ na górę listy, aby wybrać go jako domyślny."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3140,117 +4463,199 @@ msgstr ""
 "systemu. Proszę użyć narzędzia środowiska, aby skonfigurować klawiaturę dla "
 "procesu instalacji."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nazwa"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Dodaj układ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Usuń układ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Przenieś zaznaczony układ w górę"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Dodaj układ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Usuń układ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Przenieś zaznaczony układ w górę"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Przenieś zaznaczony układ w dół"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Podgląd układu"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Testowanie konfiguracji układów jest niedostępne."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Naciśnięcie klawiszy Alt + Shift przełącza układy."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Opcje"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "DODAJ UKŁAD KLAWIATURY"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Można dodać układ klawiatury przez wybranie go poniżej:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nazwa"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Dostępne regiony"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Dodaj układ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "OPCJE PRZEŁĄCZANIA UKŁADU"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Których klawiszy skrótów używać do przełączania między układami klawiatury?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "użycie"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "opis"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Opcje montowania NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "JĘZYK"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "polski"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "Polish"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Nic nie wybrano"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "HASŁO ROOTA"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Hasło roota:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Potwierdzenie:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Hasło VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Ustaw hasło roota"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3258,238 +4663,286 @@ msgstr ""
 "Konto root jest wykorzystywane do administrowania systemem. Proszę podać "
 "hasło dla użytkownika root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Gotowe"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "SPRAWDZANIE NOŚNIKA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Sprawdzanie nośnika, proszę czekać..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Włączenie pośrednika HTTP"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Adres URL pośrednika</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 "<span size=\"small\"><b>Przykład:</b> squid.mojawitryna.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Użycie uwierzytelniania"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Nazwa użytkownika</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Nazwa użytkownika"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Hasło</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Hasło: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ŹRÓDŁO INSTALACJI"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Którego źródła instalacji użyć?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Automatyczne wykrycie nośnika instalacji:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Urządzenie:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etykieta:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Sprawdź"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "Plik _ISO:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Urządzenie:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Wybierz plik ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "W _sieci:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Ustawienia pośrednika..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Ten adres URL odnosi się do listy _serwerów lustrzanych."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Opcje montowania NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "To pole jest opcjonalne."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Repozytoria Fedora People"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Dodaj nowy punkt montowania."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Usuń zaznaczone punkty montowania."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "_Usuń"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Błąd działania."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Ustaw hasło roota"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Ten adres URL odnosi się do listy _serwerów lustrzanych."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nazwa:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Adres URL pośrednika</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nazwa użytkownika"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Hasło: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Punkt montowania jest nieprawidłowy. Proszę spróbować użyć innego."
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Zabierz mnie stąd!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Przyjmuję swój los."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "To jest niestabilne, testowe oprogramowanie."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3501,202 +4954,264 @@ msgstr ""
 "musisz żyć. Ten system przyszłości nie jest stabilnym systemem, na którym "
 "można polegać. Jest przeznaczony tylko do testowania."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "WITAJ W SYSTEMIE %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Jakiego języka używać podczas instalacji?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "Za_kończ"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Kontynuuj"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nazwa użytkownika"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Nazwa grupy"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Hasło: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Hasło VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Dodaj punkt montowania"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-#, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Żądana pojemność:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-#, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Punkt montowania:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "DODAJ NOWY PUNKT MONTOWANIA"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
-"Więcej opcji dostosowania jest dostępnych\n"
-"po utworzeniu punktu montowania poniżej."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr "Ten punkt montowania jest już używany.Proszę spróbować innego."
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "pn.: \"20 GB\", \"500mb\" (bez cudzysłowów)"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "Dodaj nowy punkt montowania."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "Usuń zaznaczone punkty montowania."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr "_Usuń"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "Zapi_sz"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "SKONFIGURUJ PUNKT MONTOWANIA"
+msgid "Reload storage configuration from disk."
+msgstr "konfiguracja urządzeń do przechowywania danych się nie powiodła: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-#, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Proszę utworzyć nazwę dla grupy woluminów i wybrać co najmniej jeden dysk "
-"poniżej."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Wolne"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
-#, fuzzy
-msgid "RAID Level:"
-msgstr "Urządzenie RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Za_szyfrowane"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Wybrane urządzenie"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Opis urządzenia"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Punkt montowania:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Żądana pojemność:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etykieta:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Typ urządzenia:</b>"
+msgid "Device(s):"
+msgstr "Urządzenie:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>System plików:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "Za_szyfrowane"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Sformatowanie"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Grupa woluminów:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Modyfikuj..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nazwa:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Typ urządzenia:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Za_szyfrowane"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "System plików"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Sformatowanie"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Grupa woluminów:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Modyfikuj..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Urządzenie RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3704,17 +5219,19 @@ msgstr ""
 "To urządzenie jest zaszyfrowane i nie może zostać odczytane bez prawidłowego "
 "hasła. Można odblokować je poniżej."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Hasło:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "Od_blokuj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3722,161 +5239,116 @@ msgstr ""
 "Tego urządzenia nie można modyfikować bezpośrednio. Można je usunąć lub "
 "wybrać inne."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Dodaj nowy punkt montowania."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Usuń zaznaczone punkty montowania."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Konfiguruj zaznaczony punkt montowania."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "S_konfiguruj..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "konfiguracja urządzeń do przechowywania danych się nie powiodła: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Kliknięcie wyświetli pomoc"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Pomoc"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">DOSTĘPNE MIEJSCE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">RAZEM MIEJSCE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "_Wybierz"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Anuluj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "SKONFIGURUJ PUNKT MONTOWANIA"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-"Proszę wybrać jeden lub więcej dysków, na których to urządzenie może się "
-"znajdować."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Adres IP"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Należy podać nazwę inicjatora iSCSI."
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Użycie uwierzytelniania"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
@@ -3884,138 +5356,458 @@ msgid ""
 msgstr ""
 "<span size=\"small\"><b>Przykład:</b> squid.mojawitryna.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nazwa użytkownika"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Hasło VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nazwa użytkownika"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Hasło VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nazwa użytkownika"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Hasło VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Nazwa sieci"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Użycie uwierzytelniania"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nazwa użytkownika"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Hasło VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nazwa użytkownika"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Hasło VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Nazwa użytkownika"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Hasło VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Połączenie się nie powiodło"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Urządzenie:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "WYBRANE DYSKI"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Startowe"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Opis"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Wolne"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Tutaj zostanie wyświetlone podsumowanie dysku"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Usuń"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "_Wybierz"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "SKONFIGURUJ PUNKT MONTOWANIA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+"Proszę wybrać jeden lub więcej dysków, na których to urządzenie może się "
+"znajdować."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Dodaj punkt montowania"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Żądana pojemność:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Punkt montowania:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "DODAJ NOWY PUNKT MONTOWANIA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Więcej opcji dostosowania jest dostępnych\n"
+"po utworzeniu punktu montowania poniżej."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr "Ten punkt montowania jest już używany.Proszę spróbować innego."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "pn.: \"20 GB\", \"500mb\" (bez cudzysłowów)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "Zapi_sz"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "SKONFIGURUJ PUNKT MONTOWANIA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Proszę utworzyć nazwę dla grupy woluminów i wybrać co najmniej jeden dysk "
+"poniżej."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nazwa:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Urządzenie RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Za_szyfrowane"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Proszę podać prawidłowy punkt montowania."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formatowanie urządzenia DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Wystąpił nieznany błąd podczas instalacji. Poniżej znajduje się więcej "
 "informacji."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "HASŁO SZYFROWANIA DYSKU"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Zapisz hasło"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "HASŁO SZYFROWANIA DYSKU"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4024,7 +5816,19 @@ msgstr ""
 "Wybrano zaszyfrowanie części danych. Należy utworzyć hasło, które będzie "
 "używane do uzyskiwania dostępu do danych podczas uruchamiania komputera."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Hasło:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Potwierdzenie:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4033,167 +5837,221 @@ msgstr ""
 "Ostrzeżenie: obecny układ klawiatury to <b>%s</b>. Jeśli zostanie on "
 "zmieniony, to odszyfrowanie dysków po instalacji może nie być możliwe."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ODZYSKIWANIE MIEJSCA NA DYSKU"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Anuluj"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Odzyskaj miejsce"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ODZYSKIWANIE MIEJSCA NA DYSKU"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Miejsce na opis."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "System plików"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Miejsce możliwe do odzyskania"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Działanie"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Zachowaj"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Usuń"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Zmniejsz"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Wybrano partycjonowanie użytkownika"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Zastosuj zmiany"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Urządzenie:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Dodaj punkt montowania"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Za_kończ instalator"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nie"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Tak"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr "Na pewno zakończyć instalację?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "Za_kończ"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "PODSUMOWANIE INSTALACJI"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "Za_kończ"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Rozpocznij instalację"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURACJA"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Przygotowywanie do instalacji"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"System %s został pomyślnie zainstalowany na komputerze, ale wymagane jest "
-"skonfigurowanie jeszcze kilku rzeczy. \n"
-"Proszę je skonfigurować, a następnie nacisnąć przycisk Zakończ konfigurację."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "Za_kończ konfigurację"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"System %s został pomyślnie zainstalowany na komputerze i jest gotowy do "
-"użycia. Należy ponownie uruchomić komputer."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Uruchom ponownie"
 
@@ -4209,16 +6067,16 @@ msgstr "Instalacja"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalacja obrazu Live na dysku twardym"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Rozpoczynanie instalacji na dysku twardym"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Witaj w Fedorze"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4227,26 +6085,27 @@ msgstr ""
 "System %s wymaga %s MB pamięci do instalacji, ale komputer posiada tylko %s "
 "MB.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Graficzny instalator systemu %s wymaga %s MB pamięci, ale komputer posiada "
 "tylko %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Za mało pamięci RAM"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4260,24 +6119,24 @@ msgstr ""
 "\n"
 " z terminala roota."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Uruchamianie trybu tekstowego."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Błąd"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Zmienna DISPLAY nie jest ustawiona. Uruchamianie trybu tekstowego."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Instalacja graficzna jest niedostępna. Uruchamianie trybu tekstowego."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4288,21 +6147,21 @@ msgstr ""
 "podanie własnego układu partycjonowania ani wyboru pakietów. Użyć trybu VNC "
 "zamiast tego?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Proszę wykonać polecenie ssh install@%s, aby rozpocząć instalację."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 "Proszę wykonać polecenie ssh install@<komputer>, aby kontynuować instalację."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Wypróbuj Fedorę"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4312,7 +6171,7 @@ msgstr ""
 "Można zainstalować Fedorę teraz lub wybrać \"Instalacja na dysku twardym\" "
 "na ekranie podglądu w dowolnym czasie."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4320,10 +6179,94 @@ msgstr ""
 "Można wybrać \"Instalacja na dysku twardym\"\n"
 "na ekranie podglądu w dowolnym czasie."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Zamknij"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Nazwa komputera musi rozpoczynać się od prawidłowego znaku z zakresu \"a-z"
+#~ "\", \"A-Z\" lub \"0-9\""
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Wymagane jest więcej miejsca na następujących systemach plików:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Nie można korzystać ze znaku zapytania w trybie wiersza poleceń."
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Punkt montowania jest nieprawidłowy. Proszę spróbować użyć innego."
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "KONFIGURACJA SIECI"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Błąd podczas pobierania metadanych pakietów..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Nic nie wybrano"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Brak oprogramowania sprzętowego"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Wymagane jest uwierzytelnienie"
+
+#~ msgid "column"
+#~ msgstr "kolumna"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Typ partycji:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Adres URL pośrednika</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Nazwa użytkownika</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Hasło</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Punkt montowania jest nieprawidłowy. Proszę spróbować użyć innego."
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etykieta:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>System plików:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Urządzenie RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Konfiguruj zaznaczony punkt montowania."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Kliknięcie wyświetli pomoc"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">DOSTĘPNE MIEJSCE</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">RAZEM MIEJSCE</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Ukończono"
 
@@ -4376,40 +6319,9 @@ msgstr "Zamknij"
 #~ msgid "Install on System"
 #~ msgstr "Instalacja w systemie"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Wystąpił poniższy błąd podczas ustawiania repozytorium instalacji:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Instalacja nie może być kontynuowana."
-
 #~ msgid "Exit installer"
 #~ msgstr "Zakończ instalator"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Instalacja została zatrzymana z powodu błędu sprzętu. Komunikat błędu:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Instalator zostanie zakończony."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Wystąpił błąd sprzętu"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Zakończ instalator"
 
@@ -4706,9 +6618,6 @@ msgstr "Zamknij"
 #~ msgid "Software Development"
 #~ msgstr "Tworzenie oprogramowania"
 
-#~ msgid "Web Server"
-#~ msgstr "Serwer WWW"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimalna"
 
@@ -4754,50 +6663,6 @@ msgstr "Zamknij"
 #~ "których nie można usunąć:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Nie wybrano głównej partycji (\"/\"), która jest niezbędna do "
-#~ "kontynuowania instalacji systemu %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Główna partycja ma mniej niż 250 megabajtów, a to zwykle za mało, aby "
-#~ "zainstalować system %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Ta platforma wymaga /boot na oddzielnej partycji lub woluminie logicznym. "
-#~ "Jeśli /boot nie ma znajdować się na własnym woluminie, to należy "
-#~ "umieścić / na oddzielnej partycji nie będącej LVM."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Partycja %(mount)s ma mniej niż %(size)s MB, czyli mniej niż jest "
-#~ "zalecane do zwykłej instalacji systemu %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Partycja %(mount)s jest za mała dla formatowania %(format)s (dozwolony "
-#~ "jest rozmiar od %(minSize)d MB do %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Partycja %(mount)s jest za duża dla formatowania %(format)s (dozwolony "
-#~ "jest rozmiar od %(minSize)d MB do %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4814,58 +6679,6 @@ msgstr "Zamknij"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "nie utworzono urządzenia docelowego 1 etapu programu startowego"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Nie utworzono partycji startowej."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Komputer oparty na BIOS-ie wymaga specjalnej partycji do uruchamiania za "
-#~ "pomocą nowego formatu etykiet dysków %s (GPT). Aby kontynuować, proszę "
-#~ "utworzyć partycję typu \"Partycja startowa BIOS\" o rozmiarze 1 MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Nie podano partycji wymiany. Wymagane jest %(requiredMem)s MB pamięci, "
-#~ "aby kontynuować instalację bez partycji wymiany, a w komputerze jest "
-#~ "tylko %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Nie podano partycji wymiany. Chociaż nie zawsze jest ona ściśle wymagana, "
-#~ "w większości przypadków znacznie poprawia wydajność systemu."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Co najmniej jedno z urządzeń wymiany nie posiada UUID, co jest częste w "
-#~ "przypadku przestrzeni wymiany utworzonych używając starszych wersji "
-#~ "programu mkswap. Te urządzenia będą nazywane według ścieżek do nich w "
-#~ "pliku /etc/fstab, co nie jest najlepsze, ponieważ ścieżki te mogą się "
-#~ "zmieniać w wielu okolicznościach. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Ten punkt montowania jest nieprawidłowy. Katalog %s musi znajdować się w "
-#~ "systemie plików /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "Punkt montowania %s musi znajdować się na systemie plików systemu Linux."
-
 #~ msgid "Linux on %s"
 #~ msgstr "System Linux na %s"
 
@@ -4875,12 +6688,6 @@ msgstr "Zamknij"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "System %(product)s Linux %(version)s dla %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatowanie urządzenia DASD"
-#~ msgstr[1] "Formatowanie urządzeń DASD"
-#~ msgstr[2] "Formatowanie urządzeń DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Przygotowywanie %d urządzenia DASD do użycia z systemem Linux..."
@@ -5167,9 +6974,6 @@ msgstr "Zamknij"
 #~ msgid "Error setting root password"
 #~ msgstr "Błąd podczas ustawiania hasła roota"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Należy podać i potwierdzić hasło."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Usuń pakiety"
 
@@ -5202,24 +7006,12 @@ msgstr "Zamknij"
 #~ msgid "%s of %s"
 #~ msgstr "%s z %s"
 
-#~ msgid "Region:"
-#~ msgstr "Region:"
-
-#~ msgid "City:"
-#~ msgstr "Miasto:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-godzinny"
-
-#~ msgid "AM/PM"
-#~ msgstr "12-godzinny"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Wybór dodatków"
 
@@ -5306,9 +7098,6 @@ msgstr "Zamknij"
 #~ msgid "configureButton"
 #~ msgstr "Skonfiguruj"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Zakończ partycjonowanie"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "SKONFIGURUJ GRUPĘ WOLUMINÓW"
 
diff --git a/anaconda/po/pt.po b/anaconda/po/pt.po
index 13b1e46..7612ee0 100644
--- a/anaconda/po/pt.po
+++ b/anaconda/po/pt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Portuguese <trans-pt@lists.fedoraproject.org>\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "Sistema de ficheiros /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Conjuntos RAID que contêm '%s' devem ter um dos seguintes níveis de raid: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -43,7 +43,7 @@ msgstr ""
 "Conjuntos RAID que contêm '%s' devem ter uma das seguintes versões de "
 "metadados: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -52,188 +52,454 @@ msgstr ""
 "Conjuntos RAID que contêm '%s' devem ter um dos seguintes tipos de "
 "dispositivo: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s tem de ter um dos seguintes tipos de etiqueta de disco: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s não pode ser do tipo %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s deve ser montado num dos %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s deve estar entre %d e %d MB de tamanho"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s não deve ser menor que %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s não deve ser maior que %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s deve estar dentro dos primeiros %dMB do disco."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s tem de estar numa partição primária."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s não pode estar num dispositivo cifrado."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s não pode ser do tipo %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Iniciar o VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Usar o modo de texto"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Senha está definida."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "As senhas não coincidem!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"O seguinte erro ocorreu durante a configuração do repositório de "
+"instalação:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"a instalação não pode continuar."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"O seguinte erro ocorreu durante a configuração do repositório de "
+"instalação:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"a instalação não pode continuar."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"A instalação foi interrompida devido ao que parece ser um problema com o "
+"hardware. A mensagem de erro exacta é:\n"
+"\n"
+"%s.\n"
+"\n"
+" O instalador irá agora terminar."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"A instalação foi interrompida devido ao que parece ser um problema com o "
+"hardware. A mensagem de erro exacta é:\n"
+"\n"
+"%s.\n"
+"\n"
+" O instalador irá agora terminar."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Erro de hardware encontrado"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"A instalação foi interrompida devido ao que parece ser um problema com o "
+"hardware. A mensagem de erro exacta é:\n"
+"\n"
+"%s.\n"
+"\n"
+" O instalador irá agora terminar."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "A correr os scripts pré-instalação"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "A iniciar processo de instalação de pacotes"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "A executar configuração pós-instalação"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -245,87 +511,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "A correr os scripts pré-instalação"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "O nome da máquina tem de ter 255 caracteres ou menos de tamanho."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"O nome da máquina deve começar com um carácter válido no intervalo 'a-z', 'A-"
-"Z' ou '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -334,7 +890,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Instalação do %(productName)s %(productVersion)s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Execute %s para desmontar o sistema quando tiver terminado."
@@ -348,8 +909,8 @@ msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 "Não foi possível encontrar /bin/sh para executar!  Consola não iniciada"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Recuperação"
 
@@ -387,21 +948,15 @@ msgstr "Sistema a Recuperar"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Que dispositivo tem a partição root da sua instalação?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Sair"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "O sistema será reiniciado automaticamente quando sair da consola."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -411,7 +966,7 @@ msgstr ""
 "montar.  Pressione Enter para obter uma consola de onde pode executar o fsck "
 "e montar as partições. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -432,7 +987,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -445,29 +1000,227 @@ msgstr ""
 "\n"
 "Pressione <return> para obter uma consola."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Você não tem nenhuma partição Linux.  A reiniciar.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " O sistema será reiniciado automaticamente quando sair da consola."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Modo de Recuperação"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Não tem nenhuma partição Linux. Pressione Enter para obter uma consola.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "O seu sistema está montado na directoria %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"A sua partição raiz tem menos do que 250 megabytes, o que significa que "
+"provavelmente é demasiado pequena para instalar o %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Não definiu um partição raiz (/), que é necessária para a instalação do %s "
+"continuar."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Esta plataforma requer que o /boot esteja numa partição dedicada ou volume "
+"lógico.  Se não quer um volume /boot, deve colocar a / numa partição "
+"dedicada não-LVM."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"A partição %(mount)s tem menos do que %(size)s MB, o que é inferior ao "
+"recomendado para uma instalação normal de %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"A partição %(mount)s é muito pequena para uma formatação %(format)s (tamanho "
+"permitido vai de %(minSize)d MB a %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"A partição %(mount)s é grande demais para uma formatação %(format)s (tamanho "
+"permitido vai de %(minSize)d MB a %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Ainda não criou uma partição de arranque."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Não especificou uma partição swap.  %(requiredMem)s MB de memória são "
+"necessários para continuar a instalação sem uma partição swap, mas o sistema "
+"tem apenas %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Não indicou um partição swap.  Embora não seja estritamente obrigatório, a "
+"sua utilização aumenta significativamente a performance na maior parte das "
+"instalações."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Pelo menos um dos dispositivos de swap não tem um UUID, o que é comum no "
+"espaço de swap criado com versões antigas do mkswap. Estes dispositivos vão "
+"ser referenciados pelo caminho do dispositivo no /etc/fstab, o que não é "
+"ideal, pois os caminhos dos dispositivos podem mudar sob várias "
+"circunstâncias. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Este ponto de montagem é inválido.  A directoria %s deve estar no sistema de "
+"ficheiros /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "O ponto de montagem %s deve estar num sistema de ficheiros linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Senha está definida."
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -579,84 +1332,233 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "A preparar transacção a partir das fontes de instalação"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Erro ao instalar pacote"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "A instalar software"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "A iniciar processo de instalação de pacotes"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "É necessário mais espaço nos seguintes sistemas de ficheiros:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "A preparar transacção a partir das fontes de instalação"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "A instalar"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Erro ao instalar pacote"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "A instalar"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "A preparar para instalar"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Pós Instalação"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Não pode haver questões no modo de linha de comandos!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Erro"
 
@@ -680,31 +1582,34 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Deseja realmente sair?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -719,454 +1624,526 @@ msgstr ""
 "se ligar a este computador a partir de outro computador e realizar uma "
 "instalação gráfica ou continuar com uma instalação em modo texto?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Senha: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Senha (confirmar): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "As senhas não coincidem!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "A senha deve ter pelo menos seis caracteres."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "A senha deve ter pelo menos seis caracteres."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "falta um tipo na configuração do sistema de ficheiros"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Definir senha de root"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Senha está definida."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Senha: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Utilizar todo o espaço"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "A Iniciar a Instalação"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "A efectuar configuração pós-actualização"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Iniciar o VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progresso da Instalação"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "A preparar transacção a partir das fontes de instalação"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Erro ao instalar pacote"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "o dispositivo que contém o /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Desenvolvimento de Software"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Definir senha de root"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Aviso"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1182,581 +2159,406 @@ msgstr "Em curso"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstalação completa.  Pressione Enter para sair"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Senha (confirmar): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Senha está definida."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Instalação do %(productName)s %(productVersion)s"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Tem de criar um novo sistema de ficheiros no dispositivo raiz."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Tem de criar um novo sistema de ficheiros no dispositivo raiz."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Desenvolvimento de Software"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1783,281 +2585,305 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Endereço IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Endereço IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Senha está definida."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Desenvolvimento de Software"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Erro ao Configurar o Repositório"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Erro ao Configurar o Repositório"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2065,14 +2891,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2081,128 +2907,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "A formatar dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2213,68 +3060,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "O ponto de montagem %s deve estar num sistema de ficheiros linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Tem de criar um novo sistema de ficheiros no dispositivo raiz."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "A criar %(type)s em %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2282,955 +3226,1378 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continuar"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Servidor Web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Sem rede disponível"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Usar o modo de texto"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacidade"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Sem rede disponível"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nome de utilizador"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Nome de utilizador"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nome de utilizador"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Ligado!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Partição do Sistema EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Utilizar todo o espaço"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
+msgstr "_Sair do instalador"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Partição do Sistema EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Partição do Sistema EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirmar"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Senha: "
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Definir senha de root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Adicionar"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Adicionar"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Erro operacional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Definir senha de root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3238,651 +4605,1045 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Que língua gostaria de utilizar durante o processo de instalação?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Definir senha de root"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Livre"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dispositivo RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Adicionar"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Cifrado"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Capacidade"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Cifrado"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
-msgstr ""
+msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Confirmar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Endereço IPv4"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Tem de indicar um nome para o iniciador iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome de utilizador"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Senha: "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Senha: "
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome de utilizador"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Senha: "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome de utilizador"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Senha: "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Nome de utilizador"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Senha: "
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Livre"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Capacidade"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nome de utilizador"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Cifrado"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "A formatar dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Senha: "
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirmar"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Partição do Sistema EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Pós Instalação"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "A preparar para instalar"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "A efectuar configuração pós-actualização"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Re_iniciar"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3896,16 +5657,16 @@ msgstr "Instalar"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalar o Live CD no seu disco rígido"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "A iniciar a instalação no disco rígido"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3914,25 +5675,26 @@ msgstr ""
 "%s requer %s MB de memória para instalar, mas você só tem %s MB nesta "
 "máquina.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "O %s instalador gráfico requer %s MB de memória, mas você só tem %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "RAM insuficiente"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3946,24 +5708,24 @@ msgstr ""
 "\n"
 "a partir de um terminal de root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " A iniciar modo de texto."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Erro"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "A variável DISPLAY não está definida. A iniciar em modo de texto."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Instalação gráfica não disponível. A iniciar em modo de texto."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3974,36 +5736,61 @@ msgstr ""
 "Não permite personalizar a disposição de partições nem a selecção de "
 "pacotes. Em alternativa, deseja utilizar o modo VNC?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Execute ssh install@%s para iniciar a instalação."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Execute ssh install@<host> para continuar a instalação."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "O nome da máquina deve começar com um carácter válido no intervalo 'a-z', "
+#~ "'A-Z' ou '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "É necessário mais espaço nos seguintes sistemas de ficheiros:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Não pode haver questões no modo de linha de comandos!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Nome de utilizador"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "Senha: "
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispositivo RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Concluído"
 
@@ -4053,45 +5840,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "Instalar no sistema"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "O seguinte erro ocorreu durante a configuração do repositório de "
-#~ "instalação:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "a instalação não pode continuar."
-
 #~ msgid "Exit installer"
 #~ msgstr "Sair do instalador"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "A instalação foi interrompida devido ao que parece ser um problema com o "
-#~ "hardware. A mensagem de erro exacta é:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " O instalador irá agora terminar."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Erro de hardware encontrado"
-
-#~ msgid "_Exit installer"
-#~ msgstr "_Sair do instalador"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4190,9 +5941,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "O repositório %r não tem nome na configuração; a usar o id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Sem rede disponível"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4200,9 +5948,6 @@ msgstr ""
 #~ "Alguns dos repositórios de software necessitam de rede, mas houve um erro "
 #~ "ao activar a rede no seu sistema."
 
-#~ msgid "Re_boot"
-#~ msgstr "Re_iniciar"
-
 #~ msgid "_Eject"
 #~ msgstr "_Ejectar"
 
@@ -4366,9 +6111,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Desktop Gráfico"
 
-#~ msgid "Web Server"
-#~ msgstr "Servidor Web"
-
 #~ msgid "Minimal"
 #~ msgstr "Mínima"
 
@@ -4413,50 +6155,6 @@ msgstr ""
 #~ "que não podem ser removidas:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Não definiu um partição raiz (/), que é necessária para a instalação do "
-#~ "%s continuar."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "A sua partição raiz tem menos do que 250 megabytes, o que significa que "
-#~ "provavelmente é demasiado pequena para instalar o %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Esta plataforma requer que o /boot esteja numa partição dedicada ou "
-#~ "volume lógico.  Se não quer um volume /boot, deve colocar a / numa "
-#~ "partição dedicada não-LVM."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "A partição %(mount)s tem menos do que %(size)s MB, o que é inferior ao "
-#~ "recomendado para uma instalação normal de %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "A partição %(mount)s é muito pequena para uma formatação %(format)s "
-#~ "(tamanho permitido vai de %(minSize)d MB a %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "A partição %(mount)s é grande demais para uma formatação %(format)s "
-#~ "(tamanho permitido vai de %(minSize)d MB a %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4473,54 +6171,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "não criou um dispositivo de arranque stage1 de destino"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Ainda não criou uma partição de arranque."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Não especificou uma partição swap.  %(requiredMem)s MB de memória são "
-#~ "necessários para continuar a instalação sem uma partição swap, mas o "
-#~ "sistema tem apenas %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Não indicou um partição swap.  Embora não seja estritamente obrigatório, "
-#~ "a sua utilização aumenta significativamente a performance na maior parte "
-#~ "das instalações."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Pelo menos um dos dispositivos de swap não tem um UUID, o que é comum no "
-#~ "espaço de swap criado com versões antigas do mkswap. Estes dispositivos "
-#~ "vão ser referenciados pelo caminho do dispositivo no /etc/fstab, o que "
-#~ "não é ideal, pois os caminhos dos dispositivos podem mudar sob várias "
-#~ "circunstâncias. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Este ponto de montagem é inválido.  A directoria %s deve estar no sistema "
-#~ "de ficheiros /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "O ponto de montagem %s deve estar num sistema de ficheiros linux."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "A formatar dispositivo DASD"
-#~ msgstr[1] "A formatar dispositivos DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "A preparar %d dispositivo DASD para utilização com Linux..."
diff --git a/anaconda/po/pt_BR.po b/anaconda/po/pt_BR.po
index f7c3002..e5bff44 100644
--- a/anaconda/po/pt_BR.po
+++ b/anaconda/po/pt_BR.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
@@ -37,11 +37,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "Sistema de arquivo /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -50,7 +50,7 @@ msgstr ""
 "Conjuntos RAID que contém '%s' devem ter ao menos um dos seguintes níveis "
 "raid: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -59,7 +59,7 @@ msgstr ""
 "Conjuntos RAID que contém '%s' devem ter ao menos uma das seguintes versões "
 "de metadados: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -68,108 +68,129 @@ msgstr ""
 "Conjuntos RAID que contém %s devem ter um dos  seguintes tipos de "
 "dispositivos: %s"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s deve ter um dos seguintes tipos de rótulo de disco: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s não pode ser do tipo %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "O %s deve ser montado em um dos %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s deve ser entre %d e %d MB de tamanho"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s não deve ser menor do que %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s não deve ser maior do que %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s deve estar dentro dos primeiros %dMB do disco."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "O %s deve ser uma partição primária."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "O %s não pode estar em um dispositivo de bloco criptografado."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s não pode ser do tipo %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "O %s talvez não possua espaço suficiente para o grub2 incorporar o core.img "
 "quando usano o sistema de arquivo %s no %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Iniciar VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Utilizar modo texto"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Senha está definida."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "As senhas não coincidem!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Você forneceu uma senha fraca: %s. Pressione Finalizado novamento para seu "
 "uso de qualquer forma."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -177,87 +198,337 @@ msgstr ""
 "uso de qualquer forma."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Fraca"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Razoável"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Adequada"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Forte"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Sim"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Não"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"O seguinte erro ocorreu enquanto configurando o repositório de instalação:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"A instalação não pode continuar."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"O seguinte erro ocorreu enquanto configurando o repositório de instalação:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"A instalação não pode continuar."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"O seguinte software marcado para instalação possui erros. Isto é "
+"provavelmente causado por um erro com⏎ sua fonte de instalação. Você pode "
+"tentar remover esses pacotes a partir de sua instalação.⏎ altere sua fonte "
+"de instalação ou saia do instalador."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Sua instalação foi parada devido ao que parece ser um problema com seu "
+"hardware. A mensagem de erro correta é:\n"
+"\n"
+"%s.\n"
+"\n"
+"O instalador será agora interrompido."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Sua instalação foi parada devido ao que parece ser um problema com seu "
+"hardware. A mensagem de erro correta é:\n"
+"\n"
+"%s.\n"
+"\n"
+"O instalador será agora interrompido."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Encontrado um Erro de Hardware"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Sua instalação foi parada devido ao que parece ser um problema com seu "
+"hardware. A mensagem de erro correta é:\n"
+"\n"
+"%s.\n"
+"\n"
+"O instalador será agora interrompido."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "_Configuração do URL"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Executando scripts de pré-instalação"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Configurando a fonte de instalação..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Executando as tarefas de configuração de pós-instalação"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "O certificado escrow %s requer a rede."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -268,87 +539,377 @@ msgstr ""
 "Os seguintes erros foram encontrados ao baixo o certificado do Escrow:\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "O %s está ausente. Não foi possível instalar o firewall."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "O %s está ausente. Não foi possível instalar o firewall."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "O sistema do arquivo não suporta os rótulos."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "O nome especificado %s já está em uso."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "O nome do Volume do Grupo %s já está em uso. Alteração não são salvas."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Executando scripts de pré-instalação"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "O nome da máquina deve ter no máximo 255 caracteres."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"O nome da máquina deve começar com um caractere válido dos intervalos de \"a-"
-"z\", \"A-Z\" ou \"0-9\""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Disconectando..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Conectado com fio (%s)"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Conectadp sem fio ao %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Nenhum dispositivo de rede disponível"
 
@@ -357,7 +918,12 @@ msgstr "Nenhum dispositivo de rede disponível"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nova Instalação %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Execute %s para desmontar o sistema quando você terminar."
@@ -374,8 +940,8 @@ msgstr ""
 "Não foi possível localizar o /bin/sh a ser executado! O shell não será "
 "iniciado."
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Recuperar"
 
@@ -421,21 +987,15 @@ msgstr "Sistema a ser recuperado"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Qual dispositivo contém a partição raiz da sua instalação?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Sair"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "O sistema irá reiniciar automaticamente quando você sair do shell."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -445,7 +1005,7 @@ msgstr ""
 "escolheu por não montar.  Pressione return para voltar ao shell de onde você "
 "pode executar o fsck a montar as suas partições. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -466,7 +1026,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -479,30 +1039,245 @@ msgstr ""
 "\n"
 "Pressione <enter> para obter uma janela de comandos."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Você não tem nenhuma partição Linux. Reinicializando.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "O sistema irá reiniciar automaticamente quando você sair do shell."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Modo de recuperação"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Você não tem partições Linux. Pressione return para ir à janela de comandos. "
 "%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "O seu sistema está montado no diretório %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Partição Padrão"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disco"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"A área 'swap' no seu computador é usada pelo sistema de operação⏎ quando "
+"rodando com pouca memória."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"A área de 'boot' do seu computador é onde os arquivos necessários\n"
+"para iniciar o sistema operacional são armazenados."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"A área 'root' no seu computador é onde os arquivos do núcleo\n"
+"do sistema e os aplicativos são armazenados."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"A área 'home' no seu computador é onde todos os seus dados\n"
+"pessoais são armazenados."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"A partição de inicialização BIOS é requerida para ativar a inicialização⏎ a "
+"partir dos discos particionados GPT no hardware BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"A partição de inicialização PRep é solicitada como parte da⏎ configuração do "
+"carregador de inicialização em algumas plataformas PPC."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"A sua partição raiz tem menos de 250 megabytes, o que geralmente é muito "
+"pouco para instalar o %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Você não definiu uma partição raiz (/), que é necessária para continuar a "
+"instalação do %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Este plataforma requer o /boot em uma partição dedicada ou volume lógico. Se "
+"você não quiser um volume /boot, você deve colocar uma / em uma partição não "
+"LVM dedicada."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Sua partição %(mount)s é menor do que %(size)s megabytes que é menor do que "
+"o recomendado para uma instalação normal do %(productName)s ."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Sua partição %(mount)s é muito pequena para formatação %(format)s (o tamanho "
+"permitido é de %(minSize)d MB a %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Sua partição %(mount)s é muito grande para formatação %(format)s (o tamanho "
+"permitido é de %(minSize)d MB a %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Falha ao adicionar novo dispositivo. Clique para detalhes."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Você não criou uma partição inicializável."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Seu sistema baseado no BIOS precisa de uma partição especial para inciar com "
+"o formato do rótulo do novo disco (GPT) do %s. Para continuar, por favor "
+"crie uma partição de tipo 'Iniciar BIOS' 1MB."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Você não especificou uma partição swap. %(requiredMem)s MB de memória são "
+"necessários para continuar a instalação sem uma partição swap, mas você só "
+"possui %(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Você não especificou uma partição de troca (swap). Embora não seja "
+"necessária em todos os casos, a sua utilização aumenta significativamente a "
+"performance na maior parte das instalações."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Ao menos um dos seus dispositivos swap não tem um UUID, o que é comum em "
+"espaços swap criados utilizando versões antigas do mkswap. Esses "
+"dispositivos serão referenciados como sendo caminhos de dispositivo em /etc/"
+"fstab, o que não é o ideal já que os caminhos de dispositivo podem mudar de "
+"acordo com uma variedade de circunstâncias. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Este ponto de montagem é inválido. O diretório %s deve estar no sistema de "
+"arquivos /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "O ponto de montagem %s deve ficar em um sistema de arquivos Linux."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Senha:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -615,87 +1390,240 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "A senha VNC fornecida não possuía no mínimo 6 caracteres.⏎ Por favor insira "
 "uma nova senha. Deixe em branco no caso de não desejar uma senha. "
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Falha ao configurar a fonte de instalação"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Erro ao baixar o pacote metadados..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Nenhuma fonte de instalação disponível"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Instalando software"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Iniciando o processo de instalação do pacote"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Você precisa de mais espaço nos seguintes sistemas de arquivos:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Preparando transação a partir da fonte de instalação"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Instalando"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Baixando o pacote metadados"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instalando"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Preparando para instalar"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Checando configurações de armazenamento..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "TÍTULO DEFAULT"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOCALIZAÇÃO"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOCALIZAÇÃO"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Instalação Hub"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Inicializando a instalação automática"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Não pode haver uma pergunta no modo de linha de comando!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"Por favor selecione ['q' para sair | 'c' para continuar] conforme acima:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Por favor complete todos os raios antes de continuar"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Título HUB Default"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Por favor complete todos os raios antes de continuar"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Erro"
 
@@ -719,25 +1647,28 @@ msgstr "sim"
 msgid "no"
 msgstr "não"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Você realmente deseja sair?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -745,7 +1676,7 @@ msgid ""
 msgstr ""
 "Por favor selecione ['q' para sair | 'c' para continuar] conforme acima:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -761,220 +1692,259 @@ msgstr ""
 "computador e executar uma instalação gráfica ou continuar com uma instalação "
 "em modo texto?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Senha VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Por favor forneça uma senha VNC. Você terá que digitar ela duas vezes.⏎ "
 "Deixe em branco no caso de não desejar uma senha"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Senha:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Senha (confirmar):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "As senhas não coincidem!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "A senha deve ter pelo menos 6 caracteres."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "A senha deve ter pelo menos 6 caracteres."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Configurações de fuso horário"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Fuso horário não está definido"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Regiões disponíveis"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Regiões disponíveis"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Checando configurações de armazenamento..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Conectado com fio (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Conectado com fio (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Hostname"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Hostname"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Hostname"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Encerrar configuração"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "falta um tipo na configuração do sistema de arquivos"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Senha Password:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Senha está definida."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Senha de root desabilitada."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "A senha não foi determinada."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "Por favor selecione a nova senha de root. Você terá que digitá-la duas vezes."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Usar Todo o Espaço"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Substituir sistema(s) Linux existente(s)"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Usar espaço livre"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Destino da Instalação"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nenhum disco selecionado"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Erro checando as configurações de armazenamento"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Erro checando as configurações de armazenamento"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Particionamento automático selecionado"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Particionamento personalizado selecionado"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -982,40 +1952,61 @@ msgstr ""
 "Nenhum dos discos desyectados. Por favor encerre o computador, conecte pelo "
 "menos um disco e reinicie a instalação completa."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Nenhum disco selecionado. Por favor selecione pelo menos um disco para "
 "instalação."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Sondando o armazenamento..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Gerando configuração de armazenamento atualizada"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "falha na configuração do armazenamento: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Checando configurações de armazenamento..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Opções de Particionamento Automático"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1024,41 +2015,41 @@ msgstr ""
 "A instalação requer o partionamento de seu disco rígido. Selecione o espaço "
 "a ser usado para instalar seu destino."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Configuração do esquema da partição"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Configuração do esquema da partição"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Configurações de fuso horário"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Fuso horário %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Fuso horário não está definido"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Fusos horários disponíveis na região %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Regiões disponíveis"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1066,178 +2057,196 @@ msgstr ""
 "Por favor selecione o fuso horário.⏎ Use números ou nomes de tipo "
 "diretamente [b para lista da região, q para encerrar]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Iniciar VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progresso da instalação"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Espelho mais próximo"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Servidor NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Erro ao configurar a fonte de software"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Nada selecionado"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Conectando..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD drive"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_arquivo ISO:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Período de Rede"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Nenhuma fonte de instalação disponível"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Falha ao configurar a fonte de instalação"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Erro ao baixar o pacote metadados..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Nenhuma fonte de instalação disponível"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Servidor NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Opções de montagem NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Falha ao configurar a fonte de instalação. Verifique o url do repo"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "O dispositivo contendo o diretório /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Falha ao configurar a fonte de instalação"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Modificar a seleção de sofware"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Erro checando seleção de software"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Fonte de Instalação não configurada"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Software personalizado selecionado"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Fonte de Instalação não configurada"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Selecione seu ambiente"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Usar Autenticação"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Você deve fornecer e confirmar uma senha."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Aviso"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1253,36 +2262,36 @@ msgstr "Em andamento"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstalação completa. Pressione enter para sair"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Título de Raio Default"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "testando status..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Novo Dispositivo"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Senha (confirmar):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1291,7 +2300,7 @@ msgstr ""
 "Você forneceu uma senha fraca: %s. Pressione Finalizado novamento para seu "
 "uso de qualquer forma."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1300,63 +2309,46 @@ msgstr ""
 "Você forneceu uma senha fraca: %s. Pressione Finalizado novamento para seu "
 "uso de qualquer forma."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Senha está definida."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "Instalador _Sair"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Sair"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Não"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Sim"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "TÍTULO DEFAULT"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOCALIZAÇÃO"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOCALIZAÇÃO"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SISTEMA"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1364,7 +2356,11 @@ msgstr ""
 "Por favor complete os itens marcados com esse ícone antes de continuar para "
 "o próximo passo."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Completo!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1373,170 +2369,67 @@ msgstr ""
 "O %s foi instalado com êxito no seu sistema e está pronto⏎ para uso! "
 "Continue e reinicie sua máquina para começar o seu uso!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Completo!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Sair"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nova Instalação %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+" O %s foi instalado com êxito no seu sistema, porém algumas configurações "
+"ainda precisam ser feitas.⏎ Encerre-as e clique no botão de configuração "
+"Encerrar por favor."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"O %s foi instalado com êxito no seu sistema e está pronto⏎ para uso! "
+"Continue e reinicie sua máquina para começar o seu uso!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Criar um novo grupo de volume..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Reconfiguração de dispositivo falhou. Clique para detalhes."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Por favor crie um nome para seu grupo de volume e selecione pelo menos um "
-"disco abaixo."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Grupo de Volume:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "coluna"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "A configuração do armazenamento foi reiniciada devido a um erro "
 "inrecuperável. Clique para maiores informações."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Reconfiguração de dispositivo falhou. Clique para detalhes."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Por favor insira um ponto de monagem válido."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "O ponto de montagem é inválido. Tentar algo diferente?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "O ponto de montagem já está em uso. Tentar algo diferente?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"O nível RAID que você selecionou requer mais discos do que você possui "
-"atualmente selecionado."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Por favor insira um ponto de monagem válido."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "O ponto de montagem é inválido. Tentar algo diferente?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Partição Padrão"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disco"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Nenhum"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Exclua todos os sistemas de arquivo no %s root também."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Você tem certeza que deseja excluir todos os dados no %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Você tem certeza que deseja excluir todos os dados no %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "PARTICIONAMENTO MANUAL"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d dispositivo de armazenamento selecionado"
 msgstr[1] "%d dispositivos de armazenamento selecionados"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1545,135 +2438,120 @@ msgstr ""
 "Quando você criar pontos de montagem para sua instalação %s %s,⏎ você estará "
 "apto a visualizar estes detalhes aqui."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"A área 'swap' no seu computador é usada pelo sistema de operação⏎ quando "
-"rodando com pouca memória."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"A área de 'boot' do seu computador é onde os arquivos necessários\n"
-"para iniciar o sistema operacional são armazenados."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"A área 'root' no seu computador é onde os arquivos do núcleo\n"
-"do sistema e os aplicativos são armazenados."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"A área 'home' no seu computador é onde todos os seus dados\n"
-"pessoais são armazenados."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"A partição de inicialização BIOS é requerida para ativar a inicialização⏎ a "
-"partir dos discos particionados GPT no hardware BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"A partição de inicialização PRep é solicitada como parte da⏎ configuração do "
-"carregador de inicialização em algumas plataformas PPC."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "O /boot/efi deve estar num dispositivo do tipo %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "O %s deve estar num dispositivo do tipo %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "O %s não pode ser criptografado"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Você deve criar um novo sistema de arquivos no dispositivo root."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 "Os dispositivos do tipo %s requerem uma seleção de nível de RAID válido."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "A solicitação de redimensionar o dispositivo falhou. Clique para maiores "
 "detalhes."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "A solicitação de reformatação do dispositivo falhou. Clique para maiores "
 "detalhes."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "O nome especificado %s já está em uso."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "O sistema do arquivo não suporta os rótulos."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nenhum disco selecionado"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "O sistema do arquivo talvez não possa ser redimensionado."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Erro na verificação da configuração do armazenamento. Clique para "
+"informações."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Erro na verificação da configuração do armazenamento. Clique para "
+"informações."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Adicionado novo %s ao recipiente existente %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Falha ao adicionar novo dispositivo. Clique para detalhes."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Tamanho de partição inválida configurado. Use um valor numérico."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "A solicitação de remoção do dispositivo falhou. Clique para maiores detalhes."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "O nome do Volume do Grupo %s já está em uso. Alteração não são salvas."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs disponível"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1682,7 +2560,7 @@ msgstr ""
 "Este dispositivo não pode ser editado diretamente. Você pode removê-lo ou "
 "selecionar um dispositivo diferente."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1691,196 +2569,145 @@ msgstr ""
 "Este dispositivo não pode ser editado diretamente. Você pode removê-lo ou "
 "selecionar um dispositivo diferente."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nenhum disco selecionado."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Não há espaço de disco suficiente nos discos selecionados."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Particionamento automático falhou. Clique para detalhes."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Modificar a seleção de sofware"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Falha ao desbloquear o dispositivo de bloco criptografado. Clique para "
 "maiores detalhes"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATA E HORA"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Fuso horário inválido"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "Após o almoço"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Você precisa configurar a rede primeiro se deseja usar NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Você não possui o servidor NTP de trabalho configurado"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "DESTINAÇÃO DA INSTALAÇÃO"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d dispositivo de armazenamento selecionado"
+msgstr[1] "%d dispositivos de armazenamento selecionados"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s para alterar os layouts."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TECLADO"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Os testes de configuração de layouts não estão disponíveis."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "testando status..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Alteração do layout não configurado."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "IDIOMA"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Status desconhecido (falta)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Status desconhecido"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Não gerenciado"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Indisponível"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Firmware faltando"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Cabo desconectado"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Indisponível"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Desconectado"
@@ -1905,199 +2732,246 @@ msgstr "Desconectando"
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "desconectado"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Sem fio"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "desconectado"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Endereço IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Endereço IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Empresarial"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Nenhum"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Autenticação requerida"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Senha:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "CONFIGURAÇÃO DA REDE"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "SENHA ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Senha está definida."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Senha de root está definida"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Conta de root está desabilitada"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "A senha root não foi determinada"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SELEÇÃO DE SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Checando dependências de software..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Erro checando dependências de software"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Baixando o pacote metadados"
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Baixando o grupo metadados"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Checando dependências de software..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Erro checando dependências de software"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Erro checando dependências de software. Clique para detalhes."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "O seguinte software marcado para instalação possui erros. Isto é "
 "provavelmente causado por um erro com⏎ sua fonte de instalação. Você pode "
 "tentar remover esses pacotes a partir de sua instalação.⏎ altere sua fonte "
 "de instalação ou saia do instalador."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Sair"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "Modificar Fonte de Software"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Modificar a seleção de sofware"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Configurando a fonte de instalação..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Erro ao baixar o pacote metadados..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Autenticação requerida"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Esta mídia é boa para instalação."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Esta mídia não é boa para instalação."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "FONTE DE INSTALAÇÃO"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Falha ao configurar a fonte de instalação. Verifique o url do repo"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Erro ao configurar o repositório"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Erro ao configurar a fonte de software"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2105,98 +2979,80 @@ msgstr ""
 "Falha ao configurar a fonte de instalação. Verifique o url do repo e "
 "configurações proxy"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Erro ao configurar o repositório"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Erro ao configurar a fonte de software"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Servidor NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Fuso horário inválido"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Fuso horário inválido"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Fuso horário inválido"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+"Por favor espere... os metadados do software continuam sendo carregados."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s⏎ Os discos que você selecionou possuem o seguinte de espaço disponível:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-"Por favor espere... os metadados do software continuam sendo carregados."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2206,7 +3062,7 @@ msgstr ""
 "<b>Você não possui espaço suficiente para instalação %s</b>, mas nós podemos "
 "ajudá-lo ⏎ obter mais espaço pela redução ou remoção de partições existentes."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2215,7 +3071,7 @@ msgstr ""
 "%s⏎ Você não possui espaço suficiente para instalação %s</b>, mesmo que você "
 "tenha usado todo o espaço ⏎ disponível nos discos selecionados."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2228,46 +3084,53 @@ msgstr ""
 "adicionar mais discos ao espaço adicional,⏎ modificar sua seleção de "
 "software para instalar uma versão menor do <b>%s</b> ou sair do instalador."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "DESTINAÇÃO DA INSTALAÇÃO"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Salvando a configuração do armazenamento..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Falha ao salvar a configuração do armazenamento"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatando dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Erro na verificação da configuração do armazenamento. Clique para "
 "informações."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Erro na verificação da configuração do armazenamento. Clique para "
 "informações."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs disponível"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "um: %d disco selecionado; %s capacidade; %s livre"
 msgstr[1] "outros: %d discos selecionados; %s capacidade; %s livre"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2275,7 +3138,11 @@ msgstr ""
 "Você optou por pular a instalação do carregador de inicialização. O seu "
 "sistema talvez não seja inicializável."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2285,11 +3152,19 @@ msgstr ""
 "armazenamento. Você pode modificar seu layout do armazenamento⏎  ou sair do "
 "instalador."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Sair"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Modificar o Layout do Armazenamento"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2300,75 +3175,80 @@ msgstr ""
 "armazenamento. Você pode modificar seu layout do armazenamento⏎  ou sair do "
 "instalador."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "CONFIGURAÇÃO DA REDE"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Fuso horário inválido"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "BEM-VINDO AO %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DADOS"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Você não criou ainda quaisquer pontos para sua instalação %s %s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Clique aqui para criá-los automaticamente."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Ou, crie novos pontos de montagem abaixo com o ícone '+'."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2383,55 +3263,162 @@ msgstr[1] ""
 "outros: <b>%d discos; %s capacidade; %s espaço livre</b> (em sistemas de "
 "arquivo e não-particionado)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Configure como Dispositivo Iniciar"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"O nível RAID que você selecionou requer mais discos do que você possui "
+"atualmente selecionado."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Por favor crie um nome para seu grupo de volume e selecione pelo menos um "
+"disco abaixo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Grupo de Volume:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "coluna"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "O ponto de montagem %s deve ficar em um sistema de arquivos Linux."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "O ponto de montagem já está em uso. Tentar algo diferente?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Por favor insira um ponto de monagem válido."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "O ponto de montagem é inválido. Tentar algo diferente?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Exclua todos os sistemas de arquivo no %s root também."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Você tem certeza que deseja excluir todos os dados no %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Você tem certeza que deseja excluir todos os dados no %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Fuso horário inválido"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Sair"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Você forneceu uma senha fraca: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "As senhas não coincidem."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Preservar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Reduzir"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Excluir"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Criando %(type)s em %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Não está pronto"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Usar espaço livre"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2443,14 +3430,14 @@ msgstr ""
 "para liberar espaço para esta instalação. A remoção de um sistema de arquivo "
 "irá excluir permanentemente todos os dados que isto contém."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2460,353 +3447,762 @@ msgstr[0] ""
 msgstr[1] ""
 "outro: <b>%s discos; %s espaço recuperável</b> (nos sistemas de arquivo)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "O espaço total selecionado para recuperação: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Excluir"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Preservar"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INSTALAÇÃO DA DISTRIBUIÇÃO"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "NOME DO RAIO"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PRÉ-LANÇAMENTO / TESTANDO"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Novo Dispositivo"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Novo Selecionador"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Finalizado"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continuar"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Aplicar Alterações"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "CONFIGURAÇÃO DA REDE"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Nome do Grupo"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATA E HORA"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "Após o almoço"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Adiciona e marca para uso dos servidores NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Servidor web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Operando"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Uso"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Configurar"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATA E HORA"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Região:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Região:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Cidade:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Cidade:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Nome da Rede"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nome da Rede"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "Pela manhã/à tarde"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "Pela manhã/à tarde"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 horas"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "Pela manhã/à tarde"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "DESTINAÇÃO DA INSTALAÇÃO"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Capacidade"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Não conectado"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Dispositivo Selecionado"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Nada selecionado"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Rótulo:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Firmware faltando"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Não"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Tipo de VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Dispositivo Selecionado"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "sumário"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Rota Padrão"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Máscara de sub-rede"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Velocidade"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Endereço do Hardware"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "C_onfigurar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Segurança"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Nome da Rede"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Nome da Rede"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Tecla de Segurança"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Usar como Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Interromper como Hotspot..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Configurar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Provedor"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Configurar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Tipo de VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Nome do Grupo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Senha do Grupo"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Nome de usuário"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Configurar"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Método"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Configuração do URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks Host"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Checando configurações de armazenamento..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Desbloqueado"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Modo A_vião"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Checando configurações de armazenamento..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Hostname"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "CONFIGURAÇÃO DA REDE"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2816,206 +4212,61 @@ msgstr ""
 "localização e para que atualizações do software⏎ tornem-se disponíveis para "
 "você."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Rota Padrão"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Máscara de sub-rede"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Velocidade"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Endereço do Hardware"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "C_onfigurar"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Segurança"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Nome da Rede"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Nome da Rede"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Tecla de Segurança"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Usar como Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Interromper como Hotspot..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Configurar"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Provedor"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Tipo de VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Nome do Grupo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Senha do Grupo"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Nome de usuário"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Método"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Configuração do URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks Host"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Desbloqueado"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Modo A_vião"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Hostname"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Usar Autenticação"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Autenticação requerida"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Conectado"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SELEÇÃO DE SOFTWARE"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Selecione seu ambiente"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "coluna"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Cancelar &_adicionar mais discos"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "OPÇÕES DE INSTALAÇÃO"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Tipo de Partição:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Criptografar meus dados. Eu irei configurar a senha mais tarde."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Particionamento personalizado selecionado"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Espaço recuperável"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "OPÇÕES DE INSTALAÇÃO"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3023,77 +4274,144 @@ msgstr ""
 "Descreveremos aqui qual é o espaço necessário para a seleção de software "
 "atual."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "disco vazio"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Espaço disponível para uso."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs disponível"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "Espaço indisponível, mas recuperável a partir de partições existentes."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Descreveremos aqui as suas opções."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Usar espaço livre"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Instalador Sair"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Descrição do Dispositivo"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Discos Padrões Locais "
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Encerrar o Particionamento "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Criptograr"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Particionamento automático selecionado"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Encerrar o Particionamento "
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Criptograr"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Criptografar meus dados. Eu irei configurar a senha mais tarde."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Opções de Particionamento Automático"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "sumário"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Sumário e opções do disco cheio..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ADICIONAR O LAYOUT DO DISQUETE"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Você pode adicionar o layout do disquete selecionando-o a seguir:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Nome"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "LAYOUT DO TECLADO"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3101,124 +4419,206 @@ msgstr ""
 "Quais layouts de teclado você deseja usar no seu sistema? Você deve mover "
 "qualquer layout para a parte superior da lista para selecioná-lo cono padrão."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "nome"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Adicionar layout"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Remover layout"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Mover o layout selecionado para cima"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Adicionar layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Remover layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Mover o layout selecionado para cima"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Mover layout selecionado para baixo"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Prévia do layout"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Os testes de configuração de layouts não estão disponíveis."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Clique em Alt + Shift para alteração dos layouts. "
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Opções"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ADICIONAR O LAYOUT DO DISQUETE"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Você pode adicionar o layout do disquete selecionando-o a seguir:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Nome"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Regiões disponíveis"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Adicionar layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "OPÇÕES DE ALTERAÇÃO DE LAYOUT"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Qual(is) combinação(ões) você deseja para alteração entre os layouts do "
 "teclado?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "uso"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "descrição"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Opções de montagem NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "IDIOMA"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "Nomenativo"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "Nomeeminglês"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Nada selecionado"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "SENHA ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Senha Password:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Confirmar:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Senha VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Definir senha de root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3226,236 +4626,283 @@ msgstr ""
 "A conta root é usada para administração do sistema. Insira uma senha para o "
 "usuário root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Finalizado"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "VERIFICAÇÃO DA MÍDIA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Verificando a mídia, por favor espere..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Adicionar"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "-Ativar o HTTP Proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Usar Autenticação"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Nome do usuário</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Nome de usuário"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Senha</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Senha:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "FONTE DE INSTALAÇÃO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Qual fonte de instalação você deseja utilizar?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Mídia de instalação automaticamente detectada:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Rótulo:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verificar"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_arquivo ISO:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Escolher um ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "Na_rede:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Configuração Proxy..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Opções de montagem NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Este campo é opcional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Repositório Fedora People"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Adicionar um novo ponto de montagem."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Adicionar"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Remover o(s) ponto(s) de montagem."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Remover layout"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Erro operacional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Definir senha de root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Nome:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Nome de usuário"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Senha:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "O ponto de montagem é inválido. Tentar algo diferente?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Sair daqui!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Eu aceito meu destino."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Isto é instável, software de pré-lançamento."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3467,202 +4914,264 @@ msgstr ""
 "deve se acostumar. Este SO do futuro não é um SO estável que você pode "
 "confiar. Ele é destinado para finalidades de testes apenas."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "BEM-VINDO AO %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Qual idioma você deseja utilizar durante o processo de instalação?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Sair"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Nome de usuário"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Nome do Grupo"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Senha:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Senha VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Adicionar o ponto de montagem"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-#, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Capacidade Desejada:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-#, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Ponto de Montagem:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "ADICIONAR UM NOVO PONTO DE MONTAGEM"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Opções mais personalizadas estão disponíveis⏎ após a criação do ponto de "
-"montagem abaixo."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr "O ponto de montagem já está em⏎ uso. Tentar algo a mais?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "ex.: \"20 GB\", \"500mb\" (sem aspas)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Deletar isto"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Salvar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-#, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CONFIGURAR PONTO DE MONTAGEM"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-#, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Por favor crie um nome para seu grupo de volume e selecione pelo menos um "
-"disco abaixo."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Livre"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
-#, fuzzy
-msgid "RAID Level:"
-msgstr "Dispositivo RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Criptograr"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "Adicionar um novo ponto de montagem."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Adicionar"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "Remover o(s) ponto(s) de montagem."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Remover layout"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+#, fuzzy
+msgid "Reload storage configuration from disk."
+msgstr "falha na configuração do armazenamento: %s"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Dispositivo Selecionado"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Descrição do Dispositivo"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Ponto de Montagem:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Capacidade Desejada:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Rótulo:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Tipo Desejado:</b>"
+msgid "Device(s):"
+msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Sistema de Arquivo:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Criptograr"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Reformatar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Grupo de Volume:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Modificar ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Nome:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Tipo Desejado:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Criptograr"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Sistema do arquivo"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Reformatar"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Grupo de Volume:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Modificar ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Dispositivo RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3670,17 +5179,19 @@ msgstr ""
 "Este dispositivo é criptografado e não pode ser lido sem uma senha válida. "
 "Você pode desbloquear abaixo."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Senha:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Desbloquear"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3688,295 +5199,571 @@ msgstr ""
 "Este dispositivo não pode ser editado diretamente. Você pode removê-lo ou "
 "selecionar um dispositivo diferente."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Adicionar um novo ponto de montagem."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Remover o(s) ponto(s) de montagem."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Configurar ponto de montagem selecionado."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Configurar"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "falha na configuração do armazenamento: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGURAR PONTO DE MONTAGEM"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Selecionar um ou mais discos que este dispositivo pode residir."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Endereço IP"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "É preciso fornecer um nome para iniciador iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Usar Autenticação"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Nome de usuário"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Senha VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome de usuário"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Senha VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Nome de usuário"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Senha VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Nome da Rede"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Usar Autenticação"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome de usuário"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Senha VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Nome de usuário"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Senha VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Nome de usuário"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Senha VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Conexão falhou"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispositivo:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "DISCOS SELECIONADOS"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Encerrar"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Iniciar"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Descrição"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Livre"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Remover layout"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "O sumário do disco deve ir aqui"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Deletar isto"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Nada selecionado"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGURAR PONTO DE MONTAGEM"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Selecionar um ou mais discos que este dispositivo pode residir."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Adicionar o ponto de montagem"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Capacidade Desejada:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Ponto de Montagem:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "ADICIONAR UM NOVO PONTO DE MONTAGEM"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Opções mais personalizadas estão disponíveis⏎ após a criação do ponto de "
+"montagem abaixo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr "O ponto de montagem já está em⏎ uso. Tentar algo a mais?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "ex.: \"20 GB\", \"500mb\" (sem aspas)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Salvar"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CONFIGURAR PONTO DE MONTAGEM"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Por favor crie um nome para seu grupo de volume e selecione pelo menos um "
+"disco abaixo."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Nome:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispositivo RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Criptograr"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Por favor insira um ponto de monagem válido."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formatando dispositivo DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Um erro desconhecido ocorreu durante a instalação. Leia os detalhes abaixo."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "SENHA DE CRIPTOGRAFIA DO DISCO"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Salvar senha"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "SENHA DE CRIPTOGRAFIA DO DISCO"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3985,7 +5772,19 @@ msgstr ""
 "Você escolheu por criptografar seus dados. Você precisará criar uma senha "
 "para uso de acesso aos seus dados quando inciar seu computador."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Senha:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Confirmar:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3995,167 +5794,221 @@ msgstr ""
 "layout do seu teclado, você talvex não esteja apto a descriptografar seus "
 "discos após a instalação."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "RECUPERAR ESPAÇO DO DISCO"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Espaço recuperável"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "RECUPERAR ESPAÇO DO DISCO"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "A descrição vai aqui."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Sistema do arquivo"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Espaço Recuperável"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Ação"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Preservar"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Excluir"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Reduzir"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Particionamento personalizado selecionado"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Aplicar Alterações"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Dispositivo:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Adicionar o ponto de montagem"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "Instalador _Sair"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Não"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Sim"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr "Você tem certeza de que deseja sair do⏎ processo de instalação? "
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Sair"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "SUMÁRIO DE INSTALAÇÃO"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Sair"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Iniciar a Instalação"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "CONFIGURAÇÃO"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Preparando para instalar"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-" O %s foi instalado com êxito no seu sistema, porém algumas configurações "
-"ainda precisam ser feitas.⏎ Encerre-as e clique no botão de configuração "
-"Encerrar por favor."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Encerrar configuração"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"O %s foi instalado com êxito no seu sistema e está pronto⏎ para uso! "
-"Continue e reinicie sua máquina para começar o seu uso!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Reinicializar"
 
@@ -4171,16 +6024,16 @@ msgstr "Instalar"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalar o live CD no seu disco rígido"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Iniciando Instalação no Disco Rígido"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Bem-vindo ao Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4189,25 +6042,26 @@ msgstr ""
 "%s requer %s MB de memória para a instalação, mas você tem apenas %s MB "
 "nessa máquina.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "A %s instalação gráfica requer %s MB de memória, mas você tem apenas %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "A quantidade de memória RAM não é suficiente"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4221,24 +6075,24 @@ msgstr ""
 "\n"
 "em um terminal como root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Iniciando o modo texto."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Erro"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "A variável DISPLAY não foi especificada. Iniciando modo texto."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Instalação gráfica não disponível. Iniciando em modo texto."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4249,20 +6103,20 @@ msgstr ""
 "permite que você especifique seu próprio particionamento ou seleção de "
 "pacotes. Gostaria de utilizar o modo VNC ao invés?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Por favor ssh install@%s para iniciar a instalação"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Por favor sh install@<host> para continuar a instalação."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Tentar o Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4272,7 +6126,7 @@ msgstr ""
 "instalar o Fedora agora e escolher \"Instalar ao Disco Rígido\" na Visão "
 "Geral das Atividades em qualquer momento."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4280,10 +6134,86 @@ msgstr ""
 "Você pode escolher \"Instalar ao Disco Rígido\"⏎ na Visão Geral das "
 "Atividades em qualquer momento."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Encerrar"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "O nome da máquina deve começar com um caractere válido dos intervalos de "
+#~ "\"a-z\", \"A-Z\" ou \"0-9\""
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Você precisa de mais espaço nos seguintes sistemas de arquivos:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Não pode haver uma pergunta no modo de linha de comando!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "O ponto de montagem é inválido. Tentar algo diferente?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Erro ao baixar o pacote metadados..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Nada selecionado"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Firmware faltando"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Autenticação requerida"
+
+#~ msgid "column"
+#~ msgstr "coluna"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Tipo de Partição:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Nome do usuário</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Senha</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "O ponto de montagem é inválido. Tentar algo diferente?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Rótulo:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Sistema de Arquivo:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispositivo RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Configurar ponto de montagem selecionado."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Concluído"
 
@@ -4333,42 +6263,9 @@ msgstr "Encerrar"
 #~ msgid "Install on System"
 #~ msgstr "Instalar no sistema"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "O seguinte erro ocorreu enquanto configurando o repositório de "
-#~ "instalação:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "A instalação não pode continuar."
-
 #~ msgid "Exit installer"
 #~ msgstr "Sair do instalador"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Sua instalação foi parada devido ao que parece ser um problema com seu "
-#~ "hardware. A mensagem de erro correta é:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "O instalador será agora interrompido."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Encontrado um Erro de Hardware"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Sair do instalador"
 
@@ -4669,9 +6566,6 @@ msgstr "Encerrar"
 #~ msgid "Software Development"
 #~ msgstr "Desenvolvimento de software"
 
-#~ msgid "Web Server"
-#~ msgstr "Servidor web"
-
 #~ msgid "Minimal"
 #~ msgstr "Mínimo"
 
@@ -4715,50 +6609,6 @@ msgstr "Encerrar"
 #~ "que não podem ser excluídas:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Você não definiu uma partição raiz (/), que é necessária para continuar a "
-#~ "instalação do %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "A sua partição raiz tem menos de 250 megabytes, o que geralmente é muito "
-#~ "pouco para instalar o %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Este plataforma requer o /boot em uma partição dedicada ou volume lógico. "
-#~ "Se você não quiser um volume /boot, você deve colocar uma / em uma "
-#~ "partição não LVM dedicada."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Sua partição %(mount)s é menor do que %(size)s megabytes que é menor do "
-#~ "que o recomendado para uma instalação normal do %(productName)s ."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Sua partição %(mount)s é muito pequena para formatação %(format)s (o "
-#~ "tamanho permitido é de %(minSize)d MB a %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Sua partição %(mount)s é muito grande para formatação %(format)s (o "
-#~ "tamanho permitido é de %(minSize)d MB a %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4777,58 +6627,6 @@ msgstr "Encerrar"
 #~ "você não criou um dispositivo alvo estágio1 do gerenciador de "
 #~ "inicialização"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Você não criou uma partição inicializável."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Seu sistema baseado no BIOS precisa de uma partição especial para inciar "
-#~ "com o formato do rótulo do novo disco (GPT) do %s. Para continuar, por "
-#~ "favor crie uma partição de tipo 'Iniciar BIOS' 1MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Você não especificou uma partição swap. %(requiredMem)s MB de memória são "
-#~ "necessários para continuar a instalação sem uma partição swap, mas você "
-#~ "só possui %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Você não especificou uma partição de troca (swap). Embora não seja "
-#~ "necessária em todos os casos, a sua utilização aumenta significativamente "
-#~ "a performance na maior parte das instalações."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Ao menos um dos seus dispositivos swap não tem um UUID, o que é comum em "
-#~ "espaços swap criados utilizando versões antigas do mkswap. Esses "
-#~ "dispositivos serão referenciados como sendo caminhos de dispositivo em /"
-#~ "etc/fstab, o que não é o ideal já que os caminhos de dispositivo podem "
-#~ "mudar de acordo com uma variedade de circunstâncias. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Este ponto de montagem é inválido. O diretório %s deve estar no sistema "
-#~ "de arquivos /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "O ponto de montagem %s deve ficar em um sistema de arquivos Linux."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux no %s"
 
@@ -4838,11 +6636,6 @@ msgstr "Encerrar"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux de %(version)s para %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatando dispositivo DASD"
-#~ msgstr[1] "Formatando dispositivos DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Preparando o dispositivo DASD %d para uso no Linux... "
@@ -5056,9 +6849,6 @@ msgstr "Encerrar"
 #~ msgid "Error setting root password"
 #~ msgstr "Erro definindo senha de root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Você deve fornecer e confirmar uma senha."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Remover Pacotes"
 
@@ -5078,24 +6868,12 @@ msgstr "Encerrar"
 #~ msgid "%s of %s"
 #~ msgstr "%s de %s"
 
-#~ msgid "Region:"
-#~ msgstr "Região:"
-
-#~ msgid "City:"
-#~ msgstr "Cidade:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 horas"
-
-#~ msgid "AM/PM"
-#~ msgstr "Pela manhã/à tarde"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Selecionar seus complementos"
 
@@ -5172,9 +6950,6 @@ msgstr "Encerrar"
 #~ msgid "configureButton"
 #~ msgstr "Botãoconfigurar"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Encerrar o Particionamento "
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "CONFIGURAR GRUPO DE VOLUME"
 
diff --git a/anaconda/po/ro.po b/anaconda/po/ro.po
index 9ccf655..54db3e3 100644
--- a/anaconda/po/ro.po
+++ b/anaconda/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/fedora/language/"
@@ -21,208 +21,441 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Pornire VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Folosește modul text"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr ""
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -231,85 +464,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -318,7 +843,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -333,8 +863,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Recuperare"
 
@@ -372,28 +902,22 @@ msgstr "Sistem de recuperat"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr ""
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Ieșire"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -406,7 +930,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -415,28 +939,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mod recuperare"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Sistemul a fost montat sub directorul %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Partiția rădăcină este mai mică de 250 megaocteți, dimensiune de obicei prea "
+"mică pentru a instala %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Nu ați definit o partiție rădăcină (/), necesară pentru ca instalarea %s să "
+"continue."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Partiția rădăcină este mai mică de 250 megaocteți, dimensiune de obicei prea "
+"mică pentru a instala %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Nu ați specificat o partiție swap.  Deși nu e strict necesară, o astfel de "
+"partiție îmbunătățește semnificativ performanța pentru majoritatea "
+"instalărilor."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -530,84 +1234,231 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Aveți nevoide mai mult spațiu pe următoarele sisteme de fișiere:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "pachet(e) mai vechi"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Instalează"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Instalează"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Eroare"
 
@@ -631,31 +1482,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -670,447 +1523,520 @@ msgstr ""
 "vă conecta la acest calculator de pe un alt calculator si să efectuați o "
 "instalare în mod grafic sau continuați cu o instalare în mod text?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Parola trebuie să aibă cel puțin 6 caractere."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Parola trebuie să aibă cel puțin 6 caractere."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Progresul instalării"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Pornire VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Progresul instalării"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Dezvoltare de programe"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Avertisment"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1125,581 +2051,408 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Dezvoltare de programe"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1726,277 +2479,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Dezvoltare de programe"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2004,14 +2781,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2020,33 +2797,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2054,94 +2837,108 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 msgid "_OK"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2153,68 +2950,163 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2223,945 +3115,1346 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Continuare"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Folosește modul text"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Dispozitiv RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Adaugă"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Continuare"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Continuare"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Continuare"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Conectat!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "Renunță la instalare"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Avertisment"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Adaugă"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Adaugă"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Dispozitiv RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Adaugă"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3169,643 +4462,1002 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Ce limbă doriți să folosiți pe parcursul procesului de instalare?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Continuare"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Liber"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Dispozitiv RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Adaugă"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Dispozitiv RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Dispozitiv RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Dispozitiv RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Dispozitiv RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Liber"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Dispozitiv RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Instalează"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Re_pornire"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3819,40 +5471,41 @@ msgstr "Instalează"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalează CD-ul live pe disc"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3861,60 +5514,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Eroare"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Aveți nevoide mai mult spațiu pe următoarele sisteme de fișiere:\n"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Dispozitiv RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Terminat"
 
@@ -3924,9 +5584,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Ieșire instalare"
 
-#~ msgid "_Exit installer"
-#~ msgstr "Renunță la instalare"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Adresa IP lipsește."
 
@@ -3964,9 +5621,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "Acesta nu este discul %s corect."
 
-#~ msgid "Re_boot"
-#~ msgstr "Re_pornire"
-
 #~ msgid "_Retry"
 #~ msgstr "_Reîncercare"
 
@@ -3976,9 +5630,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "conflicte fișiere"
 
-#~ msgid "older package(s)"
-#~ msgstr "pachet(e) mai vechi"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "insuficient spațiu pe disc"
 
@@ -4031,20 +5682,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Nu puteți șterge o partiție a unui DASD formatat LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Nu ați definit o partiție rădăcină (/), necesară pentru ca instalarea %s "
-#~ "să continue."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Partiția rădăcină este mai mică de 250 megaocteți, dimensiune de obicei "
-#~ "prea mică pentru a instala %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4058,15 +5695,6 @@ msgstr ""
 #~ "Instalare pe un dispozitiv FireWire.  Aceasta ar putea produce sau nu un "
 #~ "sistem funcțional."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Nu ați specificat o partiție swap.  Deși nu e strict necesară, o astfel "
-#~ "de partiție îmbunătățește semnificativ performanța pentru majoritatea "
-#~ "instalărilor."
-
 #~ msgid "Back"
 #~ msgstr "Înapoi"
 
diff --git a/anaconda/po/ru.po b/anaconda/po/ru.po
index 2539728..886f9f2 100644
--- a/anaconda/po/ru.po
+++ b/anaconda/po/ru.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Russian <trans-ru@lists.fedoraproject.org>\n"
@@ -40,11 +40,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "файловая система /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -53,7 +53,7 @@ msgstr ""
 "Массивы RAID, в которые входит '%s', должны иметь один из следующих raid-"
 "уровней: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -62,7 +62,7 @@ msgstr ""
 "Массивы RAID, в которые входит '%s', должны иметь метаданные одной из "
 "следующих версий: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -71,108 +71,129 @@ msgstr ""
 "Массивы RAID, в которые входит '%s', должны иметь устройства одного из "
 "следующих типов: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s должен иметь один из следующих типов меток диска: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s не может быть типа %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s должен быть смонтирован на одном из %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s должен быть размером между %d и %d МБ"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s не должен быть меньше, чем %d МБ."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s не должен быть больше, чем %d МБ."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s должен быть в первых %d МБ диска."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s должен быть на основном разделе."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s не может быть на зашифрованном блочном устройстве."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s не может быть типа %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "В %s может быть недостаточно места, чтобы grub2 мог встроить  core.img при "
 "использовании файловой системы %s на %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Запустить VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Использовать текстовый режим"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Пароль установлен."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Пароли не совпадают!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Указанный пароль слишком прост: %s.  Нажмите «Готово» ещё раз, чтобы всё "
 "равно его использовать."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -180,87 +201,337 @@ msgstr ""
 "равно его использовать."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Простой"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Нормальный"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Хороший"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Сложный"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OК"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Да"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Нет"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Следующая ошибка возникла при настройке репозитория установки:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Продолжение установки невозможно."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Следующая ошибка возникла при настройке репозитория установки:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Продолжение установки невозможно."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Следующее программное обеспечение, отмеченное для установки, содержит "
+"ошибки.  Вероятно, это вызвано ошибкой источника установки.  Можно "
+"попытаться удалить эти пакеты из установки.\n"
+"смените источник установки или выйдите из установщика."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Установка остановлена, по-видимому, из-за проблемы с вашим оборудованием. "
+"Сообщение об ошибке в точности:\n"
+"\n"
+"%s.\n"
+"\n"
+" Теперь установка будет прекращена."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Установка остановлена, по-видимому, из-за проблемы с вашим оборудованием. "
+"Сообщение об ошибке в точности:\n"
+"\n"
+"%s.\n"
+"\n"
+" Теперь установка будет прекращена."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Возникла аппаратная ошибка"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Установка остановлена, по-видимому, из-за проблемы с вашим оборудованием. "
+"Сообщение об ошибке в точности:\n"
+"\n"
+"%s.\n"
+"\n"
+" Теперь установка будет прекращена."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "_Настройки адреса"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Выполняются пред-установочные сценарии"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Настройка источника установки..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Выполняются пост-установочные задачи"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Для escrow-сертификата %s требуется сетевое подключение."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -272,85 +543,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "Нет %s. Настройка сетевого экрана невозможна."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "Нет %s. Настройка сетевого экрана невозможна."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Данная файловая система не поддерживает метки."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Имя %s уже используется."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Группа томов %s уже используется. Изменения не будут сохранены."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Выполняются пред-установочные сценарии"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Имя узла не может содержать более 255 символов."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "Имя узла должно начинаться с символов a-z, A-Z, 0-9."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Неизвестный"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Подключение..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Отключение..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Проводное (%s) подключено"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Установлено беспроводное соединение с %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Не подключен"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Сетевые устройства недоступны."
 
@@ -359,7 +922,12 @@ msgstr "Сетевые устройства недоступны."
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Новая установка %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Выполнить %s для размонтирования системы, когда вы закончите."
@@ -372,8 +940,8 @@ msgstr "После завершения выйдите из оболочки, и
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Не удаётся найти /bin/sh для запуска! Оболочка не будет запущена."
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Восстановить"
 
@@ -421,21 +989,15 @@ msgstr "Система для восстановления"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Укажите устройство, содержащее корневой раздел для установки."
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OК"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Выход"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Система будет перезагружена автоматически после выхода из оболочки."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -445,7 +1007,7 @@ msgstr ""
 "монтирования. Нажмите return для входа в оболочку, где можно будет выполнить "
 "проверку fsck и смонтировать разделы. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -466,7 +1028,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -479,28 +1041,236 @@ msgstr ""
 "\n"
 "Нажмите «Enter» для входа в оболочку."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "В системе нет разделов Linux. Будет выполнена перезагрузка.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Система будет перезагружена автоматически после выхода из оболочки."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Режим восстановления"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "В системе нет разделов Linux. Нажмите «Enter» для входа в оболочку.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Ваша система смонтирована в каталог %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Обычный раздел"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Диск"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr "Раздел «swap» используется операционной системой при нехватке памяти."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Раздел «boot» используется для хранения файлов, необходимых\n"
+"для запуска операционой системы."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr "В разделе «root» хранятся файлы приложений и системы."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr "В разделе «home» хранятся данные пользователей."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Раздел «BIOS boot» требуется для загрузки системы с дисков\n"
+"с разметкой GPT на оборудовании с BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"На некоторых платформах PPC для размещения\n"
+"конфигурации загрузчика требуется раздел PReP."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Размер корневого раздела меньше 250 МБ. Как правило, этого недостаточно для "
+"установки %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Вы не указали корневой раздел (/), который необходим для продолжения "
+"установки %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Для данной платформы требуется монтировать /boot на выделенном разделе или "
+"логическом томе. Если вы не хотите выносить /boot на отдельный том, "
+"необходимо разместить / на выделенном не-LVM разделе."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Размер раздела %(mount)s меньше %(size)s МБ, что меньше рекомендуемого "
+"размера для нормальной установки %(productName)s. "
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Раздел %(mount)s слишком мал для %(format)s форматирования (допустимые "
+"размеры: от %(minSize)d МБ до %(maxSize)d МБ)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Раздел %(mount)s слишком велик для %(format)s форматирования (допустимые "
+"размеры: от %(minSize)d МБ до %(maxSize)d МБ)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Не удалось добавить новое устройство. Подробнее…"
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Вы не создали загружаемый раздел."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"BIOS в вашей системе требует специальный раздел для загрузки %s с новым "
+"форматом меток диска (GPT). Для продолжения создайте раздел типа 'BIOS Boot' "
+"размером 1 МБ."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Вы не определили swap-раздел.  Для продолжения установки без swap-раздела "
+"необходимо %(requiredMem)s МБ памяти, а доступно лишь %(installedMem)s МБ."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Вы не создали раздел подкачки. Хотя это и не всегда является необходимым, в "
+"большинстве случаев раздел подкачки может значительно улучшить "
+"производительность системы."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"По крайней мере одно из устройств подкачки не имеет UUID, что обычно бывает, "
+"если область подкачки создается с использованием старых версий mkswap. К "
+"этим устройствам обращение будет по пути к устройству из /etc/fstab, а это "
+"не самый лучший способ, так как пути устройств могут меняться при различных "
+"обстоятельствах. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Неверная точка монтирования. Каталог %s должен располагаться в файловой "
+"системе /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Точка монтирования %s должна располагаться в файловой системе Linux. "
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Пароль:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -614,87 +1384,240 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Указанный пароль VNC содержит меньше 6 символов.\n"
 "Введите новый пароль. Для работы без пароля оставьте поле пустым."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Не удалось настроить источник для установки"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Ошибка загрузки метаданных пакета..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Нет доступных источников для установки"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Устанавливается программное обеспечение"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Начинается процесс установки пакетов"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Требуется больше места на следующих файловых системах:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Подготовка транзакции из источника установки"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Установка"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Загрузка метаданных пакета..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Установка"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Подготовка к установке"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Проверка настроек накопителей..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "НАЗВАНИЕ ПО УМОЛЧАНИЮ"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "РЕГИОНАЛЬНЫЕ НАСТРОЙКИ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "РЕГИОНАЛЬНЫЕ НАСТРОЙКИ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "ПРОГРАММНОЕ ОБЕСПЕЧЕНИЕ"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "СИСТЕМА"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Узел установки"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Запуск автоматической установки..."
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Нельзя задавать вопрос в режиме командной строки!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "Выберите ['q' для выхода | 'c' для продолжения]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Заполните все поля, прежде чем продолжить"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Название узла по умолчанию"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Заполните все поля, прежде чем продолжить"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Ошибка"
 
@@ -718,32 +1641,35 @@ msgstr "да"
 msgid "no"
 msgstr "нет"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Действительно хотите выйти?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "Выберите ['q' для выхода | 'c' для продолжения]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -758,219 +1684,258 @@ msgstr ""
 "для подключения к данному компьютеру с другой машины и выполнения установки "
 "в графическом режиме или продолжить установку в текстовом режиме?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Пароль VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Введите пароль VNC. Его потребуется напечатать дважды.\n"
 "Пустой ввод означает работу без пароля."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Пароль:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Пароль (подтверждение):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Пароли не совпадают!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Пароль должен содержать не менее 6 символов."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Пароль должен содержать не менее 6 символов."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Настройка временных зон"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Временная зона не задана"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Доступные регионы"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Доступные регионы"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Проверка настроек накопителей..."
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Проводное (%s) подключено"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Проводное (%s) подключено"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Имя сервера"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Имя сервера"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Имя сервера"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "Завершить настройку"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Шлюз"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "в описании файловой системы отсутствует поле тип"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Пароль root:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Пароль установлен."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Пользователь root заблокирован."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Пароль не установлен."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Выберите новый пароль root. Его потребуется ввести дважды."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Использовать все пространство"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Заменить существующую систему(мы) Linux"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Использовать свободное пространство"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Место установки"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Ни одного диска не выбрано"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Ошибка при  проверке настроек накопителей"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Ошибка при  проверке настроек накопителей"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Выбрано автоматическое разбиение диска"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Выбрано собственное разбиение диска"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -978,38 +1943,59 @@ msgstr ""
 "Ни один диск не обнаружен. Выключите компьютер и подключите хотя бы один "
 "диск. После этого можно вновь начать установку."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Ни один диск не выбран; необходим хотя бы один диск для установки."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Проверка устройств хранения..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Создание обновленной конфигурации устройств хранения"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "Ошибка настройки хранилища: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Проверка настроек накопителей..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Настройки автоматического создания разделов"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1018,41 +2004,41 @@ msgstr ""
 "Для установки необходимо разбиение жесткого диска на разделы.  Выберите, "
 "сколько места потребуется для установки целевой системы."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Конфигурация схемы разделов"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Конфигурация схемы разделов"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Настройка временных зон"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Часовой пояс %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Временная зона не задана"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Доступные временные зоны в регионе %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Доступные регионы"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1061,179 +2047,197 @@ msgstr ""
 "Используйте цифры или непосредственно введите название [b для списка "
 "регионов, q для выхода]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Запустить VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Прогресс установки"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Ближайшее зеркало"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Сервер NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Ошибка при настройке источника программного обеспечения"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Ничего не выбрано"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Подключение..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Привод CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-файл:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Сетевое время"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Нет доступных источников для установки"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Не удалось настроить источник для установки"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Ошибка загрузки метаданных пакета..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Нет доступных источников для установки"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Сервер NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Параметры монтирования NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Не удалось настроить источник для установки, проверьте адрес репозитория"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "устройство, содержащее /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Не удалось настроить источник для установки"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Изменить выбор программного обеспечения"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Ошибка при проверке выбора программного обеспечения"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Источник установки не настроен"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Свой выбор программного обеспечения"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Источник установки не настроен"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Выберите среду"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "_Использовать проверку подлинности"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Необходимо ввести и подтвердить пароль."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Внимание"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1249,36 +2253,36 @@ msgstr "В процессе"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tУстановка завершена.  Нажмите Enter для выхода"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Стандартное название для запоминания"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "проверка состояния..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Новое устройство"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Пароль (подтверждение):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1287,7 +2291,7 @@ msgstr ""
 "Указанный пароль слишком прост: %s.  Нажмите «Готово» ещё раз, чтобы всё "
 "равно его использовать."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1296,63 +2300,46 @@ msgstr ""
 "Указанный пароль слишком прост: %s.  Нажмите «Готово» ещё раз, чтобы всё "
 "равно его использовать."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Пароль установлен."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "В_ыход из программы установки"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "В_ыход "
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Нет"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Да"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "НАЗВАНИЕ ПО УМОЛЧАНИЮ"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "РЕГИОНАЛЬНЫЕ НАСТРОЙКИ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "РЕГИОНАЛЬНЫЕ НАСТРОЙКИ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "ПРОГРАММНОЕ ОБЕСПЕЧЕНИЕ"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "СИСТЕМА"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1360,7 +2347,11 @@ msgstr ""
 "Заполните элементы, отмеченные этим значком, прежде чем перейти к следующему "
 "шагу."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Готово!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1369,167 +2360,66 @@ msgstr ""
 "%s успешно установлена на компьютер и готова\n"
 "к использованию!  Перезагрузите систему и начните использовать её!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Готово!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "В_ыход "
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Новая установка %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s успешно установлена на ваш компьютер, но требуется выполнить некоторую "
+"настройку.\n"
+"Завершите её и нажмите на кнопку «Завершить настройку»."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s успешно установлена на компьютер и готова\n"
+"к использованию!  Перезагрузите систему и начните использовать её!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Создать группу томов..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr "Определите имя для группы томов и выберите как минимум один диск."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Группа томов:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "колонка"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr "Настройки хранилища сброшены из-за неустранимой ошибки. Подробнее…"
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr "Перенастройка устройства не удалась. Подробнее…"
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Укажите правильную точку монтирования."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Это неверная точка монтирования. Попробовать ещё?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Эта точка монтирования уже используется. Попробовать ещё?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Для выбранного уровня RAID требуется больше дисков, чем доступно на данный "
-"момент."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Укажите правильную точку монтирования."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Это неверная точка монтирования. Попробовать ещё?"
+"Storage configuration reset due to unrecoverable error. Click for details."
+msgstr "Настройки хранилища сброшены из-за неустранимой ошибки. Подробнее…"
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Обычный раздел"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Диск"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Нет"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Удалить файловые системы в корне %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Удалить все данные с %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Удалить все данные с %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "РАЗМЕТКА ВРУЧНУЮ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d накопитель выбран"
 msgstr[1] "%d накопителя выбрано"
 msgstr[2] "%d накопителей выбрано"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1538,125 +2428,117 @@ msgstr ""
 "При создании точек монтирования для установки %s %s\n"
 "можно просмотреть сведения о них здесь."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr "Раздел «swap» используется операционной системой при нехватке памяти."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Раздел «boot» используется для хранения файлов, необходимых\n"
-"для запуска операционой системы."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr "В разделе «root» хранятся файлы приложений и системы."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr "В разделе «home» хранятся данные пользователей."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Раздел «BIOS boot» требуется для загрузки системы с дисков\n"
-"с разметкой GPT на оборудовании с BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"На некоторых платформах PPC для размещения\n"
-"конфигурации загрузчика требуется раздел PReP."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi должен быть на устройстве типа %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s должен быть на устройстве типа %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s не может быть зашифрован"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Вы должны создать новую файловую систему на корневом устройстве."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 "Использование устройств типа %s требует определения надлежащего уровня RAID."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "Запрос на изменение размера устройства не выполнен. Подробнее…"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "Запрос на переформатирование устройства не выполнен. Подробнее…"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Имя %s уже используется."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Данная файловая система не поддерживает метки."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Ни одного диска не выбрано"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Для данной файловой системы не может быть изменен размер."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Ошибка при проверке конфигурации устройств хранения.  Нажмите для получения "
+"подробных сведений."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Ошибка при проверке конфигурации устройств хранения.  Нажмите для получения "
+"подробных сведений."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "%s добавлен к существующему контейнеру %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Не удалось добавить новое устройство. Подробнее…"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "Недопустимый размер раздела. Необходимо указать корректное целое число."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Запрос на удаление устройства не выполнен. Подробнее…"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Группа томов %s уже используется. Изменения не будут сохранены."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "фс свободна"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1665,7 +2547,7 @@ msgstr ""
 "Это устройство не может быть изменено напрямую. Следует его удалить и "
 "добавить другое устройство."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1674,196 +2556,146 @@ msgstr ""
 "Это устройство не может быть изменено напрямую. Следует его удалить и "
 "добавить другое устройство."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Не выбран ни один диск."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Недостаточно свободного места на выбранных дисках."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Автоматическое разбиение не удалось. Подробнее…"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Изменить выбор программного обеспечения"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Не удалось расшифровать блочное устройство. Нажмите для получения подробных "
 "сведений"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "ДАТА И ВРЕМЯ"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Неверный часовой пояс"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Для использования NTP нужно сначала настроить сеть"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Не настроено ещё не одного рабочего сервера NTP"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "МЕСТО УСТАНОВКИ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d накопитель выбран"
+msgstr[1] "%d накопителя выбрано"
+msgstr[2] "%d накопителей выбрано"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s для переключения раскладок."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "КЛАВИАТУРА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Нельзя опробовать раскладки клавиатур."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "проверка состояния..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Переключение раскладки не настроено."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "ЯЗЫК"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Статус неивестен (не найден)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Статус неивестен"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Неуправляемый"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Недоступно"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Прошивка не найдена"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Кабель не подсоединён"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Недоступно"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Отключён"
@@ -1888,202 +2720,249 @@ msgstr "Отключение"
 msgid "Connection failed"
 msgstr "Ошибка подключения"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "не подсоединён"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Беспроводное"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "не подсоединён"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Адрес IPv4:"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 Адрес"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-адрес"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Мб/с"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Нет"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Требуется проверка подлинности"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "НАСТРОЙКА СЕТИ"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ПАРОЛЬ ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Пароль установлен."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Пароль root задан"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Учетная запись пользователя root отключена"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Пароль root не установлен"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "ВЫБОР ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Проверка зависимостей ПО..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Ошибка при проверке зависимостей"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Загрузка метаданных пакета..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Загрузка метаданных группы..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Проверка зависимостей ПО..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Ошибка при проверке зависимостей"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Ошибка при проверке зависимостей ПО. Нажмите для получения подробных "
 "сведений."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Следующее программное обеспечение, отмеченное для установки, содержит "
 "ошибки.  Вероятно, это вызвано ошибкой источника установки.  Можно "
 "попытаться удалить эти пакеты из установки.\n"
 "смените источник установки или выйдите из установщика."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Отмена"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "В_ыход "
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Изменить источник ПО"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Изменить выбор программного обеспечения"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Настройка источника установки..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Ошибка загрузки метаданных пакета..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Требуется проверка подлинности"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Этот носитель подходит для установки."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Этот носитель не подходит для установки."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ИСТОЧНИК УСТАНОВКИ"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Не удалось настроить источник для установки, проверьте адрес репозитория"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Ошибка настройки репозитория"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Ошибка при настройке источника программного обеспечения"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2091,98 +2970,80 @@ msgstr ""
 "Не удалось настроить источник для установки, проверьте адрес репозитория и "
 "настройки прокси"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Ошибка настройки репозитория"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Ошибка при настройке источника программного обеспечения"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Сервер NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Неверный часовой пояс"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Неверный часовой пояс"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Неверный часовой пояс"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Подождите… Всё ещё загружаются метаданные ПО."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Выбранные диски имеют следующее количество свободного места:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Подождите… Всё ещё загружаются метаданные ПО."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2192,7 +3053,7 @@ msgstr ""
 "<b>Недостаточно свободного места для установки %s</b>, но можно\n"
 "освободить место, сократив или удалив существующие разделы."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2203,7 +3064,7 @@ msgstr ""
 "свободное пространство,\n"
 "имеющееся на выбранных дисках."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2218,39 +3079,46 @@ msgstr ""
 "изменить выбор программного обеспечения для получения меньшей по размеру "
 "версии <b>%s</b>, или покинуть установщик."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "МЕСТО УСТАНОВКИ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Сохранение конфигурации накопителей данных…"
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Не удалось сохранить конфигурацию накопителей данных…"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Форматирование DASD-устройства"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Ошибка при проверке конфигурации устройств хранения.  Нажмите для получения "
 "подробных сведений."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Ошибка при проверке конфигурации устройств хранения.  Нажмите для получения "
 "подробных сведений."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "фс свободна"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2258,7 +3126,7 @@ msgstr[0] "Выбран %d диск; емкость: %s; доступно: %s"
 msgstr[1] "Выбрано %d диска; емкость: %s; доступно: %s"
 msgstr[2] "Выбрано %d дисков; емкость: %s; доступно: %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2266,7 +3134,11 @@ msgstr ""
 "Вы решили пропустить установку загрузчика. Это может привести к тому, что "
 "загрузка системы будет невозможна."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2276,11 +3148,19 @@ msgstr ""
 "хранения.  Можете изменить схему устройств хранения\n"
 "или выйти из программы установки."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "В_ыход "
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Изменить схему дисков"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2291,75 +3171,80 @@ msgstr ""
 "хранения.  Можете изменить схему устройств хранения\n"
 "или выйти из программы установки."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OК"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "НАСТРОЙКА СЕТИ"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Неверный часовой пояс"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "ДОБРО ПОЖАЛОВАТЬ В %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "ДАННЫЕ"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "Не создано ещё ни одной точки монтирования для установки %s %s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Нажмите для автоматического создания."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Или же создайте новые точки монтирования ниже, нажав на значок '+' ."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2377,55 +3262,160 @@ msgstr[2] ""
 "<b>%d дисков; емкость: %s; доступно: %s</b> (не занято разделами и файловыми "
 "системами)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Назначить загрузочное устройство"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Для выбранного уровня RAID требуется больше дисков, чем доступно на данный "
+"момент."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr "Определите имя для группы томов и выберите как минимум один диск."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Группа томов:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "колонка"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Точка монтирования %s должна располагаться в файловой системе Linux. "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Эта точка монтирования уже используется. Попробовать ещё?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Укажите правильную точку монтирования."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Это неверная точка монтирования. Попробовать ещё?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Удалить файловые системы в корне %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Удалить все данные с %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Удалить все данные с %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Неверный часовой пояс"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "В_ыход "
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Указанный пароль слишком прост: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Пароли не совпадают."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Сохранить"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Ужать"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Удалить"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Создание %(type)s на %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Не готово"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Использовать свободное пространство"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2437,14 +3427,14 @@ msgstr ""
 "Чтобы освободить место, можно удалить ненужные файловые системы, но это "
 "приведёт к полному удалению всех данных, которые в них находятся."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2453,353 +3443,762 @@ msgstr[0] "<b>%s диск; %s доступного места</b> (в файло
 msgstr[1] "<b>%s диска; %s доступного места</b> (в файловых системах)"
 msgstr[2] "<b>%s дисков; %s доступного места</b> (в файловых системах)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Всего выбрано места для высвобождения: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Удалить"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Сохранить"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "УСТАНОВКА ДИСТРИБУТИВА"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "Название для запоминания"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "ПРЕДВАРИТЕЛЬНЫЙ ВЫПУСК / ТЕСТИРУЕМАЯ ВЕРСИЯ"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Новое устройство"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 Мб"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 Гб"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Новый выбор"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "Готово"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "П_родолжить"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Применить"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "НАСТРОЙКА СЕТИ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Имя группы"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Отмена"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OК"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "ДАТА И ВРЕМЯ"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Добавить и отметить для использования NTP серверы"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Веб-сервер"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "В процессе"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Использовать"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Настроить..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "ДАТА И ВРЕМЯ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Регион:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Регион:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Город:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Город:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Сетевое имя"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Сетевое имя"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 часа"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "МЕСТО УСТАНОВКИ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Объем"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Не подключен"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Выбранное устройство"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Ничего не выбрано"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Метка:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Прошивка не найдена"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Нет"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Тип VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Выбранное устройство"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "сводка"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Устройство RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Добавить"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Маршрут по умолчанию"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Маска подсети"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Скорость"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Аппаратный адрес"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Н_астроить..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Безопасность"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Сетевое имя"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Сетевое имя"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Ключ безопасности"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Использовать как точку доступа..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Остановить точку доступа..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Настроить..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Поставщик услуг"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Настроить..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Тип VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Имя группы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Пароль группы"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Настроить..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Метод"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Настройки адреса"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Узел socks"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Проверка настроек накопителей..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Разблокировать"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Ре_жим полёта"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Проверка настроек накопителей..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Имя сервера"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "НАСТРОЙКА СЕТИ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2809,206 +4208,61 @@ msgstr ""
 "сделать\n"
 "доступными обновления для программного обеспечения."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Маршрут по умолчанию"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Маска подсети"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Скорость"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Аппаратный адрес"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "Н_астроить..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Безопасность"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Сетевое имя"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Сетевое имя"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Ключ безопасности"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Использовать как точку доступа..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Остановить точку доступа..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Настроить..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Поставщик услуг"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Тип VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Шлюз"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Имя группы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Пароль группы"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Метод"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Настройки адреса"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Узел socks"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Разблокировать"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Ре_жим полёта"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Имя сервера"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "_Использовать проверку подлинности"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Требуется проверка подлинности"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Подключен"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "ВЫБОР ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Выберите среду"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "колонка"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Отменить и _добавить больше дисков"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ПАРАМЕТРЫ УСТАНОВКИ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Тип раздела:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Шифровать данные. Пароль будет установлен позднее."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Выбрано собственное разбиение диска"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Вернуть пространство"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ПАРАМЕТРЫ УСТАНОВКИ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3016,77 +4270,144 @@ msgstr ""
 "Здесь описывается, сколько места нужно для текущего выбора программного "
 "обеспечения."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "диск чист"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Свободное пространство, доступное для использования."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "фс свободна"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "Свободного места нет, но его можно получить из существующих разделов."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Здесь описываются варианты выбора."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Использовать свободное пространство"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Выйти из установщика"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Описание устройства"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Локальные стандартные диски"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Завершить разбиение"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Зашифровать"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Выбрано автоматическое разбиение диска"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Завершить разбиение"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "Зашифровать"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Шифровать данные. Пароль будет установлен позднее."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Настройки автоматического создания разделов"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "сводка"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Полная сводка данных о дисках и опциях…"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ДОБАВИТЬ РАСКЛАДКУ КЛАВИАТУРЫ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Можно добавить раскладку клавиатуры, выбрав её ниже:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Имя"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "РАСКЛАДКА КЛАВИАТУРЫ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3094,122 +4415,204 @@ msgstr ""
 "Какую раскладку клавиатуры использовать на этой системе? Раскладка, "
 "передвинутая на верх списка, будет использоваться по умолчанию."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "имя"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Добавить раскладку"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Удалить раскладку"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Передвинуть выбранную раскладку вверх"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Добавить раскладку"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Удалить раскладку"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Передвинуть выбранную раскладку вверх"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Передвинуть выбранную раскладку вниз"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Посмотреть раскладку"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Нельзя опробовать раскладки клавиатур."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift для переключения раскладок."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Параметры"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Добавить"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ДОБАВИТЬ РАСКЛАДКУ КЛАВИАТУРЫ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Можно добавить раскладку клавиатуры, выбрав её ниже:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Имя"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Доступные регионы"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Добавить раскладку"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OК"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ПАРАМЕТРЫ ПЕРЕКЛЮЧЕНИЯ РАСКЛАДКИ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "Выберите комбинацию клавиш для переключения раскладки."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "использование"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "описание"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Параметры монтирования NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "ЯЗЫК"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "родноеНазвание"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "английскоеНазвание"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Ничего не выбрано"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ПАРОЛЬ ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Пароль root:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Подтверждение:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Пароль VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Установите пароль root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3217,236 +4620,283 @@ msgstr ""
 "Учетная запись администратора (root) предназначена для управления системой. "
 "Введите пароль root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "Готово"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "ПРОВЕРКА НОСИТЕЛЕЙ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Проверка носителей, подождите..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Добавить"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OК"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Разрешить HTTP Proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Адрес прокси</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Пример:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "_Использовать проверку подлинности"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Имя пользователя</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Имя пользователя"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Пароль</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ИСТОЧНИК УСТАНОВКИ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Выберите источник установки"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Автоматически обнаруженный установочный носитель:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Метка:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Проверить"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-файл:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Выбрать ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "По _сети"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Настройки прокси..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Параметры монтирования NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Это поле не является обязательным."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Репозитории Fedora People"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Добавить точку монтирования"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Добавить"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Удалить выбранные точки монтирования."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Удалить раскладку"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Операционная ошибка."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Установите пароль root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Имя:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Адрес прокси</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Имя пользователя"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Это неверная точка монтирования. Попробовать ещё?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Уйти отсюда!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Продолжить"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Стабильность предварительной версии дистрибутива не гарантируется"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3457,202 +4907,264 @@ msgstr ""
 "ошибок, с которыми придется мириться. Эта система не является той, на "
 "которую можно положиться. Пока она предназначена только для тестирования."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "ДОБРО ПОЖАЛОВАТЬ В %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Какой язык вы хотите использовать в процессе установки?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "В_ыход "
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "П_родолжить"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Имя пользователя"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Имя группы"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Пароль VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Добавить точку монтирования"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-#, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Требуемый размер:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-#, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Точка монтирования:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "ДОБАВИТЬ НОВУЮ ТОЧКУ МОНТИРОВАНИЯ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Дополнительные настройки станут доступными\n"
-"после создания этой точки монтирования."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Эта точка монтирования уже\n"
-"используется. Выбрать другую?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "например: «20 Гб», «500 Мб» (без кавычек)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Удалить"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Сохранить"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-#, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "НАСТРОЙКА ТОЧКИ МОНТИРОВАНИЯ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-#, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr "Определите имя для группы томов и выберите как минимум один диск."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Своб."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
-#, fuzzy
-msgid "RAID Level:"
-msgstr "Устройство RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Зашифровать"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "Добавить точку монтирования"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Добавить"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "Удалить выбранные точки монтирования."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Удалить раскладку"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+#, fuzzy
+msgid "Reload storage configuration from disk."
+msgstr "Ошибка настройки хранилища: %s"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Выбранное устройство"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Описание устройства"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Точка монтирования:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Требуемый размер:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Метка:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Тип устройства:</b>"
+msgid "Device(s):"
+msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Файловая система:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "Зашифровать"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Форматировать заново"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Группа томов:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Изменить..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Имя:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Тип устройства:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Зашифровать"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Файловая система"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Форматировать заново"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Группа томов:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Изменить..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Устройство RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3660,17 +5172,19 @@ msgstr ""
 "Устройство зашифровано, его данные недоступны без пароля. Ниже его можно "
 "разблокировать."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Разблокировать"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3678,297 +5192,572 @@ msgstr ""
 "Это устройство не может быть изменено напрямую. Следует его удалить и "
 "добавить другое устройство."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Добавить точку монтирования"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Удалить выбранные точки монтирования."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Настроить точку монтирования."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Настроить..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "Ошибка настройки хранилища: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-"<span size=\"small\" foreground=\"white\">ДОСТУПНОЕ ПРОСТРАНСТВО</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ВСЕГО ПРОСТРАНСТВА</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Отмена"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "НАСТРОЙКА ТОЧКИ МОНТИРОВАНИЯ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Укажите диски, на которых может располагаться устройство."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OК"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-адрес"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Необходимо указать имя iSCSI-инициатора."
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "_Использовать проверку подлинности"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Пример:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Имя пользователя"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Пароль VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Имя пользователя"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Пароль VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Имя пользователя"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Пароль VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Сетевое имя"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "_Использовать проверку подлинности"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Имя пользователя"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Пароль VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Имя пользователя"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Пароль VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Имя пользователя"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Пароль VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Ошибка подключения"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OК"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Устройство:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "ВЫБРАННЫЕ ДИСКИ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Закрыть"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Загрузка"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Описание"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Своб."
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Удалить раскладку"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Сводная информация по диску"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Удалить"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Ничего не выбрано"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "НАСТРОЙКА ТОЧКИ МОНТИРОВАНИЯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Укажите диски, на которых может располагаться устройство."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Добавить точку монтирования"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Требуемый размер:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Точка монтирования:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "ДОБАВИТЬ НОВУЮ ТОЧКУ МОНТИРОВАНИЯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Дополнительные настройки станут доступными\n"
+"после создания этой точки монтирования."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Эта точка монтирования уже\n"
+"используется. Выбрать другую?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "например: «20 Гб», «500 Мб» (без кавычек)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Сохранить"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "НАСТРОЙКА ТОЧКИ МОНТИРОВАНИЯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr "Определите имя для группы томов и выберите как минимум один диск."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Имя:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Устройство RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Зашифровать"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Укажите правильную точку монтирования."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OК"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Форматирование DASD-устройства"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Во время установки произошла неизвестная ошибка.  Подробности приводятся "
 "ниже."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ПАРОЛЬ ШИФРОВАНИЯ ДИСКА"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Сохранить пароль"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ПАРОЛЬ ШИФРОВАНИЯ ДИСКА"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3977,7 +5766,19 @@ msgstr ""
 "Вы выбрали шифрование данных. Необходимо создать пароль доступа при запуске "
 "операционной системы."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Пароль:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Подтверждение:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3986,117 +5787,172 @@ msgstr ""
 "Предупреждение: Текущая раскладка клавиатуры — <b>%s</b>. Если изменить "
 "раскладку, то после уставновки это может помешать расшифровке дисков."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ВЕРНУТЬ ПРОСТРАНСТВО"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OК"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Отмена"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Вернуть пространство"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ВЕРНУТЬ ПРОСТРАНСТВО"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Описание"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Файловая система"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Место для возврата"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Действие"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Сохранить"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Удалить"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Ужать"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Выбрано собственное разбиение диска"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Применить"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Устройство:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Добавить точку монтирования"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "В_ыход из программы установки"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Нет"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Да"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4104,51 +5960,50 @@ msgstr ""
 "Действительно прервать\n"
 "процесс установки?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "В_ыход "
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "ОБЗОР УСТАНОВКИ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "В_ыход "
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Начать установку"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "КОНФИГУРАЦИЯ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Подготовка к установке"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s успешно установлена на ваш компьютер, но требуется выполнить некоторую "
-"настройку.\n"
-"Завершите её и нажмите на кнопку «Завершить настройку»."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "Завершить настройку"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s успешно установлена на компьютер и готова\n"
-"к использованию!  Перезагрузите систему и начните использовать её!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Перезагрузить"
 
@@ -4164,16 +6019,16 @@ msgstr "Установить"
 msgid "Install the live CD to your hard disk"
 msgstr "Установить Live CD на жёсткий диск."
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Начинается установка на жёсткий диск"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Добро пожаловать в Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4182,25 +6037,26 @@ msgstr ""
 "%s требует %s МБ памяти для установки, но на этом компьютере доступно %s "
 "МБ.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Для графической установки %s необходимо %s МБ, но у вас есть только %s МБ."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Недостаточно оперативной памяти"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4214,24 +6070,24 @@ msgstr ""
 "\n"
 " из терминала пользователя root."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Запуск текстового режима."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Ошибка"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Переменная DISPLAY не определена. Запускается текстовый режим."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Графическая установка невозможна. Запускается текстовый режим."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4242,20 +6098,20 @@ msgstr ""
 "позволит вам указать ваш собственный метод разбиения на разделы или "
 "выбранные пакеты. Хотите ли вы использовать режим VNC вместо этого?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Для начала установки выполните ssh install@%s."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Для продолжения установки выполните ssh install@<узел>."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Попробуйте Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4265,7 +6121,7 @@ msgstr ""
 "Вы можете установить Fedora сейчас или в любое время выбрать «Установить на "
 "жесткий диск» в меню «Обзор»."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4273,10 +6129,85 @@ msgstr ""
 "Вы можете в любое время выбрать «Установить на жесткий диск»\n"
 "в пункте «Обзор»."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Закрыть"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "Имя узла должно начинаться с символов a-z, A-Z, 0-9."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Требуется больше места на следующих файловых системах:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Нельзя задавать вопрос в режиме командной строки!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Это неверная точка монтирования. Попробовать ещё?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Ошибка загрузки метаданных пакета..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Ничего не выбрано"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Прошивка не найдена"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Требуется проверка подлинности"
+
+#~ msgid "column"
+#~ msgstr "колонка"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Тип раздела:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Адрес прокси</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Имя пользователя</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Пароль</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Это неверная точка монтирования. Попробовать ещё?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Метка:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Файловая система:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Устройство RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Настроить точку монтирования."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr ""
+#~ "<span size=\"small\" foreground=\"white\">ДОСТУПНОЕ ПРОСТРАНСТВО</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ВСЕГО ПРОСТРАНСТВА</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Выполнено"
 
@@ -4325,41 +6256,9 @@ msgstr "Закрыть"
 #~ msgid "Install on System"
 #~ msgstr "Установка в системе"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Следующая ошибка возникла при настройке репозитория установки:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Продолжение установки невозможно."
-
 #~ msgid "Exit installer"
 #~ msgstr "Прервать установку"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Установка остановлена, по-видимому, из-за проблемы с вашим оборудованием. "
-#~ "Сообщение об ошибке в точности:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Теперь установка будет прекращена."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Возникла аппаратная ошибка"
-
 #~ msgid "_Exit installer"
 #~ msgstr "В_ыход из программы установки"
 
@@ -4661,9 +6560,6 @@ msgstr "Закрыть"
 #~ msgid "Software Development"
 #~ msgstr "Разработка программного обеспечения"
 
-#~ msgid "Web Server"
-#~ msgstr "Веб-сервер"
-
 #~ msgid "Minimal"
 #~ msgstr "Минимальный набор программ"
 
@@ -4707,50 +6603,6 @@ msgstr "Закрыть"
 #~ "невозможно удалить:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Вы не указали корневой раздел (/), который необходим для продолжения "
-#~ "установки %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Размер корневого раздела меньше 250 МБ. Как правило, этого недостаточно "
-#~ "для установки %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Для данной платформы требуется монтировать /boot на выделенном разделе "
-#~ "или логическом томе. Если вы не хотите выносить /boot на отдельный том, "
-#~ "необходимо разместить / на выделенном не-LVM разделе."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Размер раздела %(mount)s меньше %(size)s МБ, что меньше рекомендуемого "
-#~ "размера для нормальной установки %(productName)s. "
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Раздел %(mount)s слишком мал для %(format)s форматирования (допустимые "
-#~ "размеры: от %(minSize)d МБ до %(maxSize)d МБ)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Раздел %(mount)s слишком велик для %(format)s форматирования (допустимые "
-#~ "размеры: от %(minSize)d МБ до %(maxSize)d МБ)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4767,58 +6619,6 @@ msgstr "Закрыть"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "вы не установили устройство 1го этапа загрузчика"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Вы не создали загружаемый раздел."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "BIOS в вашей системе требует специальный раздел для загрузки %s с новым "
-#~ "форматом меток диска (GPT). Для продолжения создайте раздел типа 'BIOS "
-#~ "Boot' размером 1 МБ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Вы не определили swap-раздел.  Для продолжения установки без swap-раздела "
-#~ "необходимо %(requiredMem)s МБ памяти, а доступно лишь %(installedMem)s МБ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Вы не создали раздел подкачки. Хотя это и не всегда является необходимым, "
-#~ "в большинстве случаев раздел подкачки может значительно улучшить "
-#~ "производительность системы."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "По крайней мере одно из устройств подкачки не имеет UUID, что обычно "
-#~ "бывает, если область подкачки создается с использованием старых версий "
-#~ "mkswap. К этим устройствам обращение будет по пути к устройству из /etc/"
-#~ "fstab, а это не самый лучший способ, так как пути устройств могут "
-#~ "меняться при различных обстоятельствах. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Неверная точка монтирования. Каталог %s должен располагаться в файловой "
-#~ "системе /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "Точка монтирования %s должна располагаться в файловой системе Linux. "
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux на %s"
 
@@ -4828,12 +6628,6 @@ msgstr "Закрыть"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s для %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Форматирование DASD-устройства"
-#~ msgstr[1] "Форматирование DASD устройств"
-#~ msgstr[2] "Форматирование DASD устройств"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Подготовка %d DASD-устройства для использования с Linux..."
@@ -5041,9 +6835,6 @@ msgstr "Закрыть"
 #~ msgid "Error setting root password"
 #~ msgstr "Ошибка при задании пароля root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Необходимо ввести и подтвердить пароль."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Удалить пакеты"
 
@@ -5063,24 +6854,12 @@ msgstr "Закрыть"
 #~ msgid "%s of %s"
 #~ msgstr "%s из %s"
 
-#~ msgid "Region:"
-#~ msgstr "Регион:"
-
-#~ msgid "City:"
-#~ msgstr "Город:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 часа"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Выберите дополнения"
 
@@ -5155,9 +6934,6 @@ msgstr "Закрыть"
 #~ msgid "configureButton"
 #~ msgstr "Кнопка настройки"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Завершить разбиение"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "НАСТРОЙКА ГРУППЫ ТОМОВ"
 
diff --git a/anaconda/po/si.po b/anaconda/po/si.po
index 260c5db..3ea1351 100644
--- a/anaconda/po/si.po
+++ b/anaconda/po/si.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Sinhala (http://www.transifex.com/projects/p/fedora/language/"
@@ -22,211 +22,445 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC ආරම්භ කරන්න"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "පාඨමය පිළිවෙල භාවිත කරන්න"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "හරි"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "පෙර-ස්ථාපන විධානාවලි ක්‍රියාත්මක කරමින්"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "ස්ථාපන ක්‍රියාවලිය ආරම්භ කරමින්"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "පසු ස්ථාපන සැකසුම් ඉටුකරමින්"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -238,87 +472,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "පෙර-ස්ථාපන විධානාවලි ක්‍රියාත්මක කරමින්"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ධාරක නාමට අක්‍ෂර 255 ක් හෝ කිහිපයක දිගක් පැවතිය යුතුය."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"ධාරක නාමය ආරම්භ විය යුත්තේ 'a-z',  'A-Z' හෝ '0-9' යන වලංගු පරාසය තුල තිබෙන අක්ෂරයක් "
-"සමඟිනි."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -327,7 +851,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s ස්ථාපනය"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "අවසන් කල විට පද්ධතිය විසන්ධි කිරීමට %s ධාවනය කරන්න."
@@ -340,8 +869,8 @@ msgstr "ස්ථාපනය අවසන් වූ පසු පද්ධත
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "ක්‍රියාත්මක කිසීම සඳහා /bin/sh සොයාගත නොහැකි විය! ශෙලය ආරම්භ නොකෙරේ"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "මුදවාගන්න"
 
@@ -379,21 +908,15 @@ msgstr "මුදවා ගැනීමට තිබෙන පද්ධතිය
 msgid "Which device holds the root partition of your installation?"
 msgstr "ඔබේ ස්ථාපනයේ root කොටස් දරා සිටින්නේ කුමන උපාංගයද?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "හරි"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "පිටවෙනු"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "ඔබ shell එකෙන් පිට වූ වාහාම පද්ධතිය ස්වයංක්‍රීයව නැවත ‍ ක්‍රියාත්මවනු ඇත."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -402,7 +925,7 @@ msgstr ""
 "සවිකල නොහැකි කිළිටි ගොනු පද්ධතියන් ඔබ පරිගණකය තුල ඇත. shell එකක් මාර්ගයෙන් fsck භාවිත කර "
 "කොටස් සියල්ල සවි කිරීම සඳහා return ඔබන්න. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -423,7 +946,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -432,28 +955,204 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "ඔබ සතුව කිසිඳු ලිනක්ස් තැටි කොටසක් නොමැත. නැවත අරඹමින්.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "ඔබ shell එකෙන් පිට වූ වාහාම පද්ධතිය ස්වයංක්‍රීයව නැවත ‍ ක්‍රියාත්මවනු ඇත."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "මුදවාගැනීමේ ප්‍රකාරය"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "ඔබ සතුව කිසිඳු ලිනක්ස් තැටි කොටසක් නොමැත. ශෙල් ලබාගැනීමට return යතුර ඔබන්න. %s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "ඔබේ පද්ධතිය %s බහලුම යටතේ සවිකරන ලදී"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"ඔබේ root කොටස මෙගා බයිට් 250 ට වඩා අඩු වන හෙයින්, එය %s ස්ථාපනය සඳහා ප්‍රමාණවත් නොවේ."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "%s ස්ථාපනය ඉදිරියට කරගෙන යාම සඳහා අවශ්‍ය root කොටස (/) ඔබ විසින් නියමකර නොමැත."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"ඔබේ %(mount)s කොටස සතුව පවතින්නේ %(size)s ප්‍රමාණයකි එය සාමාන්‍ය %(productName)s "
+"ස්ථාපනයක් සඳහා නිර්දේශිත ප්‍රමාණයට වඩා අඩුය."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "ඔබ විසින් ඇරඹුම්කාරක කොටසක් නිර්මාණය කර නොමැත"
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"ඔබ විසින් swap කොටසක් නියම කර නොමැත. මෙය සෑම විටම අනිවාර්‍ය නොවන මුත් පද්ධතියේ ඉහල "
+"ක්‍රියාකාරීත්වයට බෙහෙවින් ඉවහල් වේ."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "මෙම රැඳවුම් ස්ථානය වලංගු නොවේ. %s බහාළුම / ගොනු පද්ධතිය මත තිබිය යුතුයි."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s රැඳවුම් ස්ථානය ලිනක්ස් ගොනු පද්ධතියක් මතම පැවතිය යුතුය."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -564,84 +1263,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "ස්ථාපන ප්‍රභවයේ සිට හුවමාරුව සූදානම් වෙමින්"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "පැකේජය ස්ථාපනය කිරීමේ දෝශයක්"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "පහත සඳහන් ගොනු පද්ධති තුල බොහෝ ඉඩ ප්‍රමාණයක් අවශ්‍ය වේ:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "ස්ථාපන ප්‍රභවයේ සිට හුවමාරුව සූදානම් වෙමින්"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "පැකේජය ස්ථාපනය කිරීමේ දෝශයක්"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "පශ්චාත් ස්ථාපනය"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "ස්ථාපනයට සැරසෙමින්"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "පශ්චාත් ස්ථාපනය"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "විධාන රේඛන ප්‍රකාරය තුලින් ගැටළු ඉදිරිපත් කල නොහැක!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "දෝශයකි"
 
@@ -665,31 +1512,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -704,452 +1553,523 @@ msgstr ""
 "වෙනෙකක් හා සම්බන්ධ කර චිත්‍රක අයුරින් ස්ථාපනය කිරීමට හෝ මෙලෙස පාඨමය අයුරින් ඉදිරියට කරගෙන "
 "යාමටද ?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "මුරපදයේදිග අවම වශයෙන් අකුරු 6 කින් වත් සමන්විය යුතු වේ."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "මුරපදයේදිග අවම වශයෙන් අකුරු 6 කින් වත් සමන්විය යුතු වේ."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "ගොනු පද්ධති සැකසුමට වර්ගයක් නොමැති වී ඇත"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "ස්ථාපනය ආරම්භ කරමින්"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "පසු-යාවත්කාලීන සැකසුම් ඉටුකරමින්"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC ආරම්භ කරන්න"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "ස්ථාපන ක්‍රියාවලිය සිදුවෙමින් පවතී"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "ස්ථාපන ප්‍රභවයේ සිට හුවමාරුව සූදානම් වෙමින්"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "පැකේජය ස්ථාපනය කිරීමේ දෝශයක්"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot අඩංගුවන මෙවලම"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "මෘදුකාංග ප්‍රවර්ධනය"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "අවවාදයයි"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1165,580 +2085,405 @@ msgstr "සැකසෙමින් පවතී"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s ස්ථාපනය"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "මෘදුකාංග ප්‍රවර්ධනය"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1765,279 +2510,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 ලිපිනය"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 ලිපිනය"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "අවලංගු කරන්න (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "මෘදුකාංග ප්‍රවර්ධනය"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "කෝෂ්ඨාගාරය සැකසීමේ දෝශයක්"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "කෝෂ්ඨාගාරය සැකසීමේ දෝශයක්"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2045,14 +2814,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2061,128 +2830,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD උපකරණ සංයුති කරමින්"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "හරි"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2193,68 +2983,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s රැඳවුම් ස්ථානය ලිනක්ස් ගොනු පද්ධතියක් මතම පැවතිය යුතුය."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s මත%(type)s නිර්මාණය කරමින්"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2262,951 +3149,1372 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "කරගෙන යන්න(_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "හරි"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "ජාල සේවා දායකය"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "තහවුරු කරන්න"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ජාලයක් නොමැත"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "පාඨමය පිළිවෙල භාවිත කරන්න"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "ධාරිතාව"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID උපාංගය"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "එකතු කරන්න(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "තහවුරු කරන්න"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ජාලයක් නොමැත"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "තහවුරු කරන්න"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "තහවුරු කරන්න"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "තහවුරු කරන්න"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "පරිශීලක නාමය"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "සම්බන්ධ විය!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI පද්ධති කොටසක්"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "ස්ථාපකයෙන් ඉවත්වන්න (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI පද්ධති කොටසක්"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "සංකේතනය කළ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI පද්ධති කොටසක්"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "එකතු කරන්න(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "හරි"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "තහවුරු කරන්න"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "එකතු කරන්න(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "හරි"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID උපාංගය"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "එකතු කරන්න(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ක්‍රියාකාරීත්ව දෝශයක්."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ක්‍රියාකාරීත්ව දෝශයක්."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3214,649 +4522,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ස්ථාපනය කිරීමේදී භාවිතා කිරීමට ඔබ කැමති කිනම් භාශාවද?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "කරගෙන යන්න(_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "තහවුරු කරන්න"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "නිදහස්"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID උපාංගය"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "එකතු කරන්න(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "සංකේතනය කළ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "ධාරිතාව"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID උපාංගය"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID උපාංගය"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "සංකේතනය කළ"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID උපාංගය"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "තහවුරු කරන්න"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "හරි"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 ලිපිනය"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "ඔබ විසින් iSCSI ආරම්භක නාමයක් ලබා දිය යුතු වේ."
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "පරිශීලක නාමය"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "හරි"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID උපාංගය"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "නිදහස්"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "ධාරිතාව"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "පරිශීලක නාමය"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID උපාංගය"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "සංකේතනය කළ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "හරි"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD උපකරණ සංයුති කරමින්"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "තහවුරු කරන්න"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "හරි"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI පද්ධති කොටසක්"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "පශ්චාත් ස්ථාපනය"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "ස්ථාපනයට සැරසෙමින්"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "පසු-යාවත්කාලීන සැකසුම් ඉටුකරමින්"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "නැවත ආරම්භ කරන්න(_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3870,16 +5569,16 @@ msgstr "ස්ථාපනය කරන්න"
 msgid "Install the live CD to your hard disk"
 msgstr "සජීවී CD තැටිය ඔබේ දෘඩ තැටියට ස්ථාපනය කරන්න"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "දෘඩ තැටියට ස්ථාපනය අරඹමින්"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3888,24 +5587,25 @@ msgstr ""
 "මෙම ස්ථාපන ක්‍රමයෙන් ස්ථාපනය සඳහා %s වෙත %s MB ඉඩකම් මතකයෙන් අවශ්‍යයි, නමුත් ඔබ සතුව මෙම "
 "පරිගණකයේ පවතින්නේ %s MB ඉඩක් පමණි.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s චිත්‍රක ස්ථාපකය සඳහා %s MB ඉඩක් මතකයෙන් ඇවැසියි. නමුත් ඔබ සතුව ඇත්තේ %s MB පමණි."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "මතකය ප්‍රමාණවත් නැත"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3919,60 +5619,81 @@ msgstr ""
 "\n"
 " ධාවනය කර පෙළ ප්‍රකාරය අත්හදා බලන්න."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "පෙළ ප්‍රකාරය අරඹමින්."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "දෝශයකි"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY විචල්‍යය සකසා නොමැත. පාඨමය අයුරින් අරඹමින්"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "චිත්‍රක ස්ථාපනය භාවිතයේ නොමැත... පෙළ ප්‍රකාරයෙන් අරඹමින්."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "ධාරක නාමය ආරම්භ විය යුත්තේ 'a-z',  'A-Z' හෝ '0-9' යන වලංගු පරාසය තුල තිබෙන "
+#~ "අක්ෂරයක් සමඟිනි."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "පහත සඳහන් ගොනු පද්ධති තුල බොහෝ ඉඩ ප්‍රමාණයක් අවශ්‍ය වේ:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "විධාන රේඛන ප්‍රකාරය තුලින් ගැටළු ඉදිරිපත් කල නොහැක!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "පරිශීලක නාමය"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID උපාංගය"
+
 #~ msgid "Completed"
 #~ msgstr "සම්පූර්ණයි"
 
@@ -4005,9 +5726,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "ස්ථාපනයෙන් ඉවත්වන්න"
 
-#~ msgid "_Exit installer"
-#~ msgstr "ස්ථාපකයෙන් ඉවත්වන්න (_E)"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4065,9 +5783,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr " %r කෝෂඨාගාරය සැකසුමේදී නමක් නොමැත, අංකය යොදාගනිමින්"
 
-#~ msgid "No Network Available"
-#~ msgstr "ජාලයක් නොමැත"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4075,9 +5790,6 @@ msgstr ""
 #~ "ඔබේ ඇතැම් කෝෂ්ඨාගාර සඳහා ජාලකරණය අවශ්‍යයි. එහෙත් ඔබේ පද්ධතිය සඳහා ජාලය සක්‍රීය කිරීමේ "
 #~ "දෝශයක් හට ගැණිනි."
 
-#~ msgid "Re_boot"
-#~ msgstr "නැවත ආරම්භ කරන්න(_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "ඉවතට ගන්න (_E)"
 
@@ -4222,9 +5934,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "විත්‍රක වැඩතලය"
 
-#~ msgid "Web Server"
-#~ msgstr "ජාල සේවා දායකය"
-
 #~ msgid "Minimal"
 #~ msgstr "අවම"
 
@@ -4261,26 +5970,6 @@ msgstr ""
 #~ "මෙම උපකරණය සතුව මකා දැමිය නොහැකි න්‍යායික කොටස් සහිත දිගුකල කොටස් ඇත\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "%s ස්ථාපනය ඉදිරියට කරගෙන යාම සඳහා අවශ්‍ය root කොටස (/) ඔබ විසින් නියමකර නොමැත."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "ඔබේ root කොටස මෙගා බයිට් 250 ට වඩා අඩු වන හෙයින්, එය %s ස්ථාපනය සඳහා ප්‍රමාණවත් "
-#~ "නොවේ."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "ඔබේ %(mount)s කොටස සතුව පවතින්නේ %(size)s ප්‍රමාණයකි එය සාමාන්‍ය %(productName)s "
-#~ "ස්ථාපනයක් සඳහා නිර්දේශිත ප්‍රමාණයට වඩා අඩුය."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "USB ධාවකය ස්ථාපනය කරමින්.  මෙය ක්‍රියාත්මක කල හැකි හෝ නොමැති වීමට පිළිවෙන."
@@ -4291,30 +5980,6 @@ msgstr ""
 #~ msgstr ""
 #~ "FireWire උපාංගය ස්ථාපනය කරමින්.   මෙය ක්‍රියාත්මක කල හැකි හෝ නොමැති වීමට පිළිවෙන."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "ඔබ විසින් ඇරඹුම්කාරක කොටසක් නිර්මාණය කර නොමැත"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "ඔබ විසින් swap කොටසක් නියම කර නොමැත. මෙය සෑම විටම අනිවාර්‍ය නොවන මුත් පද්ධතියේ ඉහල "
-#~ "ක්‍රියාකාරීත්වයට බෙහෙවින් ඉවහල් වේ."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "මෙම රැඳවුම් ස්ථානය වලංගු නොවේ. %s බහාළුම / ගොනු පද්ධතිය මත තිබිය යුතුයි."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s රැඳවුම් ස්ථානය ලිනක්ස් ගොනු පද්ධතියක් මතම පැවතිය යුතුය."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD උපකරණ සංයුති කරමින්"
-#~ msgstr[1] "සංයුති කරමින් පවතී"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Linux සමඟ භාවිත කිරීමට %d DASD උපකරණය සූදානම් කරමින්..."
diff --git a/anaconda/po/sk.po b/anaconda/po/sk.po
index 89df187..104c9b8 100644
--- a/anaconda/po/sk.po
+++ b/anaconda/po/sk.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/fedora/language/"
@@ -28,11 +28,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "súborový systém /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -41,7 +41,7 @@ msgstr ""
 "Sady RAID, ktoré obsahujú '%s' musia mať jednu z nasledovných úrovní raidu: "
 "%s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -50,7 +50,7 @@ msgstr ""
 "Sady RAID, ktoré obsahujú '%s' musia mať jednu z nasledovných verzií "
 "metaúdajov: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -59,106 +59,127 @@ msgstr ""
 "Sady RAID, ktoré obsahujú '%s' musia mať jeden z nasledovných typov "
 "zariadení: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s musí obsahovať jeden z nasledovných typov menoviek disku: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s nemôže byť typu %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s musí byť pripojený na jednom z %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s musí mať veľkosť medzi %d a %d MB"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s nemôže byť menší ako %dMB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s nemôže byť väčší ako %dMB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s musí byť v prvých %dMB disku."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s musí byť na primárnom oddieli"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s nemôže byť na zakódovanom blokovom zariadení."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s nemôže byť typu %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Spustiť VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Použiť textový režim"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Heslo je nastavené."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Heslá nie sú zhodné!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Poskytli ste slabé heslo: %s.  Stlačte znovu Hotovo, ak ho chcete aj tak "
 "použiť."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -166,87 +187,338 @@ msgstr ""
 "použiť."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Slabé"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Uspokojivé"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Dobré"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Silné"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Ok"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "Án_o"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nie"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Počas nastavovania inštalačného repozitára nastala nasledujúca chyba:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Inštalácia nemôže pokračovať."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Počas nastavovania inštalačného repozitára nastala nasledujúca chyba:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Inštalácia nemôže pokračovať."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Nasledovný softvér označený na inštaláciu obsahuje chyby.  Toto môže byť "
+"spôsobené chybou\n"
+"v zdroji inštalácie.  Môžete sa pokúsiť odstrániť tieto balíky z "
+"inštalácie,\n"
+"zmeniť zdroj inštalácie, alebo ukončiť inštalátor."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Inštalácia bola zastavená pravdepodobne kvôli problému s Vašim hardvérom. "
+"Presná chybová hláška je:\n"
+"\n"
+"%s.\n"
+"\n"
+"Inštalátor sa teraz ukončí."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Inštalácia bola zastavená pravdepodobne kvôli problému s Vašim hardvérom. "
+"Presná chybová hláška je:\n"
+"\n"
+"%s.\n"
+"\n"
+"Inštalátor sa teraz ukončí."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Nastala hardvérová chyba"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Inštalácia bola zastavená pravdepodobne kvôli problému s Vašim hardvérom. "
+"Presná chybová hláška je:\n"
+"\n"
+"%s.\n"
+"\n"
+"Inštalátor sa teraz ukončí."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Konfiguruje sa nainštalovaný systém"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Zapisuje sa konfigurácia siete"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Vytvárajú sa používatelia"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Konfiguruje sa nainštalovaný systém"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Spúšťajú sa pred-inštalačné skripty"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Nastavuje sa zdroj inštalácie..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Inštaluje sa zavádzač"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Vykonávajú sa poinštalačné úlohy inštalácie"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Inštaluje sa zavádzač"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Certifikát Escrow %s vyžaduje pripojenie k sieti."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -258,32 +530,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s chýba. Nedá sa nastaviť firewall."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s chýba. Nedá sa nastaviť firewall."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Systém súborov nepodporuje menovky."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Zadaný názov %s sa už používa."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Názov skupiny zväzkov %s sa už používa. Zmeny nebudú uložené."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Spúšťajú sa pred-inštalačné skripty"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Názov hostiteľa nemôže byť prázdny."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Názov hostiteľa musí mať menej ako 255 znakov."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Názov hostiteľa musí začínať platným znakom v rozsahu a-z', 'A-Z', alebo "
-"'0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -293,55 +855,55 @@ msgstr ""
 "„.“, časti medzi bodkami musia obsahovať niečo a nemôžu začínať alebo končiť "
 "s „-“."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Pripája sa..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Odpája sa..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Pripojené cez kábel (%s)"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Bezdrôtovo pripojené k sieti %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Nepripojené"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Nie sú dostupné žiadne sieťové zariadenia"
 
@@ -350,7 +912,12 @@ msgstr "Nie sú dostupné žiadne sieťové zariadenia"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Nová inštalácia systému %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Spustite %s na odpojenie systému po ukončení."
@@ -363,8 +930,8 @@ msgstr "Po dokončení práce ukončite shell a váš systém bude reštartovan
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Nepodarilo sa nájsť a spustiť /bin/sh!  Nespúšťa sa shell"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Záchrana"
 
@@ -411,21 +978,15 @@ msgstr "Systém na záchranu"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Ktoré zariadenie obsahuje koreňový oddiel (root) vašej inštalácie?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Ok"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Systém sa automaticky reštartuje, keď ukončíte príkazový riadok."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -435,7 +996,7 @@ msgstr ""
 "nepripojiť.  Stlačte Enter na spustenie terminálu, z ktorého môžete fsck a "
 "pripojiť Vaše partície. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -456,7 +1017,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -469,29 +1030,242 @@ msgstr ""
 "\n"
 "Stlačte <Enter> pre získanie terminálu."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nemáte žiadne linuxové oddiely.  Reštartuje sa.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "Systém sa reštartuje automaticky po ukončení terminálu."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Záchranný režim"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Nemáte žiadne Linuxové partície. Stlačte Enter pre spustenie terminálu.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Váš systém je pripojený pod adresárom %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Obvyklý oddiel"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disk"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Oblasť „swap“ je miestom vo vašom počítači, ktoré\n"
+"je použité pri nedostatku pamäte."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Oblasť „boot“ je miestom vo vašom počítači, kde sú\n"
+"uložené súbory potrebné na zavedenie operačného\n"
+"systému."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"Oblasť „root“ je miestom vo vašom počítači, kde sú\n"
+"uložené systémové súbory jadra a aplikácií."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"Oblasť „home“ je miestom vo vašom počítači, kde sú\n"
+"uložené všetky vaše osobné údaje."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Oddiel BIOS boot je vyžadovaný na povolenie zavádzania\n"
+"z diskov rozdelených pomocou GPT na hardvéri systému BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"Zavádzací oddiel typu PReP je vyžadovaný ako súčasť\n"
+"konfigurácie zavádzača na niektorých platformách PPC."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Váš koreňový oddiel je menší ako 250 megabajtov, čo je obvykle príliš málo "
+"pre inštaláciu %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Nestanovili ste žiaden koreňový oddiel (/), ktorý je vyžadovaný na "
+"pokračovanie v inštalácii %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Táto platforma vyžaduje /boot na vyhradenej partícii alebo logickom zväzku.  "
+"Ak nechcete /boot zväzok, musíte umiestniť / na vyhradenej nie-LVM partícii."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Vaša %(mount)s jednotka má menej ako %(size)s megabajtov, čo je menej, ako "
+"je doporučené pre normálnu inštaláciu %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Vaša %(mount)s jednotka je príliš malá na formátovanie pomocou %(format)s  "
+"(prípustná veľkosť je %(minSize)d MB až %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Vaša %(mount)s jednotka je príliš veľká na formátovanie pomocou %(format)s  "
+"(prípustná veľkosť je %(minSize)d MB až %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Zlyhalo pridávanie nového zariadenia. Kliknite pre podrobnosti."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Nevytvorili ste zavádzací oddiel (boot)."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Váš systém založený na systéme BIOS vyžaduje špeciálny oddiel na správne "
+"zavedenie s novým formátom menoviek (GPT) systému %s. Na pokračovanie "
+"vytvorte oddiel typu „BIOS Boot“ o veľkosti 1MB."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Neurčili ste odkladaciu jednotku.  Je portebných %(requiredMem)s MB pamäte "
+"pre pokračovanie inštalácie bez odkladacej jednotky, ale vy máte iba "
+"%(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Neurčili ste odkladací oddiel.  Aj keď to nie je nutné vo všetkých "
+"prípadoch, pre väčšinu inštalácií to významne zvýši výkon."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Minimálne jedno z Vašich odkladacích(swap) zariadení nemá UUID, ktoré je "
+"spoločné v odkladacom priestore vytvorenom použitím staršej verzie mkswap. "
+"Tieto zariadenia budú referované cestou zariadenia v /etc/fstab, čo nie je "
+"ideálne, pretože cesty zariadení sa môžu zmeniť za viacerých okolností. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Tento bod pripojenia je neplatný.  Adresár %s musí byť na súborovom "
+"systéme /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Bod pripojenia %s musí byť na linuxovom súborovom systéme."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Heslo:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -603,87 +1377,240 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Poskytnuté heslo pre VNC neobsahuje aspoň 6 znakov.\n"
 "Prosím, zadajte nové heslo.  Nechajte prázdne, ak nechcete použiť heslo."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Zlyhalo nastavovanie zdroja inštalácie"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Chyba pri preberaní metaúdajov balíkov..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Nie je dostupný žiadny zdroj inštalácie"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Inštaluje sa softvér"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Spúšťa sa proces inštalácie balíkov"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Potrebujete viac miesta na nasledujúcich súborových systémoch:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Pripravuje sa transakcia z inštalačného zdroja"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Inštaluje sa"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Preberajú sa metaúdaje balíkov..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Inštaluje sa"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Pripravuje sa inštalácia"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Kontroluje sa konfigurácia úložiska..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "PREDVOLENÝ NÁZOV"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALIZÁCIA"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALIZÁCIA"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTVÉR"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTÉM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "NASTAVENIA POUŽÍVATEĽOV"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Inštalácia Hub-u"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Spúšťa sa automatizovaná inštalácia"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Nie je možné sa pýtať v režime príkazového riadku!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "Prosím, zadajte voľbu nižšie [„q“ na ukončenie | „c“ na pokračovanie]:"
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Názov predvoleného HUB-u"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Chyba"
 
@@ -707,32 +1634,35 @@ msgstr "áno"
 msgid "no"
 msgstr "nie"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Naozaj chcete skončiť?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "Prosím, zadajte voľbu nižšie [„q“ na ukončenie | „c“ na pokračovanie]:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -747,217 +1677,258 @@ msgstr ""
 "spustiť VNC na pripojenie na tento počítač z iného počítača a vykonanie "
 "grafickej inštalácie, alebo pokračovať s inštaláciou v textovom režime?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Heslo pre VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
+"Poskytnuté heslo pre VNC neobsahuje aspoň 6 znakov.\n"
+"Prosím, zadajte nové heslo.  Nechajte prázdne, ak nechcete použiť heslo."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Heslo:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Heslo (na potvrdenie):"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Heslá nie sú zhodné!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Heslo musí mať aspoň šesť znakov."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Heslo musí mať aspoň šesť znakov."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Nastavenia časovej zóny"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Časová zóna nie je nastavená."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Dostupné oblasti"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Dostupné oblasti"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Zapisuje sa konfigurácia siete"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Pripojené cez kábel (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Pripojené cez kábel (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Názov hostiteľa"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Názov hostiteľa"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Názov hostiteľa"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Dokončiť konfiguráciu"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Brána"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "chýba typ v konfigurácii súborového systému"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Konfiguruje sa nainštalovaný systém"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Heslo správcu:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Heslo je nastavené."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Účet správcu je zakázaný."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Heslo nie je nastavené."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Prosím, vyberte nové heslo správcu. Budete ho musieť zadať dvakrát."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Heslo:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Použiť všetko miesto"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Nahradiť existujúci(e) systém(y) Linux"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Použiť voľné miesto"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Cieľ inštalácie"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Nie sú vybrané žiadne disky"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Chyba pri kontrolovaní konfigurácie úložiska"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Chyba pri kontrolovaní konfigurácie úložiska"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Bolo vybrané automatické rozdelenie diskov"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Bolo vybrané vlastné rozdelenie diskov"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -965,39 +1936,60 @@ msgstr ""
 "Nezistili sa žiadne disky.  Prosím, vypnite počítač, pripojte aspoň jeden "
 "disk a reštartujte počítač na dokončenie inštalácie."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Nie sú vybrané žiane disky. Prosím, vyberte aspoň jeden disk pre inštaláciu."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Preskúšava sa úložisko..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Generuje sa aktualizovaná konfigurácia úložiska"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "konfigurácia úložísk zlyhala: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Kontroluje sa konfigurácia úložiska..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Voľby automatického rozdelenia diskov"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1006,41 +1998,41 @@ msgstr ""
 "Inštalácia vyžaduje rozdelenie vášho pevného disku.  Vyberte, ktoré miesto "
 "sa má použiť pre cieľ inštalácie."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Konfigurácia schémy oddielov"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Konfigurácia schémy oddielov"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Nastavenia časovej zóny"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s časová zóna"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Časová zóna nie je nastavená."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Dostupné časové zóny pre oblasť %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Dostupné oblasti"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1049,178 +2041,196 @@ msgstr ""
 "Použite čísla alebo zadajte priamo názvy [b pre zoznam oblastí, q na "
 "ukončenie]"
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Spustiť VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Postup inštalácie"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Najbližšie zrkadlo"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Server NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Chyba pri nastavovaní zdroja softvéru"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Nič nie je vybrané"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Pripája sa..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "Jednotka CD/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "Súbor _ISO"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Čas cez sieť"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Nie je dostupný žiadny zdroj inštalácie"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Zlyhalo nastavovanie zdroja inštalácie"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Chyba pri preberaní metaúdajov balíkov..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Nie je dostupný žiadny zdroj inštalácie"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Server NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Voľby pripojenia NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Zlyhalo nastavovanie zdroja inštalácie, skontrolujte URL repozitára"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "zariadenie už obsahuje /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Zlyhalo nastavovanie zdroja inštalácie"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Upraviť výber softvéru"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Chyba pri kontrolovaní výberu softvéru"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Zdroj inštalácie nie je nastavený"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Vybraný vlastný softvér"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Zdroj inštalácie nie je nastavený"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Vyberte vaše prostredie"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "P_oužiť overenie totožnosti"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Musíte poskytnúť a potvrdiť heslo."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Upozornenie"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1236,36 +2246,36 @@ msgstr "Prebieha"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInštalácia bola dokončená.  Stlačte enter na ukončenie."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "testuje sa stav..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Nové zariadenie"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Heslo (na potvrdenie):"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1274,7 +2284,7 @@ msgstr ""
 "Poskytli ste slabé heslo: %s.  Stlačte znovu Hotovo, ak ho chcete aj tak "
 "použiť."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1283,63 +2293,46 @@ msgstr ""
 "Poskytli ste slabé heslo: %s.  Stlačte znovu Hotovo, ak ho chcete aj tak "
 "použiť."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Heslo je nastavené."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Ukončiť inštalátor"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nie"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "Án_o"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "PREDVOLENÝ NÁZOV"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALIZÁCIA"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALIZÁCIA"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTVÉR"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTÉM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "NASTAVENIA POUŽÍVATEĽOV"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1347,7 +2340,11 @@ msgstr ""
 "Prosím, pred pokračovaním na ďalší krok dokončite položky označené touto "
 "ikonou."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Dokončené!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1356,171 +2353,68 @@ msgstr ""
 "Systém %s je teraz úspešne nainštalovaný vo vašom počítači\n"
 "a je pripravený na použitie!  Môžete ho začať používať po reštartovaní!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Dokončené!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Ukončiť"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Nová inštalácia systému %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"Systém %s je teraz úspešne nainštalovaný vo vašom počítači, ale niektoré "
+"konfigurácie musia byť ešte dokončené.\n"
+"Dokončite ich a potom kliknite na tlačidlo Dokončiť konfiguráciu."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"Systém %s je teraz úspešne nainštalovaný vo vašom počítači\n"
+"a je pripravený na použitie!  Môžete ho začať používať po reštartovaní!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Vytvoriť novú skupinu zväzkov..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Znovukonfigurácia zariadenia zlyhala. Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Prosím, vytvorte názov pre vašu skupinu zväzkov a vyberte aspoň jeden disk "
-"nižšie."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Skupina zväzkov:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "stĺpec"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Konfigurácia úložísk bola vynulovaná kvôli neopraviteľnej chybe. Kliknite "
 "pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Znovukonfigurácia zariadenia zlyhala. Kliknite pre podrobnosti."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Prosím, zadajte platný bod pripojenia."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Tento bod pripojenia je neplatný. Skúsiť niektorý iný?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Tento bod pripojenia sa už používa. Skúsiť niektorý iný?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"Úroveň poľa RAID, ktorú ste vybrali, vyžaduje viac diskov ako máte "
-"momentálne vybraných."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Prosím, zadajte platný bod pripojenia."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Tento bod pripojenia je neplatný. Skúsiť niektorý iný?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Obvyklý oddiel"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disk"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Žiadne"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Musíte vytvoriť nový súborový systém na koreňovom zariadení."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Naozaj chcete odstrániť všetky údaje na %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Naozaj chcete odstrániť všetky údaje na %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "RUČNÉ ROZDELENIE DISKOV"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "Vybrané %d úložné zariadenie"
 msgstr[1] "Vybrané %d úložné zariadenia"
 msgstr[2] "Vybraných %d úložných zariadení"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1529,134 +2423,115 @@ msgstr ""
 "Keď vytvoríte body pripojenia pre vašu inštaláciu systému %s %s,\n"
 "tu môžete vidieť podrobnosti o nich."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Oblasť „swap“ je miestom vo vašom počítači, ktoré\n"
-"je použité pri nedostatku pamäte."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Oblasť „boot“ je miestom vo vašom počítači, kde sú\n"
-"uložené súbory potrebné na zavedenie operačného\n"
-"systému."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"Oblasť „root“ je miestom vo vašom počítači, kde sú\n"
-"uložené systémové súbory jadra a aplikácií."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"Oblasť „home“ je miestom vo vašom počítači, kde sú\n"
-"uložené všetky vaše osobné údaje."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Oddiel BIOS boot je vyžadovaný na povolenie zavádzania\n"
-"z diskov rozdelených pomocou GPT na hardvéri systému BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"Zavádzací oddiel typu PReP je vyžadovaný ako súčasť\n"
-"konfigurácie zavádzača na niektorých platformách PPC."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi musí byť na zariadení typu %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s musí byť na zariadení typu %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s nemôže byť zašifrovaný"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Musíte vytvoriť nový súborový systém na koreňovom zariadení."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "Zariadenia typu %s vyžadujú platný výber úrovne poľa RAID."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Požiadavka na zmenu veľkosti zariadenia zlyhala. Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Požiadavka na znovunaformátovanie zariadenia zlyhala. Kliknite pre "
 "podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Zadaný názov %s sa už používa."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Systém súborov nepodporuje menovky."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Nie sú vybrané žiadne disky"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Systém súborov nemôže mať zmenenú veľkosť."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Chyba pri kontrole konfigurácie úložísk.  Kliknite pre podrobnosti."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Chyba pri kontrole konfigurácie úložísk.  Kliknite pre podrobnosti."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Bol pridaný nový %s do existujúceho kontajnera %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Zlyhalo pridávanie nového zariadenia. Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "Je nastavená neplatná veľkosť oddielu. Použite platné celé číslo."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "Požiadavka na odstránenie zariadenia zlyhala. Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Názov skupiny zväzkov %s sa už používa. Zmeny nebudú uložené."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1665,7 +2540,7 @@ msgstr ""
 "Toto zariadenie nemôže byť priamo upravené. Môžete ho odstrániť alebo vybrať "
 "iné zariadenie."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1674,196 +2549,146 @@ msgstr ""
 "Toto zariadenie nemôže byť priamo upravené. Môžete ho odstrániť alebo vybrať "
 "iné zariadenie."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Nie sú vybrané žiadne disky."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Nie je dostatok voľného miesta na vybraných diskoch."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automatické rozdelenie diskov zlyhalo. Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Upraviť výber softvéru"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Zlyhalo odblokovanie zašifrovaného blokového zariadenia. Kliknite pre "
 "podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DÁTUM A ČAS"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Neplatná časová zóna"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Pred tým, než začnete používať NTP, musíte nastaviť sieť"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Nemáte nakonfigurovaný žiadny fungujúci server NTP"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "CIEĽ INŠTALÁCIE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "Vybrané %d úložné zariadenie"
+msgstr[1] "Vybrané %d úložné zariadenia"
+msgstr[2] "Vybraných %d úložných zariadení"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "Prepnúť rozloženie stlačením %s."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KLÁVESNICA"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Konfigurácia skúšobných rozložení nie je dostupná."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "testuje sa stav..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Prepínanie rozložení nie je nakonfigurované."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "JAZYK"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Neznámy stav (chýba)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Neznámy stav"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Nespravovaná"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Nedostupné"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Chýbajúci firmvér"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Odpojený kábel"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Nedostupné"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Odpojené"
@@ -1888,154 +2713,170 @@ msgstr "Odpája sa"
 msgid "Connection failed"
 msgstr "Pripojenie zlyhalo"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "odpojené"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Bezdrôtová"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "odpojené"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 adresa"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 adresa"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "Adresa IP"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Podnikové"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Žiadne"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Vyžaduje sa overenie totožnosti"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Heslo:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "KONFIGURÁCIA SIETE"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "HESLO SPRÁVCU"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Heslo je nastavené."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Heslo správcu je nastavené"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Účet správcu je zakázaný"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Heslo správcu nie je nastavené"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "VÝBER SOFTVÉRU"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Kontrolujú sa závislosti softvéru..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Chyba pri kontrolovaní závislostí softvéru"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Preberajú sa metaúdaje balíkov..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Preberajú sa metaúdaje skupín..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Kontrolujú sa závislosti softvéru..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Chyba pri kontrolovaní závislostí softvéru"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Chyba pri kontrolovaní závislostí softvéru.  Kliknite pre viac podrobností."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Nasledovný softvér označený na inštaláciu obsahuje chyby.  Toto môže byť "
 "spôsobené chybou\n"
@@ -2043,46 +2884,77 @@ msgstr ""
 "inštalácie,\n"
 "zmeniť zdroj inštalácie, alebo ukončiť inštalátor."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Zrušiť"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Ukončiť"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "U_praviť zdroj softvéru"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Upraviť výber softvéru"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Nastavuje sa zdroj inštalácie..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Chyba pri preberaní metaúdajov balíkov..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Vyžaduje sa overenie totožnosti"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Toto médium je vhodné ako zdroj inštalácie."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Toto médium nie je vhodné ako zdroj inštalácie."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ZDROJ INŠTALÁCIE"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Zlyhalo nastavovanie zdroja inštalácie, skontrolujte URL repozitára"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Chyba pri nastavovaní repozitára"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Chyba pri nastavovaní zdroja softvéru"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2090,98 +2962,80 @@ msgstr ""
 "Zlyhalo nastavovanie zdroja inštalácie, skontrolujte URL repozitára a "
 "nastavenia proxy"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Chyba pri nastavovaní repozitára"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Chyba pri nastavovaní zdroja softvéru"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Zariadenie:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Server NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Neplatná časová zóna"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Neplatná časová zóna"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Neplatná časová zóna"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Prosím, čakajte... metaúdaje softvéru sa stále načítavajú."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Disky, ktoré ste vybrali obsahujú nasledovné množstvo voľného miesta:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Prosím, čakajte... metaúdaje softvéru sa stále načítavajú."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2192,7 +3046,7 @@ msgstr ""
 "vám pomôcť\n"
 "získať miesto zmenšením alebo odstránením existujúcich oddielov."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2203,7 +3057,7 @@ msgstr ""
 "použijete všetko voľné miesto\n"
 "dostupné na vybraných diskoch."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2218,35 +3072,42 @@ msgstr ""
 "upraviť váš výber softvéru a nainštalovať tak menšiu verziu systému <b>%s</"
 "b>, alebo ukončiť inštalátor."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "CIEĽ INŠTALÁCIE"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Ukladá sa konfigurácia úložiska..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Zlyhalo ukladanie konfigurácie úložísk..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formátujú sa DASD zariadenia"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "Chyba pri kontrole konfigurácie úložísk.  Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Chyba pri kontrole konfigurácie úložísk.  Kliknite pre podrobnosti."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2254,7 +3115,7 @@ msgstr[0] "vybraný %d disk; kapacita %s; voľných %s"
 msgstr[1] "vybrané %d disky; kapacita %s; voľných %s"
 msgstr[2] "vybraných %d diskov; kapacita %s; voľných %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2262,7 +3123,11 @@ msgstr ""
 "Vybrali ste vynechanie inštalácie zavádzača.  Váš systém nemusí byť preto "
 "úspešne zavedený."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2272,11 +3137,19 @@ msgstr ""
 "Môžete upraviť vaše rozloženie úložísk,\n"
 "alebo ukončiť inštalátor."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Ukončiť"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Upraviť rozloženie úložísk"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2287,53 +3160,53 @@ msgstr ""
 "Môžete upraviť vaše rozloženie úložísk,\n"
 "alebo ukončiť inštalátor."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Ok"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "NASTAVENIA POUŽÍVATEĽOV"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Neplatná časová zóna"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "VITAJTE V SYSTÉME %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "ÚDAJE"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2342,23 +3215,27 @@ msgstr ""
 "Zatiaľ ste nevytvorili žiadne body pripojenia pre vašu inštaláciu systému %s "
 "%s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Kliknite sem na ich automatické vytvorenie."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Nižšie môžete vytvoriť nové body pripojenia pomocou ikony „+“."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2370,55 +3247,163 @@ msgstr[0] "<b>%s disk; %s získateľného miesta</b> (v súborovych systémoch)"
 msgstr[1] "<b>%s disky; %s získateľného miesta</b> (v súborovych systémoch)"
 msgstr[2] "<b>%s diskov; %s získateľného miesta</b> (v súborovych systémoch)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Neinštalovať zavádzač"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Nastaviť ako zavádzacie zariadenie"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Úroveň poľa RAID, ktorú ste vybrali, vyžaduje viac diskov ako máte "
+"momentálne vybraných."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Prosím, vytvorte názov pre vašu skupinu zväzkov a vyberte aspoň jeden disk "
+"nižšie."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Skupina zväzkov:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "stĺpec"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Bod pripojenia %s musí byť na linuxovom súborovom systéme."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Tento bod pripojenia sa už používa. Skúsiť niektorý iný?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Prosím, zadajte platný bod pripojenia."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Tento bod pripojenia je neplatný. Skúsiť niektorý iný?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Musíte vytvoriť nový súborový systém na koreňovom zariadení."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Naozaj chcete odstrániť všetky údaje na %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Naozaj chcete odstrániť všetky údaje na %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Neplatná časová zóna"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Ukončiť"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Zadali ste slabé heslo: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Heslá sa nezhodujú."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Uchovať"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Zmenšiť"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "Toto zariadenie obsahuje zdroj inštalácie."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Vytvára sa %(type)s na %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Nie je pripravené"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Použiť voľné miesto"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2431,14 +3416,14 @@ msgstr ""
 "systémy, ktoré už nepoužívate.  Odstránením súborového systému natrvalo "
 "vymažete všetky údaje, ktoré obsahuje."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2447,353 +3432,761 @@ msgstr[0] "<b>%s disk; %s získateľného miesta</b> (v súborovych systémoch)"
 msgstr[1] "<b>%s disky; %s získateľného miesta</b> (v súborovych systémoch)"
 msgstr[2] "<b>%s diskov; %s získateľného miesta</b> (v súborovych systémoch)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Celkom vybrané miesto na získanie:  <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Odstrániť"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Uchovať"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "INŠTALÁCIA DISTRIBÚCIE"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PREDČASNÉ VYDANIE / TESTOVANIE"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Nové zariadenie"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Pokračovať"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Použiť zmeny"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "KONFIGURÁCIA SIETE"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Názov skupiny"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Zrušiť"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Ok"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DÁTUM A ČAS"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Pridať a označiť na použitie so servermi NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "WWW server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Prebieha spracovanie"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Použiť"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfigurovať..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DÁTUM A ČAS"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Oblasť:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Oblasť:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Mesto:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Mesto:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Názov siete"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Názov siete"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-hodinový"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "CIEĽ INŠTALÁCIE"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapacita"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Nepripojené"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Vybrané zariadenie"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Nič nie je vybrané"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Menovka:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Chýbajúci firmvér"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nie"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Typ VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Vybrané zariadenie"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "súhrn"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Zariadenie RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Pridať"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Predvolené smerovanie"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Maska podsiete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Rýchlosť"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hardvérová adresa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfigurovať..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Bezpečnosť"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Názov siete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Názov siete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Bezpečnostný kľúč"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Použiť ako hotspot"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Vypnúť hotspot"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfigurovať..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Poskytovateľ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfigurovať..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Typ VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Brána"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Názov skupiny"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Heslo pre skupinu"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Užívateľské meno"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfigurovať..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Spôsob"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Konfiguračná URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "Proxy _HTTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "Proxy H_TTPS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "Proxy _FTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Zapisuje sa konfigurácia siete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Odomknúť"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Režim v _lietadle"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Zapisuje sa konfigurácia siete"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Názov hostiteľa"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "KONFIGURÁCIA SIETE"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2803,283 +4196,205 @@ msgstr ""
 "na vykonanie\n"
 "aktualizácie softvéru."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Predvolené smerovanie"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Maska podsiete"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Rýchlosť"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hardvérová adresa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfigurovať..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Bezpečnosť"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Názov siete"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Názov siete"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Bezpečnostný kľúč"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Použiť ako hotspot"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Vypnúť hotspot"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfigurovať..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Poskytovateľ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Typ VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Brána"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Názov skupiny"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Heslo pre skupinu"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Užívateľské meno"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Spôsob"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Konfiguračná URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "Proxy _HTTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "Proxy H_TTPS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "Proxy _FTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Odomknúť"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Režim v _lietadle"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Názov hostiteľa"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "P_oužiť overenie totožnosti"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Vyžaduje sa overenie totožnosti"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Pripojené"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "VÝBER SOFTVÉRU"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Vyberte vaše prostredie"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "stĺpec"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Zrušiť a prid_ať viac diskov"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "VOĽBY INŠTALÁCIE"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Typ oddielu:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Zašifrovať moje údaje. Heslo nastavím neskôr."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Bolo vybrané vlastné rozdelenie diskov"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Získať miesto"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "VOĽBY INŠTALÁCIE"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "Tu uvádzame koľko miesta je potrebného pre aktuálny výber softvéru."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Dostupné miesto pre používateľa."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Voľné miesto nie je dostupné, ale dá sa získať z existujúcich oddielov."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Tu uvádzame voľby, ktoré máte na výber."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Použiť voľné miesto"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Ukončiť inštalátor"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Popis zariadenia"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Lokálne obvyklé disky"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Dokončiť rozdelenie diskov"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Zašifrovať"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Bolo vybrané automatické rozdelenie diskov"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Dokončiť rozdelenie diskov"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Zašifrovať"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Zašifrovať moje údaje. Heslo nastavím neskôr."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Voľby automatického rozdelenia diskov"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "súhrn"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Súhrn celého disku a voľby..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "PRIDANIE ROZLOŽENIA KLÁVESNICE"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Môžete pridať rozloženie klávesnice výberom nižšie:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Názov"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "ROZLOŽENIE KLÁVESNICE"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3087,361 +4402,491 @@ msgstr ""
 "Ktoré rozloženia klávesnice chcete použiť v systéme?  Môžete ktorékoľvek "
 "rozloženie presunúť na vrch zoznamu a nastaviť ho tak ako predvolené."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "názov"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Pridať rozloženie"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Odstrániť rozloženie"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Presunúť vybrané rozloženie vyššie"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Pridať rozloženie"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Odstrániť rozloženie"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Presunúť vybrané rozloženie vyššie"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Presunúť vybrané rozloženie nižšie"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Ukážka rozloženia"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Konfigurácia skúšobných rozložení nie je dostupná."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Prepnúť rozloženia stlačením Alt + Shift."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "V_oľby"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Pridať"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "PRIDANIE ROZLOŽENIA KLÁVESNICE"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Môžete pridať rozloženie klávesnice výberom nižšie:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Názov"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Dostupné oblasti"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Pridať rozloženie"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Ok"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "VOĽBY PREPÍNANIA ROZLOŽENÍ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Ktorú klávesovú kombináciu(e) preferujete na prepínanie medzi rozloženiami "
 "klávesnice?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "použiť"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "popis"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Voľby pripojenia NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "JAZYK"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Nič nie je vybrané"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "HESLO SPRÁVCU"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Heslo správcu:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Potvrdenie:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Heslo pre VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Nastaviť heslo správcu"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 "Účet správcu je použitý na spravovanie systému.  Zadajte heslo pre správcu."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Hotovo"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "OVERENIE MÉDIA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Overuje sa médium, prosím, čakajte..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Pridať"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Ok"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Povoliť HTTP proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>URL proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Príklad:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "P_oužiť overenie totožnosti"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Meno používateľa</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Užívateľské meno"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Heslo</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Heslo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ZDROJ INŠTALÁCIE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Ktorý zdroj inštalácie chcete použiť?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Automaticky rozpoznať inštalačné médium:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Zariadenie:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Menovka:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Overiť"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "Súbor _ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Zariadenie:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Vybrať súbor ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "V _sieti:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "Nastavenie _proxy..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Táto URL odkazuje na zozna_m zrkadiel."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Voľby pripojenia NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Toto pole je voliteľné."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Repozitáre projektu Fedora People"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Pridať nový bod pripojenia."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Pridať"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Odstrániť vybraný(é) bod(y) pripojenia."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Odstrániť rozloženie"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Prevádzková chyba."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Nastaviť heslo správcu"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Táto URL odkazuje na zozna_m zrkadiel."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Názov:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>URL proxy</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Užívateľské meno"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Heslo:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Tento bod pripojenia je neplatný. Skúsiť niektorý iný?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Chcem zmiznúť odtiaľto!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Prijímam svoj osud."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Toto je nestabilný, predčasne uvoľnený softvér."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3449,204 +4894,264 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "VITAJTE V SYSTÉME %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Ktorý jazyk má byť použitý počas procesu inštalácie?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Ukončiť"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Pokračovať"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Užívateľské meno"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Názov skupiny"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Heslo:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Heslo pre VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Pridať bod pripojenia"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Požadovaná kapacita:</b>"
+msgid "Add a new mount point."
+msgstr "Pridať nový bod pripojenia."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Bod pripojenia:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Pridať"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "PRIDAŤ NOVÝ BOD PRIPOJENIA"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Viac upraviteľných volieb získate po\n"
-"vytvorení bodu pripojenia nižšie."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Tento bod pripojenia sa už používa.\n"
-"Skúsiť niektorý iný?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "napr.: „20 GB“, „500mb“ (bez úvodzoviek)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Odstrániť ho"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "_Uložiť"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "KONFIGUROVAŤ BOD PRIPOJENIA"
+msgid "Remove the selected mount point(s)."
+msgstr "Odstrániť vybraný(é) bod(y) pripojenia."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Prosím, vytvorte názov pre vašu skupinu zväzkov a vyberte aspoň jeden disk "
-"nižšie."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Odstrániť rozloženie"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Voľný"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Zariadenie RAID"
+msgid "Reload storage configuration from disk."
+msgstr "konfigurácia úložísk zlyhala: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "_Zašifrovať"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Vybrané zariadenie"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Popis zariadenia"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Bod pripojenia:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Požadovaná kapacita:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Menovka:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Typ zariadenia:</b>"
+msgid "Device(s):"
+msgstr "Zariadenie:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Systém súborov:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Zašifrovať"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Znovu naformátovať"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Skupina zväzkov:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Upraviť..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Názov:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Typ zariadenia:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Zašifrovať"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Systém súborov"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Znovu naformátovať"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Skupina zväzkov:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Upraviť..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "Zariadenie RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3654,17 +5159,19 @@ msgstr ""
 "Toto zariadenie je zašifrované a nemôže byť čítané bez zadania platného "
 "hesla. Môžete ho odomknúť nižšie."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Heslo:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Odomknúť"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3672,294 +5179,572 @@ msgstr ""
 "Toto zariadenie nemôže byť priamo upravené. Môžete ho odstrániť alebo vybrať "
 "iné zariadenie."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Pridať nový bod pripojenia."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Odstrániť vybraný(é) bod(y) pripojenia."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Konfigurovať vybraný bod pripojenia."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurovať..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "konfigurácia úložísk zlyhala: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">DOSTUPNÉ MIESTO</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">CELKOVÉ MIESTO</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Zrušiť"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "KONFIGUROVAŤ BOD PRIPOJENIA"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Ok"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Adresa IP"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Musíte poskytnúť názov iniciátora iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "P_oužiť overenie totožnosti"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Príklad:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Užívateľské meno"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Heslo pre VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Užívateľské meno"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Heslo pre VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Užívateľské meno"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Heslo pre VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Názov siete"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "P_oužiť overenie totožnosti"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Užívateľské meno"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Heslo pre VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Užívateľské meno"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Heslo pre VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Užívateľské meno"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Heslo pre VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Pripojenie zlyhalo"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Ok"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Zariadenie:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "VYBRANÉ DISKY"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Zavrieť"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Zavádzanie"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Popis"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Voľný"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Odstrániť rozloženie"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Tu je súhrn o disku"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Odstrániť ho"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Nič nie je vybrané"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "KONFIGUROVAŤ BOD PRIPOJENIA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Pridať bod pripojenia"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Požadovaná kapacita:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Bod pripojenia:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "PRIDAŤ NOVÝ BOD PRIPOJENIA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Viac upraviteľných volieb získate po\n"
+"vytvorení bodu pripojenia nižšie."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Tento bod pripojenia sa už používa.\n"
+"Skúsiť niektorý iný?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "napr.: „20 GB“, „500mb“ (bez úvodzoviek)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "_Uložiť"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "KONFIGUROVAŤ BOD PRIPOJENIA"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Prosím, vytvorte názov pre vašu skupinu zväzkov a vyberte aspoň jeden disk "
+"nižšie."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Názov:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Zariadenie RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Zašifrovať"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Prosím, zadajte platný bod pripojenia."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Ok"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formátujú sa DASD zariadenia"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Počas inštalácie sa vyskytla neznáma chyba.  Podrobnosti sú nižšie."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "HESLO PRE ZAŠIFROVANIE DISKU"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Uložiť heslo"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "HESLO PRE ZAŠIFROVANIE DISKU"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3968,7 +5753,19 @@ msgstr ""
 "Vybrali ste zašifrovanie niektorých vašich údajov. Musíte vytvoriť heslo, "
 "ktoré budete používať na prístup k vašim údajom, keď spustíte počítač."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Heslo:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Potvrdenie:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3978,117 +5775,172 @@ msgstr ""
 "vaše rozloženie klávesnice, možno nebudete môcť po inštalácii zašifrovať "
 "vaše disky."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ZÍSKANIE MIESTA NA DISKU"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Ok"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Zrušiť"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Získať miesto"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ZÍSKANIE MIESTA NA DISKU"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Tu je popis."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Systém súborov"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Získateľné miesto"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Akcia"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Uchovať"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Odstrániť"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Zmenšiť"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Bolo vybrané vlastné rozdelenie diskov"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Použiť zmeny"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Zariadenie:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Pridať bod pripojenia"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Ukončiť inštalátor"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nie"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "Án_o"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4096,51 +5948,50 @@ msgstr ""
 "Naozaj chcete ukončiť\n"
 "proces inštalácie?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Ukončiť"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "SÚHRN INŠTALÁCIE"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Ukončiť"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Začať inštaláciu"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURÁCIA"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Pripravuje sa inštalácia"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"Systém %s je teraz úspešne nainštalovaný vo vašom počítači, ale niektoré "
-"konfigurácie musia byť ešte dokončené.\n"
-"Dokončite ich a potom kliknite na tlačidlo Dokončiť konfiguráciu."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Dokončiť konfiguráciu"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"Systém %s je teraz úspešne nainštalovaný vo vašom počítači\n"
-"a je pripravený na použitie!  Môžete ho začať používať po reštartovaní!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "_Reštartovať"
 
@@ -4156,16 +6007,16 @@ msgstr "Inštalácia"
 msgid "Install the live CD to your hard disk"
 msgstr "Inštalácia Live CD na váš pevný disk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Spúšťa sa inštalácia na pevný disk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Vitajte v systéme Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4174,24 +6025,25 @@ msgstr ""
 "%s potrebuje %s MB pamäte na inštaláciu, ale vy máte iba %s MB na tomto "
 "stroji.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s grafický inštalátor potrebuje %s MB pamäte, ale vy máte iba %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Nedostatok RAM pamäti"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4205,24 +6057,24 @@ msgstr ""
 "\n"
 " z root terminálu."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Spúšťa sa textový režim"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Chyba"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Premenná DISPLAY nebola nastavená. Spúšťa sa textový režim."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafická inštalácia nie je dostupná. Spúšťa sa textový režim."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4233,20 +6085,20 @@ msgstr ""
 "vám určiť vlastné rozloženie partícií ani výber balíkov. Chcete namiesto "
 "toho použiť režim VNC?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Prosím, spustite ssh install@%s na začatie inštalácie."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Prosím, spustite ssh install@<hostiteľ> na pokračovanie v inštalácii."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Skúsiť systém Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4256,7 +6108,7 @@ msgstr ""
 "Môžete ho nainštalovať ihneď alebo kedykoľvek neskôr spustením odkazu "
 "„Inštalovať na pevný disk“ v prehľade Aktivít."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4264,10 +6116,90 @@ msgstr ""
 "Môžete vybrať odkaz „Inštalovať na pevný disk“\n"
 "kedykoľvek neskôr."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Zavrieť"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Názov hostiteľa musí začínať platným znakom v rozsahu a-z', 'A-Z', alebo "
+#~ "'0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Potrebujete viac miesta na nasledujúcich súborových systémoch:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Nie je možné sa pýtať v režime príkazového riadku!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Tento bod pripojenia je neplatný. Skúsiť niektorý iný?"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "KONFIGURÁCIA SIETE"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Chyba pri preberaní metaúdajov balíkov..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Nič nie je vybrané"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Chýbajúci firmvér"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Vyžaduje sa overenie totožnosti"
+
+#~ msgid "column"
+#~ msgstr "stĺpec"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Typ oddielu:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>URL proxy</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Meno používateľa</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Heslo</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Tento bod pripojenia je neplatný. Skúsiť niektorý iný?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Menovka:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Systém súborov:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Zariadenie RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Konfigurovať vybraný bod pripojenia."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">DOSTUPNÉ MIESTO</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">CELKOVÉ MIESTO</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Hotovo"
 
@@ -4320,41 +6252,9 @@ msgstr "Zavrieť"
 #~ msgid "Install on System"
 #~ msgstr "Inštalovať na systém"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Počas nastavovania inštalačného repozitára nastala nasledujúca chyba:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Inštalácia nemôže pokračovať."
-
 #~ msgid "Exit installer"
 #~ msgstr "Ukončiť inštalátor"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Inštalácia bola zastavená pravdepodobne kvôli problému s Vašim hardvérom. "
-#~ "Presná chybová hláška je:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "Inštalátor sa teraz ukončí."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Nastala hardvérová chyba"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Ukončiť inštalátor"
 
@@ -4652,9 +6552,6 @@ msgstr "Zavrieť"
 #~ msgid "Software Development"
 #~ msgstr "Softvérový vývoj"
 
-#~ msgid "Web Server"
-#~ msgstr "WWW server"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimálna"
 
@@ -4698,50 +6595,6 @@ msgstr "Zavrieť"
 #~ "je možné odstrániť:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Nestanovili ste žiaden koreňový oddiel (/), ktorý je vyžadovaný na "
-#~ "pokračovanie v inštalácii %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Váš koreňový oddiel je menší ako 250 megabajtov, čo je obvykle príliš "
-#~ "málo pre inštaláciu %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Táto platforma vyžaduje /boot na vyhradenej partícii alebo logickom "
-#~ "zväzku.  Ak nechcete /boot zväzok, musíte umiestniť / na vyhradenej nie-"
-#~ "LVM partícii."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Vaša %(mount)s jednotka má menej ako %(size)s megabajtov, čo je menej, "
-#~ "ako je doporučené pre normálnu inštaláciu %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Vaša %(mount)s jednotka je príliš malá na formátovanie pomocou "
-#~ "%(format)s  (prípustná veľkosť je %(minSize)d MB až %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Vaša %(mount)s jednotka je príliš veľká na formátovanie pomocou "
-#~ "%(format)s  (prípustná veľkosť je %(minSize)d MB až %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4758,57 +6611,6 @@ msgstr "Zavrieť"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "nevytvorili ste cieľové zariadenie so zavádzačom stage1"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Nevytvorili ste zavádzací oddiel (boot)."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Váš systém založený na systéme BIOS vyžaduje špeciálny oddiel na správne "
-#~ "zavedenie s novým formátom menoviek (GPT) systému %s. Na pokračovanie "
-#~ "vytvorte oddiel typu „BIOS Boot“ o veľkosti 1MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Neurčili ste odkladaciu jednotku.  Je portebných %(requiredMem)s MB "
-#~ "pamäte pre pokračovanie inštalácie bez odkladacej jednotky, ale vy máte "
-#~ "iba %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Neurčili ste odkladací oddiel.  Aj keď to nie je nutné vo všetkých "
-#~ "prípadoch, pre väčšinu inštalácií to významne zvýši výkon."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Minimálne jedno z Vašich odkladacích(swap) zariadení nemá UUID, ktoré je "
-#~ "spoločné v odkladacom priestore vytvorenom použitím staršej verzie "
-#~ "mkswap. Tieto zariadenia budú referované cestou zariadenia v /etc/fstab, "
-#~ "čo nie je ideálne, pretože cesty zariadení sa môžu zmeniť za viacerých "
-#~ "okolností. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Tento bod pripojenia je neplatný.  Adresár %s musí byť na súborovom "
-#~ "systéme /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Bod pripojenia %s musí byť na linuxovom súborovom systéme."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux na %s"
 
@@ -4818,12 +6620,6 @@ msgstr "Zavrieť"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s pre %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formátujú sa DASD zariadenia"
-#~ msgstr[1] "Formátuje sa DASD zariadenie"
-#~ msgstr[2] "Formátujú sa DASD zariadenia"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Pripravuje sa %d DASD zariadení na použitie s Linuxom..."
@@ -5024,9 +6820,6 @@ msgstr "Zavrieť"
 #~ msgid "Error setting root password"
 #~ msgstr "Chyba pri nastavovaní hesla správcu"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Musíte poskytnúť a potvrdiť heslo."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Odstrániť balíky"
 
@@ -5049,24 +6842,12 @@ msgstr "Zavrieť"
 #~ msgid "%s of %s"
 #~ msgstr "%s z %s"
 
-#~ msgid "Region:"
-#~ msgstr "Oblasť:"
-
-#~ msgid "City:"
-#~ msgstr "Mesto:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-hodinový"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Vyberte vaše doplnky"
 
@@ -5128,9 +6909,6 @@ msgstr "Zavrieť"
 #~ msgid "_Customize..."
 #~ msgstr "_Prispôsobiť..."
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Dokončiť rozdelenie diskov"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "KONFIGURÁCIA SKUPINY ZVÄZKOV"
 
diff --git a/anaconda/po/sl.po b/anaconda/po/sl.po
index 01cd1e7..828c7b3 100644
--- a/anaconda/po/sl.po
+++ b/anaconda/po/sl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,208 +26,441 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Zaganjam VNC..."
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Uporabi besedilni način"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Naprej"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -236,85 +469,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -323,7 +848,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -336,8 +866,8 @@ msgstr "Ko končate, se odjavite iz lupine in vaš sistem se bo znova zagnal."
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Rešuj"
 
@@ -375,28 +905,22 @@ msgstr "Reševanje sistema"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Naprej"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Izhod"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -409,7 +933,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -418,28 +942,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Način reševanja"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Vaš sistem je priklopljen pod imenikom %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Vaš korenski razdelek je manjši od 250 megabajtov, kar je običajno premalo "
+"za namestitev sistema %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Niste določili korenskega razdelka (/), ki je obvezen za nadaljevanje "
+"namestitve sistema %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Vaš korenski razdelek je manjši od 250 megabajtov, kar je običajno premalo "
+"za namestitev sistema %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Niste določili izmenjalnega razdelka. Čeprav v vseh primerih ni nujen, pa v "
+"večini namestitev znatno izboljša odzivnost sistema."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -533,84 +1236,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Na sledečih datotečnih sistemih rabite več prostora:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "starejši paketi"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Namesti"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Namesti"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "V ukaznem načinu ne morete postavljati vprašanj!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Napaka"
 
@@ -634,31 +1485,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -673,447 +1526,520 @@ msgstr ""
 "se lahko na ta računalnik povežete z drugega računalnika in opravite "
 "grafično namestitev, ali pa bi raje nadaljevli v besedilnem načinu?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Geslo mora imeti najmanj 6 znakov."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Geslo mora imeti najmanj 6 znakov."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Napredek pri nameščanju"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Zaganjam VNC..."
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Napredek pri nameščanju"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Programiranje"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Opozorilo"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1128,262 +2054,149 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
@@ -1391,319 +2204,261 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Programiranje"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1730,277 +2485,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Programiranje"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2008,14 +2787,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2024,33 +2803,39 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2059,95 +2844,109 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Naprej"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2160,68 +2959,163 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2231,945 +3125,1349 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Nadaljuj"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Naprej"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Uporabi besedilni način"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Naprava RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Nadaljuj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Nadaljuj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Nadaljuj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Priključen!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Izhod iz namestitve"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Opozorilo"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Naprej"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Naprej"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Naprava RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Dodaj"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3177,643 +4475,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Kateri jezik bi radi uporabljali med namestitvijo?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Nadaljuj"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Prosto"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Naprava RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Dodaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Naprava RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Naprava RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Naprava RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Naprej"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Naprej"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Naprava RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Prosto"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Naprava RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Naprej"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Naprej"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Namesti"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "_Znova zaženi"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3827,40 +5488,41 @@ msgstr "Namesti"
 msgid "Install the live CD to your hard disk"
 msgstr "Namesti z živega CDja na disk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3869,60 +5531,70 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Napaka"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Na sledečih datotečnih sistemih rabite več prostora:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "V ukaznem načinu ne morete postavljati vprašanj!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Naprava RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Opravljeno"
 
@@ -3932,9 +5604,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Izhod iz namestitve"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Izhod iz namestitve"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Manjka naslov IP."
 
@@ -3971,9 +5640,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "To ni pravi medij %s."
 
-#~ msgid "Re_boot"
-#~ msgstr "_Znova zaženi"
-
 #~ msgid "_Retry"
 #~ msgstr "Z_nova"
 
@@ -3983,9 +5649,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "datoteka je v sporu"
 
-#~ msgid "older package(s)"
-#~ msgstr "starejši paketi"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "na disku ni dovolj prostora"
 
@@ -4037,20 +5700,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Ne morete odstraniti razdelka LDL formatiranega DASD."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Niste določili korenskega razdelka (/), ki je obvezen za nadaljevanje "
-#~ "namestitve sistema %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Vaš korenski razdelek je manjši od 250 megabajtov, kar je običajno "
-#~ "premalo za namestitev sistema %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4063,14 +5712,6 @@ msgstr ""
 #~ "Nameščan na napravo FireWire. Odvisno od sistema zagon morda ne bo "
 #~ "deloval."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Niste določili izmenjalnega razdelka. Čeprav v vseh primerih ni nujen, pa "
-#~ "v večini namestitev znatno izboljša odzivnost sistema."
-
 #~ msgid "Back"
 #~ msgstr "Nazaj"
 
diff --git a/anaconda/po/sq.po b/anaconda/po/sq.po
index 870c8fe..e70781e 100644
--- a/anaconda/po/sq.po
+++ b/anaconda/po/sq.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/fedora/language/"
@@ -21,211 +21,444 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Nis VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Përdor mënyrë tekst"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Po xhirohen programthe parainstalimi"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Po fillohet procesi i instalimit"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Po kryhet formësimi pas instalimit"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -234,87 +467,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Po xhirohen programthe parainstalimi"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Emërstreha duhet të jetë 255 ose më pak shenja e gjatë."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Emërstreha duhet të fillojë me një shenjë të vlefshme brenda intervalit 'a-"
-"z' ose 'A-Z' ose '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -323,7 +846,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -337,8 +865,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "I pazoti të gjente /bin/sh për përmbushjen!  Nuk ka shell fillimi."
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Shpëtim"
 
@@ -376,28 +904,22 @@ msgstr "Sistem që duhet Shpëtuar"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Dil"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -410,7 +932,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -419,28 +941,208 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nuk keni ndonjë ndarje Linux.  Po riniset.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Mënyra Shpëtim"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Sistemi juaj është montuar nën drejtorinë %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Ndarja juaj rrënjë është më pak se 250 megabajt çka zakonisht është shumë e "
+"pakët për instalim %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Nuk keni përcaktuar një ndarje rrënjë (/), e cila është e domosdoshme që të "
+"vazhdojë instalimi i %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Ndarja juaj rrënjë është më pak se 250 megabajt çka zakonisht është shumë e "
+"pakët për instalim %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Nuk keni tregua një ndarje \"swap\".  Edhe pse jo doemos e domosdoshme në të "
+"tëra rastet, ajo do të përmirësojë në mënyrë domethënëse punimin për "
+"shumicën e instalimeve."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -553,84 +1255,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Po përgatitet ndërshkëmbimi prej burimit të instalimit"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Gabim Në Instalimin e Paketës"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Keni nevojë për më tepër hapësirë në sistemin vijues të kartelave:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Po përgatitet ndërshkëmbimi prej burimit të instalimit"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Gabim Në Instalimin e Paketës"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Pasinstalim"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Po përgatitet për instalim"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Pasinstalim"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Nuk mund të bëni pyetje gjatë mënyrës rresht urdhrash!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Gabim"
 
@@ -654,31 +1504,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -693,450 +1545,521 @@ msgstr ""
 "lidhur këtë kompjuter prej një kompjuteri tjetër dhe të kryeni një instalim "
 "grafik ose të vazhdoni me një instalim nën mënyrën tekst?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Fjalëkalimi duhet të jetë e pakta 6 shenja i gjatë."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Fjalëkalimi duhet të jetë e pakta 6 shenja i gjatë."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Po fillohet Instalimi"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Po kryhet formësimi pas-përmirësim"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Nis VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Përparim Instalimi"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Po përgatitet ndërshkëmbimi prej burimit të instalimit"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Gabim Në Instalimin e Paketës"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Zhvillim Programesh"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Kujdes"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1152,580 +2075,405 @@ msgstr "Në ecje e sipër"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Zhvillim Programesh"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1752,279 +2500,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Zhvillim Programesh"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Gabim Në Përgatitjen e Depos"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Gabim Në Përgatitjen e Depos"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2032,14 +2804,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2048,128 +2820,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2180,68 +2972,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2249,949 +3136,1358 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Vazhdo"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Shërbyes Web"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Ripohoni"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Pa Rrjet të Passhëm"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Përdor mënyrë tekst"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Pajisje RAID "
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Shto"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Ripohoni"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Pa Rrjet të Passhëm"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Ripohoni"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Ripohoni"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Ripohoni"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "I lidhur!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Ndarje EFI Sistemi"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Dil prej instaluesit"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Ndarje EFI Sistemi"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Ndarje EFI Sistemi"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Shto"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Ripohoni"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Shto"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Pajisje RAID "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Shto"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Gabim operacional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Gabim operacional."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3199,644 +4495,1010 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Çfarë gjuhe do të donit të përdorej gjatë procesit të instalimit?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Vazhdo"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Ripohoni"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "E lirë"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Pajisje RAID "
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Shto"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Pajisje RAID "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Pajisje RAID "
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Pajisje RAID "
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Ripohoni"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Pajisje RAID "
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "E lirë"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Pajisje RAID "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Ripohoni"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "Ndarje EFI Sistemi"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Pasinstalim"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Po përgatitet për instalim"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Po kryhet formësimi pas-përmirësim"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Ri_nis"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3850,40 +5512,41 @@ msgstr "Instaloje"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalojeni CD \"live\" te hard disku juaj"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3892,60 +5555,78 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Gabim"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Nuk kapet dot instalimi grafik. Po fillohet me mënyrën tekst."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Emërstreha duhet të fillojë me një shenjë të vlefshme brenda intervalit "
+#~ "'a-z' ose 'A-Z' ose '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr ""
+#~ "Keni nevojë për më tepër hapësirë në sistemin vijues të kartelave:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Nuk mund të bëni pyetje gjatë mënyrës rresht urdhrash!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Pajisje RAID "
+
 #~ msgid "Completed"
 #~ msgstr "U bë"
 
@@ -3969,9 +5650,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Dil prej instaluesit"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Dil prej instaluesit"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Vendndodhja IP mungon."
 
@@ -4011,12 +5689,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Depos %r i mungon emri te formësimi, po përdoret id-ja"
 
-#~ msgid "No Network Available"
-#~ msgstr "Pa Rrjet të Passhëm"
-
-#~ msgid "Re_boot"
-#~ msgstr "Ri_nis"
-
 #~ msgid "_Eject"
 #~ msgstr "_Nxirre"
 
@@ -4148,9 +5820,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Desktop Grafik"
 
-#~ msgid "Web Server"
-#~ msgstr "Shërbyes Web"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4160,20 +5829,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Nuk mund të fshini një ndarje të një DASD-je të formatuar si LDL."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Nuk keni përcaktuar një ndarje rrënjë (/), e cila është e domosdoshme që "
-#~ "të vazhdojë instalimi i %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Ndarja juaj rrënjë është më pak se 250 megabajt çka zakonisht është shumë "
-#~ "e pakët për instalim %s."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4187,15 +5842,6 @@ msgstr ""
 #~ "Po instalohet në një pajisje FireWire.  Kjo mundet edhe të mos prodhojë "
 #~ "një sistem funksionues."
 
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Nuk keni tregua një ndarje \"swap\".  Edhe pse jo doemos e domosdoshme në "
-#~ "të tëra rastet, ajo do të përmirësojë në mënyrë domethënëse punimin për "
-#~ "shumicën e instalimeve."
-
 #~ msgid "Back"
 #~ msgstr "Prapa"
 
diff --git a/anaconda/po/sr.po b/anaconda/po/sr.po
index e413c0e..ae71296 100644
--- a/anaconda/po/sr.po
+++ b/anaconda/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Serbian <trans-sr@lists.fedoraproject.org>\n"
@@ -20,211 +20,444 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Покрени VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Користи текстуални режим"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "У реду"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Извршавам скрипте пре инсталације"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Почињем поступак инсталације"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Вршим подешавања после инсталације"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -233,86 +466,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Извршавам скрипте пре инсталације"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Дужина имена домаћина мора бити 255 или мање знакова."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Име домаћина мора почети исправним знаком у опсегу „a-z“, „A-Z“, или „0-9“"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -321,7 +845,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s инсталација"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -335,8 +864,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Не могу да нађем /bin/sh ради извршавања!  Не покрећем љуску"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Спаси"
 
@@ -374,28 +903,22 @@ msgstr "Систем за спашавање"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Који уређај садржи коренску партицију ваше инсталације?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "У реду"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Изађи"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -408,7 +931,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -417,28 +940,209 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Немате ниједну Linux партицију.  Покрећем поново.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Режим спашавања"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Ваш систем је монтиран под %s директоријум."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Ваша корена партиција је мања од 250 мегабајта, што је обично премало за %s "
+"инсталацију."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Нисте дефинисали корену партицију (/), која је неопходна за наставак %s "
+"инсталације."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Ваша %(mount)s партиција је мања од %(size)s МБ, што је мање него "
+"препоручљиво за редовну %(productName)s инсталацију."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Нисте направили покретачку партицију."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Нисте навели свап партицију.  Иако није строго неопходна у свим случајевима, "
+"значајно ће побољшати учинак већине инсталација."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Тачка монтирања није исправна.  Директоријум %s мора бити на систему "
+"датотека /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s тачка монтирања мора бити на Linux систему датотека."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -551,84 +1255,233 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "F_edora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Припремам трансакцију са извора инсталације"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Грешка при инсталацији пакета"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Потребно вам је више простора на следећим системима датотека:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Припремам трансакцију са извора инсталације"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Грешка при инсталацији пакета"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "После инсталације"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Припрема за инсталацију"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "После инсталације"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Не могу да примим питање у командном режиму!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Грешка"
 
@@ -652,31 +1505,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -691,451 +1546,522 @@ msgstr ""
 "да бисте се повезали на овај рачунар са другог рачунара и извели графичку "
 "инсталацију или да наставите са инсталацијом у текстуалном режиму?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Лозинка мора имати најмање шест знакова."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Лозинка мора имати најмање шест знакова."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "подешавању система датотека недостаје врста"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Инсталација почиње"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Вршим подешавања после надградње"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Покрени VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Напредовање инсталације"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Припремам трансакцију са извора инсталације"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Грешка при инсталацији пакета"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Развој софтвера"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Упозорење"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1151,581 +2077,408 @@ msgstr "У току"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s инсталација"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Развој софтвера"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1752,279 +2505,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Развој софтвера"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Грешка при постављању ризнице"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Грешка при постављању ризнице"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2032,14 +2809,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2048,33 +2825,40 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Форматирање DASD уређаја"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2082,95 +2866,109 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "У реду"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2182,68 +2980,164 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s тачка монтирања мора бити на Linux систему датотека."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2252,951 +3146,1363 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "На_стави"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "У реду"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Веб сервер"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Потврдите"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Нема доступне мреже"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Користи текстуални режим"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Капацитет"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID уређај"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "Д_одај"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Потврдите"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Нема доступне мреже"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Потврдите"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Потврдите"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Потврдите"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Корисничко име"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Повезано!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI системска партиција"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Излаз из инсталатера"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI системска партиција"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Шифрован"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI системска партиција"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "Д_одај"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "У реду"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Потврдите"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "Д_одај"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "У реду"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID уређај"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "Д_одај"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Оперативна грешка."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Оперативна грешка."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3204,648 +4510,1028 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Који језик бисте желели да користите током процеса инсталације?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "На_стави"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Потврдите"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Слободно"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID уређај"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "Д_одај"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Шифрован"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Капацитет"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID уређај"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID уређај"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Шифрован"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID уређај"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Потврдите"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "У реду"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Име зачетника није постављено"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Корисничко име"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "У реду"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID уређај"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Слободно"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Капацитет"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Корисничко име"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID уређај"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Шифрован"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "У реду"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Форматирање DASD уређаја"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Потврдите"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "У реду"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI системска партиција"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "После инсталације"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Припрема за инсталацију"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Вршим подешавања после надградње"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "По_крени поново"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3859,40 +5545,41 @@ msgstr "Инсталирај"
 msgid "Install the live CD to your hard disk"
 msgstr "Инсталирајте живи ЦД на ваш чврсти диск"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3901,60 +5588,80 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Грешка"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY променљива није постављена. Покрећем текстуални режим."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Графичка инсталација није доступна. Покрећем текстуални режим."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Име домаћина мора почети исправним знаком у опсегу „a-z“, „A-Z“, или „0-9“"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Потребно вам је више простора на следећим системима датотека:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Не могу да примим питање у командном режиму!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Корисничко име"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID уређај"
+
 #~ msgid "Completed"
 #~ msgstr "Завршено"
 
@@ -3987,9 +5694,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Излаз из инсталатера"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Излаз из инсталатера"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Недостаје IP адреса."
 
@@ -4039,9 +5743,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Ризници %r недостаје назив у подешавањима, користим id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Нема доступне мреже"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4049,9 +5750,6 @@ msgstr ""
 #~ "Неке од ваших ризница софтвера захтевају умрежавање, али је дошло до "
 #~ "грешке при укључивању мреже на систему."
 
-#~ msgid "Re_boot"
-#~ msgstr "По_крени поново"
-
 #~ msgid "_Eject"
 #~ msgstr "_Избаци"
 
@@ -4192,9 +5890,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Графичко радно окружење"
 
-#~ msgid "Web Server"
-#~ msgstr "Веб сервер"
-
 #~ msgid "Minimal"
 #~ msgstr "Минимални"
 
@@ -4225,27 +5920,6 @@ msgstr ""
 #~ "не могу брисати:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Нисте дефинисали корену партицију (/), која је неопходна за наставак %s "
-#~ "инсталације."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Ваша корена партиција је мања од 250 мегабајта, што је обично премало за "
-#~ "%s инсталацију."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Ваша %(mount)s партиција је мања од %(size)s МБ, што је мање него "
-#~ "препоручљиво за редовну %(productName)s инсталацију."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4259,33 +5933,6 @@ msgstr ""
 #~ "Инсталација на FireWire уређај.  Ово може али не мора да произведе систем "
 #~ "у радном стању."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Нисте направили покретачку партицију."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Нисте навели свап партицију.  Иако није строго неопходна у свим "
-#~ "случајевима, значајно ће побољшати учинак већине инсталација."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Тачка монтирања није исправна.  Директоријум %s мора бити на систему "
-#~ "датотека /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s тачка монтирања мора бити на Linux систему датотека."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Форматирање DASD уређаја"
-#~ msgstr[1] "Форматирање DASD уређаја"
-#~ msgstr[2] "Форматирање DASD уређаја"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Припремање %d DASD уређаја за Linux употребу..."
diff --git a/anaconda/po/sr@latin.po b/anaconda/po/sr@latin.po
index fa57f48..afb95fb 100644
--- a/anaconda/po/sr@latin.po
+++ b/anaconda/po/sr@latin.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,211 +20,444 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Pokreni VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Koristi tekstualni režim"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "U redu"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Izvršavam skripte pre instalacije"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Počinjem postupak instalacije"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Vršim podešavanja posle instalacije"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -233,86 +466,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Izvršavam skripte pre instalacije"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Dužina imena domaćina mora biti 255 ili manje znakova."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Ime domaćina mora početi ispravnim znakom u opsegu „a-z“, „A-Z“, ili „0-9“"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -321,7 +845,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s instalacija"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -335,8 +864,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Ne mogu da nađem /bin/sh radi izvršavanja!  Ne pokrećem ljusku"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Spasi"
 
@@ -374,28 +903,22 @@ msgstr "Sistem za spašavanje"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Koji uređaj sadrži korensku particiju vaše instalacije?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "U redu"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Izađi"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -408,7 +931,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -417,28 +940,209 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Nemate nijednu Linux particiju.  Pokrećem ponovo.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Režim spašavanja"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Vaš sistem je montiran pod %s direktorijum."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Vaša korena particija je manja od 250 megabajta, što je obično premalo za %s "
+"instalaciju."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Niste definisali korenu particiju (/), koja je neophodna za nastavak %s "
+"instalacije."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Vaša %(mount)s particija je manja od %(size)s MB, što je manje nego "
+"preporučljivo za redovnu %(productName)s instalaciju."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Niste napravili pokretačku particiju."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Niste naveli svap particiju.  Iako nije strogo neophodna u svim slučajevima, "
+"značajno će poboljšati učinak većine instalacija."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Tačka montiranja nije ispravna.  Direktorijum %s mora biti na sistemu "
+"datoteka /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s tačka montiranja mora biti na Linux sistemu datoteka."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -551,84 +1255,233 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "F_edora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Pripremam transakciju sa izvora instalacije"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Greška pri instalaciji paketa"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Potrebno vam je više prostora na sledećim sistemima datoteka:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Pripremam transakciju sa izvora instalacije"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Greška pri instalaciji paketa"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Posle instalacije"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Priprema za instalaciju"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Posle instalacije"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Ne mogu da primim pitanje u komandnom režimu!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Greška"
 
@@ -652,31 +1505,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -691,451 +1546,522 @@ msgstr ""
 "da biste se povezali na ovaj računar sa drugog računara i izveli grafičku "
 "instalaciju ili da nastavite sa instalacijom u tekstualnom režimu?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Lozinka mora imati najmanje šest znakova."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Lozinka mora imati najmanje šest znakova."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "podešavanju sistema datoteka nedostaje vrsta"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Instalacija počinje"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Vršim podešavanja posle nadgradnje"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Pokreni VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Napredovanje instalacije"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Pripremam transakciju sa izvora instalacije"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Greška pri instalaciji paketa"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Razvoj softvera"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Upozorenje"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1151,581 +2077,408 @@ msgstr "U toku"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s instalacija"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Razvoj softvera"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1752,279 +2505,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Razvoj softvera"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Greška pri postavljanju riznice"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Greška pri postavljanju riznice"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2032,14 +2809,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2048,33 +2825,40 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formatiranje DASD uređaja"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2082,95 +2866,109 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "U redu"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2182,68 +2980,164 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s tačka montiranja mora biti na Linux sistemu datoteka."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2252,951 +3146,1363 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "Na_stavi"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "U redu"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Veb server"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Potvrdite"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Nema dostupne mreže"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Koristi tekstualni režim"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapacitet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "D_odaj"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Potvrdite"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Nema dostupne mreže"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Potvrdite"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Potvrdite"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Potvrdite"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Korisničko ime"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Povezano!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI sistemska particija"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Izlaz iz instalatera"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI sistemska particija"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Šifrovan"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI sistemska particija"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "D_odaj"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Potvrdite"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "D_odaj"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "D_odaj"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operativna greška."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Operativna greška."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3204,648 +4510,1028 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Koji jezik biste želeli da koristite tokom procesa instalacije?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "Na_stavi"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Potvrdite"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Slobodno"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID uređaj"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "D_odaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Šifrovan"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Kapacitet"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID uređaj"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Šifrovan"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Potvrdite"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Ime začetnika nije postavljeno"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Korisničko ime"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Slobodno"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Kapacitet"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Korisničko ime"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID uređaj"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Šifrovan"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formatiranje DASD uređaja"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Potvrdite"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "U redu"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI sistemska particija"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Posle instalacije"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Priprema za instalaciju"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Vršim podešavanja posle nadgradnje"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Po_kreni ponovo"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3859,40 +5545,41 @@ msgstr "Instaliraj"
 msgid "Install the live CD to your hard disk"
 msgstr "Instalirajte živi CD na vaš čvrsti disk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3901,60 +5588,80 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Greška"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY promenljiva nije postavljena. Pokrećem tekstualni režim."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafička instalacija nije dostupna. Pokrećem tekstualni režim."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Ime domaćina mora početi ispravnim znakom u opsegu „a-z“, „A-Z“, ili „0-9“"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Potrebno vam je više prostora na sledećim sistemima datoteka:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Ne mogu da primim pitanje u komandnom režimu!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Korisničko ime"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID uređaj"
+
 #~ msgid "Completed"
 #~ msgstr "Završeno"
 
@@ -3988,9 +5695,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Izlaz iz instalatera"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Izlaz iz instalatera"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Nedostaje IP adresa."
 
@@ -4040,9 +5744,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "Riznici %r nedostaje naziv u podešavanjima, koristim id"
 
-#~ msgid "No Network Available"
-#~ msgstr "Nema dostupne mreže"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4050,9 +5751,6 @@ msgstr ""
 #~ "Neke od vaših riznica softvera zahtevaju umrežavanje, ali je došlo do "
 #~ "greške pri uključivanju mreže na sistemu."
 
-#~ msgid "Re_boot"
-#~ msgstr "Po_kreni ponovo"
-
 #~ msgid "_Eject"
 #~ msgstr "_Izbaci"
 
@@ -4193,9 +5891,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Grafičko radno okruženje"
 
-#~ msgid "Web Server"
-#~ msgstr "Veb server"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimalni"
 
@@ -4226,27 +5921,6 @@ msgstr ""
 #~ "ne mogu brisati:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Niste definisali korenu particiju (/), koja je neophodna za nastavak %s "
-#~ "instalacije."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Vaša korena particija je manja od 250 megabajta, što je obično premalo za "
-#~ "%s instalaciju."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Vaša %(mount)s particija je manja od %(size)s MB, što je manje nego "
-#~ "preporučljivo za redovnu %(productName)s instalaciju."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4260,33 +5934,6 @@ msgstr ""
 #~ "Instalacija na FireWire uređaj.  Ovo može ali ne mora da proizvede sistem "
 #~ "u radnom stanju."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Niste napravili pokretačku particiju."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Niste naveli svap particiju.  Iako nije strogo neophodna u svim "
-#~ "slučajevima, značajno će poboljšati učinak većine instalacija."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Tačka montiranja nije ispravna.  Direktorijum %s mora biti na sistemu "
-#~ "datoteka /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s tačka montiranja mora biti na Linux sistemu datoteka."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formatiranje DASD uređaja"
-#~ msgstr[1] "Formatiranje DASD uređaja"
-#~ msgstr[2] "Formatiranje DASD uređaja"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Pripremanje %d DASD uređaja za Linux upotrebu..."
diff --git a/anaconda/po/sv.po b/anaconda/po/sv.po
index 75f6b34..ea7e52a 100644
--- a/anaconda/po/sv.po
+++ b/anaconda/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/fedora/language/"
@@ -22,11 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot-filsystem"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -35,7 +35,7 @@ msgstr ""
 "RAID-uppsättningar som innehåller ”%s” måste ha en av följande raid-nivåer: "
 "%s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -44,7 +44,7 @@ msgstr ""
 "RAID-uppsättningar som innehåller ”%s” måste ha en av följande "
 "metadataversioner: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -53,108 +53,129 @@ msgstr ""
 "RAID-uppsättningar som innehåller ”%s” måste ha en av följande enhetstyper: "
 "%s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s måste ha en av följande typer av disketikett: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s kan inte vara av typen %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s måste vara monterad som en av %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s måste vara mellan %d och %d MB stor"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s får inte vara mindre än %d MB."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s får inte vara större än %d MB."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s måste finnas inom de första %d MB av disken."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s måste ligga på en primär partition."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s kan inte ligga på en krypterad blockenhet."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s kan inte vara av typen %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s har kanske inte tillräckligt med utrymme för att grub2 skall kunna bädda "
 "in core.img när %s-filsystemet används på en %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Starta VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Använd textläge"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Lösenordet är satt."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Lösenorden stämmer inte överens!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Du har gett ett svagt lösenord: %s.  Tryck Klar igen för att använda det "
 "ändå."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -162,87 +183,338 @@ msgstr ""
 "ändå."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Svag"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Rimlig"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Bra"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Stark"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Ja"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Nej"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Följande fel inträffade när installationsförrådet sattes upp:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installationen kan inte gå vidare."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Följande fel inträffade när installationsförrådet sattes upp:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Installationen kan inte gå vidare."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"Följande programvara markerad för installation har fel.  Detta beror "
+"sannolikt på ett fel\n"
+"i din installationskälla.  Du kan försöka ta bort dessa paket från din "
+"installation,\n"
+"ändra din installationskälla, eller avsluta installationsprogrammet."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Installationen avbröts på grund av vad som verkar vara ett problem med din "
+"hårdvara.  Det exakta felmeddelandet är:\n"
+"\n"
+"%s.\n"
+"\n"
+" Installeraren kommer nu att avslutas."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Installationen avbröts på grund av vad som verkar vara ett problem med din "
+"hårdvara.  Det exakta felmeddelandet är:\n"
+"\n"
+"%s.\n"
+"\n"
+" Installeraren kommer nu att avslutas."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Stötte på hårdvarufel"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Installationen avbröts på grund av vad som verkar vara ett problem med din "
+"hårdvara.  Det exakta felmeddelandet är:\n"
+"\n"
+"%s.\n"
+"\n"
+" Installeraren kommer nu att avslutas."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "_Konfigurations-URL"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Kör förinstallationsskript"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Sätter upp installationskällor …"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Utför inställningsåtgärder efter installationen"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Deponeringscertifikatet %s behöver nätverket."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -254,87 +526,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s saknas.  Kan inte sätta upp en brandvägg."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s saknas.  Kan inte sätta upp en brandvägg."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "Detta filsystem stödjer inte etiketter."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Kör förinstallationsskript"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Värdnamnet får vara högst 255 tecken långt."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Värdnamnet måste börja med ett giltigt tecken i något av intervallen \"a-z"
-"\", \"A-Z\" eller \"0-9\""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Okänd"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Ansluter …"
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Kopplar ifrån …"
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Trådbundet (%s) anslutet"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Trådlöst anslutet till %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Inte ansluten"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Inga nätverksenheter tillgängliga"
 
@@ -343,7 +905,12 @@ msgstr "Inga nätverksenheter tillgängliga"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Ny installation av %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Kör %s för att avmontera systemet när du är klar."
@@ -357,8 +924,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Kan inte hitta /bin/sh att köra!  Startar inte ett skal"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Räddning"
 
@@ -405,21 +972,15 @@ msgstr "System att rädda"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Vilken enhet innehåller rotpartitionen i din installation?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Avsluta"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Systemet kommer automatiskt att startas om när du avslutar skalet."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -429,7 +990,7 @@ msgstr ""
 "på Retur för att komma till ett skal där du kan köra fsck och montera dina "
 "partitioner.  %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -450,7 +1011,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -463,29 +1024,243 @@ msgstr ""
 "\n"
 "Tryck <retur> för att få ett skal."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Du har inte någon Linuxpartition.  Startar om.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Systemet kommer automatiskt att startas om när du avslutar skalet."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Räddningsläge"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Du har inte någora Linuxpartitioner.  Tryck retur för att få ett skal.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Ditt system är monterat under katalogen %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Standardpartition"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Disk"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Växlingsarean på din dator används av operativsystemet när det får ont om "
+"minne."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Startarean på din dator är där filer som behövs\n"
+"för att starta operativsystemet lagras."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"Rotarean på din dator är där centrala systemfiler\n"
+"och program lagras."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"Hemarean på din dator är där alla dina personliga\n"
+"data lagras."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS-startpartitionen behövs för att kunna starta\n"
+"från GPT-partitionerade diskar med BIOS-hårdvara."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"PReP-startpartitionen behövs som den del av\n"
+"startprogrammets konfiguration på en del PPC-plattformar."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Din rotpartition är mindre än 250 megabyte, vilket normalt är för litet för "
+"att installera %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Du har inte angivit någon rotpartition (/), vilket krävs för att "
+"installationen av %s ska kunna fortsätta."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Denna plattform behöver /boot på en särskild partition eller logisk volym.  "
+"Om du inte vill ha en /boot-volym måste du placera / på en särskild icke-LVM-"
+"partition."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Din %(mount)s-partition är mindre än %(size)s megabyte vilket är mindre än "
+"rekommenderat för en normal installation av %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Din %(mount)s-partition är för liten för %(format)s-formatering (tillåten "
+"storlek är %(minSize)d MB till %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Din %(mount)s-partition är för stor för %(format)s-formatering (tillåten "
+"storlek är %(minSize)d MB till %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Misslyckades att lägga till en ny enhet.  Klicka för detaljer."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Du har inte skapat en startpartition."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Ditt BIOS-baserade system behöver en särskild partition för att starta med "
+"%ss nya disketikettformat (GPT).  För att fortsätta, skapa en 1 MB-partition "
+"av typen ”BIOS Boot”."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Du har inte angivit en växlingspartition.  %(requiredMem)s MB minne behövs "
+"för att fortsätta installationen utan en växlingspartition, men du har bara "
+"%(installedMem)s MB."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Du har inte angivit en växlingspartition. Även om det inte absolut krävs i "
+"alla lägen kommer det att markant förbättra prestanda för de flesta "
+"installationer."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Åtminstone en av dina swap-enheter har inte en UUID, vilket är vanligt i "
+"växlingsutrymmen som har skapats med äldre versioner av mkswap.  Dessa "
+"enheter kommer att refereras till med av enhetens sökvägen i /etc/fstab, "
+"vilket inte är idealiskt eftersom enhetensökvägar kan förändras under olika "
+"omständigheter. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Denna montering är ogiltig.  Katalogen %s måste finnas på /-filsystemet."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Monteringspunkten %s måste ligga på ett linux-filsystem."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Lösenfras:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -596,87 +1371,239 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "VNC-lösenordet aom gavs var inte åtminstone 6 tecken långt.\n"
 "Ange ett nytt.  Lämna tomt för inget lösenord."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Misslyckades att sätta upp installationskälla"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Fel när paketmetadata hämtades …"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Ingen installationskälla tillgänglig"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Installerar program"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Startar paketinstallationsprocessen"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Du behöver mer utrymme på följande filsystem:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Förbereder transaktion från installationskälla"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Installerar"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Hämtar paketmetadata …"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Installerar"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Förbereder att installera"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Kontrollerar lagringskonfiguration …"
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "STANDARDTITEL"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOKALISERING"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOKALISERING"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "PROGRAMVARA"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Installationsnavet"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Startar automatisk installation"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Kan inte ha en fråga i kommandoradsläge!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  Gör ditt val från ovan [”a” för att avsluta | ”c” för att fortsätta]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Avsluta alla ekrar innan du fortsätter"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Standard navtitel"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Avsluta alla ekrar innan du fortsätter"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Fel"
 
@@ -700,25 +1627,28 @@ msgstr "ja"
 msgid "no"
 msgstr "nej"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Vill du verkligen avsluta?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "a"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -726,7 +1656,7 @@ msgid ""
 msgstr ""
 "  Gör ditt val från ovan [”a” för att avsluta | ”c” för att fortsätta]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -741,219 +1671,258 @@ msgstr ""
 "denna dator från en annan dator och utföra en grafisk installation, eller "
 "fortsätta med en textläge installation?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "a"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC-lösenord"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Välj ett nytt VNC-lösenord.  Du kommer behöva skriva det två gånger.\n"
 "Lämna blankt för inget lösenord"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Lösenord (bekräfta): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Lösenorden stämmer inte överens!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Lösenordet måste vara minst sex tecken långt."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Lösenordet måste vara minst sex tecken långt."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Tidszonsinställningar"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Tidszonen är inte satt."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Tillgängliga regioner"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Tillgängliga regioner"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Kontrollerar lagringskonfiguration …"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Trådbundet (%s) anslutet"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Trådbundet (%s) anslutet"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Värdnamn"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Värdnamn"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "_Avsluta konfigurationen"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Gateway"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "filsystemskonfigurationen saknar en typ"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Rootlösenord:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Lösenordet är satt."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Root-kontot är avaktiverat."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Lösenordet är inte satt."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Välj ett nytt root-lösenord.  Du kommer behöva skriva det två gånger."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Lösenord: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Använd allt utrymme"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Ersätt befintligt Linuxsystem"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Använd ledigt utrymme"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Installationsdestination"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Inga diskar valda"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Fel vid kontroll av lagringskonfigurationen"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Fel vid kontroll av lagringskonfigurationen"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Automatisk partitionering vald"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Anpassad partitionering vald"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -961,38 +1930,59 @@ msgstr ""
 "Inga diskar upptäcktes.  Stäng av datorn, anslut åtminstone en disk, och "
 "starta om för att fullfölja installationen."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "Inga diskar valda; välj minst en disk att installeras på."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Känner av lagring …"
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Genererad uppdaterad lagringskonfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "lagringskonfigurationen misslyckades: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Kontrollerar lagringskonfiguration …"
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Alternativ vid automatpartitionering"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1001,41 +1991,41 @@ msgstr ""
 "Installationen kräver partitionering av din hårddisk.  Välj det utrymme som "
 "skall användas som installationsmål."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Partitionsschemakonfiguration"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Partitionsschemakonfiguration"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Tidszonsinställningar"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Tidszonen %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Tidszonen är inte satt."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Tillgängliga tidszoner i regionen %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Tillgängliga regioner"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1044,179 +2034,197 @@ msgstr ""
 "Använd siffror eller skriv namnen direkt [b för regionlista, q för att "
 "avsluta]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Starta VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Installationsförlopp"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Närmaste spegel"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS-server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Fel när programmkälla sattes upp"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Inget valt"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Ansluter …"
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD-/DVD-enhet"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_ISO-fil:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Nätverkstid"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Ingen installationskälla tillgänglig"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Misslyckades att sätta upp installationskälla"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Fel när paketmetadata hämtades …"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Ingen installationskälla tillgänglig"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS-server %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS-monteringsflaggor:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 "Misslyckades att sätta upp installationskälla, kontrollera förråds-url:en"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "enheten som innehåller /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Misslyckades att sätta upp installationskälla"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "_Ändra programval"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Fel vid kontroll av programval"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Installationskällan är inte uppsatt"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Anpassat val av program"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Installationskällan är inte uppsatt"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Välj din omgivning"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "A_nvänd autenticering"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Du måste ange och bekräfta ett lösenord."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Varning"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1232,36 +2240,36 @@ msgstr "Pågår"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tInstallationen klar.  Tryck retur för att avsluta."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Standardekertitel"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "testar status …"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Ny enhet"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Lösenord (bekräfta): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1270,7 +2278,7 @@ msgstr ""
 "Du har gett ett svagt lösenord: %s.  Tryck Klar igen för att använda det "
 "ändå."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1279,63 +2287,46 @@ msgstr ""
 "Du har gett ett svagt lösenord: %s.  Tryck Klar igen för att använda det "
 "ändå."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Lösenordet är satt."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Avsluta installationsprogrammet"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
+msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Nej"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Ja"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "STANDARDTITEL"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOKALISERING"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOKALISERING"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "PROGRAMVARA"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1343,7 +2334,11 @@ msgstr ""
 "Gör färdigt delar markerade med denna ikon före du fortsätter till nästa "
 "steg."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Färdig!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1352,165 +2347,67 @@ msgstr ""
 "%s är nu installerat på ditt system och redo att användas\n"
 "av dig!  Ta och starta om för att börja använda det!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Färdig!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "_Avsluta"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Ny installation av %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s är nu installerat på ditt system, men en del konfiguration behöver "
+"fortfarande göras.\n"
+"Avsluta den och klicka på knappen Avsluta konfigurationen."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s är nu installerat på ditt system och redo att användas\n"
+"av dig!  Ta och starta om för att börja använda det!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "Omkonfiguration av enheten misslyckades.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "kolumn"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "Lagringskonfiguration återställd på grund av fel som inte kan rättas.  "
 "Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "Omkonfiguration av enheten misslyckades.  Klicka för detaljer."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Ange en giltig monteringspunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Den monteringspunkten är ogiltig.  Försök med något annat?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Den monteringspunkten används redan.  Försök med något annat?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Ange en giltig monteringspunkt."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Den monteringspunkten är ogiltig.  Försök med något annat?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Standardpartition"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Disk"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Ingen"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Ta bort alla andra filsystem på rotenheten %s också."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Är du säker på att du vill ta bort all data på %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Är du säker på att du vill ta bort all data på %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "MANUELL PARTITIONERING"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d lagringsenhet vald"
 msgstr[1] "%d lagringsenheter valda"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1519,331 +2416,261 @@ msgstr ""
 "När du skapar monteringspunkter för din installation av %s %s\n"
 "kommer du kunna se deras detaljer här."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Växlingsarean på din dator används av operativsystemet när det får ont om "
-"minne."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Startarean på din dator är där filer som behövs\n"
-"för att starta operativsystemet lagras."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"Rotarean på din dator är där centrala systemfiler\n"
-"och program lagras."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"Hemarean på din dator är där alla dina personliga\n"
-"data lagras."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS-startpartitionen behövs för att kunna starta\n"
-"från GPT-partitionerade diskar med BIOS-hårdvara."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"PReP-startpartitionen behövs som den del av\n"
-"startprogrammets konfiguration på en del PPC-plattformar."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi måste ligga på en enhet av typen %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s måste vara på en enhet av typen %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s kan inte vara krypterad"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Du måste skapa ett nytt filsystem på rotenheten."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "Misslyckades att ändra en enhets storlek.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "Misslyckades att omformattera en enhet.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "Detta filsystem stödjer inte etiketter."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Inga diskar valda"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Detta filsystem går inte att ändra storlek på."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "Fel vid kontroll av lagringskonfiguration.  Klicka för detaljer."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "Fel vid kontroll av lagringskonfiguration.  Klicka för detaljer."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Misslyckades att lägga till en ny enhet.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "Misslyckades att ta bort en enhet.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fritt på fs"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Inga diskar valda."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Inte tillräckligt med fritt utrymme på de valda diskarna."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "Automatisk partitionering misslyckades.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "_Ändra programval"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Misslyckades att låsa upp en krypterad blockenhet.  Klicka för detaljer"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATUM & TID"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "em"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "Du behöver sätta upp nätverket först om du vill använda NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Du har ingen fungerande NTP-server konfigurerad"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "INSTALLATIONSMÅL"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d lagringsenhet vald"
+msgstr[1] "%d lagringsenheter valda"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s för att byta layouter."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "TANGENTBORD"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Testning av layoutkonfigurationer är inte tillgängligt."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "testar status …"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Byte av layout inte konfigurerat."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "SPRÅK"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Okänd status (saknas)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Okänd status"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Ej hanterat"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Inte tillgängligt"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Fast programvara (firmware) saknas"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Sladden inte inkopplad"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Inte tillgängligt"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Frånkopplad"
@@ -1868,153 +2695,169 @@ msgstr "Kopplar ifrån"
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "ej inkopplad"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Trådlöst"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "ej inkopplad"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4-adress"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6-adress"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-adress"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Ingen"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Autenticering krävs"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Lösenord: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NÄTVERKSKONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT-LÖSENORD"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Lösenordet är satt."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root-lösenordet är satt"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root-kontot är avaktiverat"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root-lösenordet är inte satt"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "VAL AV PROGRAM"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Kontrollerar beroenden mellan programvara …"
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Fel vid kontroll av programvaruberoenden"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Hämtar paketmetadata …"
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Hämtar gruppmetadata …"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Kontrollerar beroenden mellan programvara …"
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Fel vid kontroll av programvaruberoenden"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "Fel vid kontroll av programberoenden.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "Följande programvara markerad för installation har fel.  Detta beror "
 "sannolikt på ett fel\n"
@@ -2022,47 +2865,78 @@ msgstr ""
 "installation,\n"
 "ändra din installationskälla, eller avsluta installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "_Avsluta"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "_Ändra programvarukälla"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "_Ändra programval"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Sätter upp installationskällor …"
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Fel när paketmetadata hämtades …"
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Autenticering krävs"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Detta medium fungerar bra att installera ifrån."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Detta medium fungerar inte att installera ifrån."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALLATIONSKÄLLA"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 "Misslyckades att sätta upp installationskälla, kontrollera förråds-url:en"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Fel när förråd sattes upp"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Fel när programmkälla sattes upp"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2070,98 +2944,80 @@ msgstr ""
 "Misslyckades att sätta upp installationskälla, kontrollera förråds-url:en "
 "och proxy-inställningar"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Fel när förråd sattes upp"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Fel när programmkälla sattes upp"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS-server %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Ogiltig tidszon"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Ogiltig tidszon"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Ogiltig tidszon"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Var god dröj … metadata om program läses fortfarande in."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "Diskarna du har valt har följande mängd med ledigt utrymme:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Var god dröj … metadata om program läses fortfarande in."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2173,7 +3029,7 @@ msgstr ""
 "hjälpa dig att återvinna utrymme genom att krympa eller ta bort befintliga "
 "partitioner."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2184,7 +3040,7 @@ msgstr ""
 "b>, även om du skulle använda allt ledigt utrymme\n"
 "som är tillgängligt på de valda diskarna."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2199,48 +3055,59 @@ msgstr ""
 "ändra ditt val av programvara och installera en mindre version av <b>%s</b>, "
 "eller avsluta installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "INSTALLATIONSMÅL"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Sparar lagringskonfigurationen …"
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Misslyckades att spara lagringskonfigurationen …"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Formaterar DASD-enhet"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "Fel vid kontroll av lagringskonfiguration.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "Fel vid kontroll av lagringskonfiguration.  Klicka för detaljer."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fritt på fs"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d disk vald; %s kapacitet; %s fritt"
 msgstr[1] "%d diskar valda; %s kapacitet; %s fritt"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2250,11 +3117,19 @@ msgstr ""
 "ändra din lagringslayout\n"
 "eller avsluta installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "_Ändra lagringslayout"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2265,52 +3140,53 @@ msgstr ""
 "ändra din lagringslayout\n"
 "eller avsluta installationsprogrammet."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+#, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
-msgstr ""
+msgstr "NÄTVERKSKONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ogiltig tidszon"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "VÄLKOMMEN TILL %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2318,23 +3194,27 @@ msgid ""
 msgstr ""
 "Du har inte skapat någon monteringspunkt för din installation av %s %s ännu:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Klicka här för att skapa dem automatiskt."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "Eller, skapa nya monteringspunkter under med ikonen ”+”."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2349,55 +3229,157 @@ msgstr[1] ""
 "<b>%d diskar; %s kapacitet; %s fritt utrymme</b> (opartitionerat och i "
 "filsystem)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "_Sätt som startenhet"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "kolumn"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Monteringspunkten %s måste ligga på ett linux-filsystem."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Den monteringspunkten används redan.  Försök med något annat?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Ange en giltig monteringspunkt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Den monteringspunkten är ogiltig.  Försök med något annat?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Ta bort alla andra filsystem på rotenheten %s också."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Är du säker på att du vill ta bort all data på %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Är du säker på att du vill ta bort all data på %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Ogiltig tidszon"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Du har gett en svag lösenfras: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Lösenfraserna stämmer inte överens."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Bevara"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Krymp"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Ta bort"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Skapar %(type)s på %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Inte redo"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Använd ledigt utrymme"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2410,14 +3392,14 @@ msgstr ""
 "utrymme för installationen.  Att ta bort ett filsystem kommer permanent "
 "radera all data det innehåller."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2425,353 +3407,762 @@ msgid_plural ""
 msgstr[0] "<b>%s disk; %s återvinningsbart utrymme</b> (i filsystem)"
 msgstr[1] "<b>%s diskar; %s återvinningsbart utrymme</b> (i filsystem)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Totalt valt utrymme att återvinna: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Ta bort"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Bevara"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "DISTRIBUTIONSINSTALLATION"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "EKERNAMN"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "FÖRUTGÅVA / TESTNING"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Ny enhet"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Ny väljare"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Klar"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Fortsätt"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "_Verkställ ändringar"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NÄTVERKSKONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Gruppnamn"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATUM & TID"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr "."
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "em"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Lägg till och notera för användning NTP-servrar"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Webbserver"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Fungerar"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Använd"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Konfigurerera …"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATUM & TID"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Region:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Stad:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Stad:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Nätverksnamn"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Nätverksnamn"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr "."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "fm/em"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "fm/em"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-timmar"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "fm/em"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "INSTALLATIONSMÅL"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapacitet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Inte ansluten"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Vald enhet"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Inget valt"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Etikett:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Fast programvara (firmware) saknas"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Nej"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN-typ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Vald enhet"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "sammanfattning"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID-enhet"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Standardrutt"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Delnätmask"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Hastighet"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Hårdvaruadress"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "K_onfigurera"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Säkerhet"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Nätverksnamn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Nätverksnamn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Säkerhetsnyckel"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Använd som hotspot …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "_Stoppa hotspot …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Konfigurerera …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Leverantör"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Konfigurerera …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN-typ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Gateway"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Gruppnamn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Grupplösenord"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Användarnamn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Konfigurerera …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "_Metod"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Konfigurations-URL"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "_HTTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "_FTP-proxy"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Socks-värd"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Kontrollerar lagringskonfiguration …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Lås upp"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Flyg_plansläge"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Kontrollerar lagringskonfiguration …"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Värdnamn"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NÄTVERKSKONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2781,206 +4172,61 @@ msgstr ""
 "och för att göra\n"
 "uppdateringingar av programvara tillgängliga för dig."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Standardrutt"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Delnätmask"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Hastighet"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Hårdvaruadress"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "K_onfigurera"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Säkerhet"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Nätverksnamn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Nätverksnamn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Säkerhetsnyckel"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Använd som hotspot …"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "_Stoppa hotspot …"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Konfigurerera …"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Leverantör"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN-typ"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Gateway"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Gruppnamn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Grupplösenord"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Användarnamn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "_Metod"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Konfigurations-URL"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "_HTTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "_FTP-proxy"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Socks-värd"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Lås upp"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Flyg_plansläge"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Värdnamn"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "A_nvänd autenticering"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Autenticering krävs"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Ansluten"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "VAL AV PROGRAM"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Välj din omgivning"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "kolumn"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Avbryt & _lägg till fler diskar"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "INSTALLATIONSALTERNATIV"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Partitionstyp:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Kryptera mina data.  Jag sätter en lösenfras senare."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Anpassad partitionering vald"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Återvinn utrymme"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "INSTALLATIONSALTERNATIV"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -2988,79 +4234,146 @@ msgstr ""
 "Här kommer vi beskriva hur mycket utrymme som behövs för det nuvarande valet "
 "av programvara."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "fritt på disk"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Fritt utrymme tillgängligt för användning."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fritt på fs"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Fritt utrymme som inte är tillgängligt men kan återvinnas från befintliga "
 "partitioner."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Här kommer vi beskriva vilka dina alternativ är."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Använd ledigt utrymme"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "_Avsluta installationsprogrammet"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Enhetsbeskrivning"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Lokala standarddiskar"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "_Avsluta partitioneringen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "_Kryptera"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Automatisk partitionering vald"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "_Avsluta partitioneringen"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "_Kryptera"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Kryptera mina data.  Jag sätter en lösenfras senare."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Alternativ vid automatpartitionering"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "sammanfattning"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Fullständig sammanfattning av diskar och alternativ …"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "LÄGG TILL EN TANGENTBORDSLAYOUT"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Du kan lägga till en tangentbordslayout genom att välja den nedan:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Namn"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "TANGENTBORDSLAYOUT"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3068,123 +4381,205 @@ msgstr ""
 "Vilka tangentbordslayouter vill du använda på detta system?  Du kan flytta "
 "en layout till överst i listan för att välja den som standard."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "namn"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Lägg till layout"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Ta bort layout"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Flytta den valda layouten uppåt"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Lägg till layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Ta bort layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Flytta den valda layouten uppåt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Flytta den valda layouten nedåt"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Förhandsgranska layout"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Testning av layoutkonfigurationer är inte tillgängligt."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Skift för att byta layouter."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "Alternat_iv"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "LÄGG TILL EN TANGENTBORDSLAYOUT"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Du kan lägga till en tangentbordslayout genom att välja den nedan:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Namn"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Tillgängliga regioner"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Lägg till layout"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ALTERNATIV FÖR BYTE AV LAYOUT"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Vilka kombinationer skulle du föredra för byte mellan tangentbordslayouter?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "använd"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "beskrivning"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS-monteringsflaggor:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "SPRÅK"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "egetNamn"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "engelsktNamn"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Inget valt"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT-LÖSENORD"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Rootlösenord:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Bekräfta:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC-lösenord"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Sätt root-lösenord"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3192,236 +4587,283 @@ msgstr ""
 "root-kontot används för administration av systemet.  Ange ett lösenord för "
 "root-användaren."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Klar"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "MEDIAVERIFIERING"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Verifierar media, var god dröj …"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Lägg till"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Aktivera HTTP-proxy"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Proxy-URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Exempel:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "A_nvänd autenticering"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Användarnamn</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Användarnamn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Lösenord</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Lösenord: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALLATIONSKÄLLA"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Vilken installationskälla vill du använda?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Autodetekterat installationsmedium:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Etikett:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "_Verifiera"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_ISO-fil:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "_Välj en ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "På _nätverket:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Proxyinställning …"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS-monteringsflaggor:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Detta fält är valfritt."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedorafolks förråd"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Lägg till en ny monteringspunkt"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Lägg till"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Ta bort de valda monteringspunkterna."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Ta bort layout"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Operativt fel."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Sätt root-lösenord"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Namn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Proxy-URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Användarnamn"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Lösenord: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Den monteringspunkten är ogiltig.  Försök med något annat?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Ta mig härifrån!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Jag accepterar mitt öde."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Detta är en osäker förhandsutgåva."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3433,199 +4875,262 @@ msgstr ""
 "leva med.  Detta OS från framtiden är inte ett stabilt OS du kan lita på.  "
 "Det är endast till för teständamål."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "VÄLKOMMEN TILL %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Vilket språk vill du använda under installationen?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Fortsätt"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Användarnamn"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Gruppnamn"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Lösenord: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC-lösenord"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Lägg till monteringspunkt"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Önskad kapacitet:</b>"
+msgid "Add a new mount point."
+msgstr "Lägg till en ny monteringspunkt"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Monteringspunkt:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Lägg till"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "LÄGG TILL EN NY MONTERINGSPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Fler anpassningsalternativ finns tillgänliga\n"
-"efter att monteringspunkten skapats nedan."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Monteringspunkten används redan.\n"
-"Försöka med något annat?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "t.ex: ”20 GB”, ”500mb” (minus citationstecknen)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "_Ta bort den"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "KONFIGURERA EN MONTERINGSPUNKT"
+msgid "Remove the selected mount point(s)."
+msgstr "Ta bort de valda monteringspunkterna."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Ledigt"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID-enhet"
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Ta bort layout"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "Encrypt"
-msgstr "_Kryptera"
+msgid "Reload storage configuration from disk."
+msgstr "lagringskonfigurationen misslyckades: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Vald enhet"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Enhetsbeskrivning"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Monteringspunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Önskad kapacitet:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Etikett:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Enhetstyp:</b>"
+msgid "Device(s):"
+msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Filsystem:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "_Kryptera"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Formatera om"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Namn"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Enhetstyp:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "_Kryptera"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Filsystem"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Formatera om"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "kolumn"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID-enhet"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3633,310 +5138,586 @@ msgstr ""
 "Denna enhet är krypterad och kan inte läsas utan en giltig lösenfras.  Du "
 "kan låsa upp den nedan."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Lösenfras:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "Lås _upp"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Lägg till en ny monteringspunkt"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Ta bort de valda monteringspunkterna."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Konfigurera den valda monteringspunkten."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurerera …"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "lagringskonfigurationen misslyckades: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TILLGÄNGLIGT UTRYMME</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">TOTALT UTRYMME</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "KONFIGURERA EN MONTERINGSPUNKT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Välj en eller flera diskar denna enhet kan finnas på."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-adress"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Du måste ange ett iSCSI-initierarnamn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "A_nvänd autenticering"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Exempel:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Användarnamn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC-lösenord"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Användarnamn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-lösenord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Användarnamn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC-lösenord"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Nätverksnamn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "A_nvänd autenticering"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Användarnamn"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-lösenord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Användarnamn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC-lösenord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Användarnamn"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC-lösenord"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Anslutningen misslyckades"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Enhet:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "VALDA DISKAR"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
-msgstr ""
+msgstr "Stäng"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Start"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Beskrivning"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Ledigt"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "Ta bort layout"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Disksammanfattningen hamnar här"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "_Ta bort den"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "Inget valt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "KONFIGURERA EN MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Välj en eller flera diskar denna enhet kan finnas på."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Lägg till monteringspunkt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Önskad kapacitet:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Monteringspunkt:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "LÄGG TILL EN NY MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Fler anpassningsalternativ finns tillgänliga\n"
+"efter att monteringspunkten skapats nedan."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Monteringspunkten används redan.\n"
+"Försöka med något annat?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "t.ex: ”20 GB”, ”500mb” (minus citationstecknen)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "KONFIGURERA EN MONTERINGSPUNKT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Namn"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID-enhet"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Kryptera"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Ange en giltig monteringspunkt."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Formaterar DASD-enhet"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "Ett okänt fel hände under installationen.  Detaljer finns nedan."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "LÖSENFRAS FÖR DISKKRYPTERING"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Spara lösenfrasen"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "LÖSENFRAS FÖR DISKKRYPTERING"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3946,7 +5727,19 @@ msgstr ""
 "lösenfras som du kommer använda för att komma åt dina data när du startar "
 "din dator."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Lösenfras:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Bekräfta:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3956,117 +5749,172 @@ msgstr ""
 "tangentbordslayout, kan du kanske inte dekryptera dina diskar efter "
 "installationen."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ÅTERVINN DISKUTRYMME"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Återvinn utrymme"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ÅTERVINN DISKUTRYMME"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Beskrivningen hamnar här."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Återvinningsbart utrymme"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Åtgärd"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Bevara"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Ta bort"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Krymp"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Anpassad partitionering vald"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "_Verkställ ändringar"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Enhet:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Lägg till monteringspunkt"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Avsluta installationsprogrammet"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Nej"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Ja"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4074,51 +5922,50 @@ msgstr ""
 "Är du säker på att du vill avsluta\n"
 "installationsprocessen?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "_Avsluta"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "INSTALLATIONSSAMMANFATTNING"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Starta installationen"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "KONFIGURATION"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Förbereder att installera"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s är nu installerat på ditt system, men en del konfiguration behöver "
-"fortfarande göras.\n"
-"Avsluta den och klicka på knappen Avsluta konfigurationen."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "_Avsluta konfigurationen"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s är nu installerat på ditt system och redo att användas\n"
-"av dig!  Ta och starta om för att börja använda det!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "Starta _om"
 
@@ -4134,16 +5981,16 @@ msgstr "Installera"
 msgid "Install the live CD to your hard disk"
 msgstr "Installera live-cd:n på din hårddisk"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Påbörjar installation på hårddisk"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Välkommen till Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4152,26 +5999,27 @@ msgstr ""
 "%s behöver %s MB minne för att installera, men du har bara %s MB på denna "
 "maskin.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Det grafiska installationsprogrammet %s behöver %s MB minne, men du har bara "
 "%s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Inte tillräckligt med minne"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4185,24 +6033,24 @@ msgstr ""
 "\n"
 " från en root-terminal."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Startar textläge."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Fel"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY-variabeln är inte satt.  Startar textläge!"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafisk installation är inte tillgänglig.  Startar textläge."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4213,20 +6061,20 @@ msgstr ""
 "ange din egen partitioneringslyaout eller dina egna paketval.  Vill du "
 "använda VNC-läge istället?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Gör ssh install@%s för att påbörja installationen."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "Använd ssh install@<värd> för att fortsätta installationen."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Prova Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4236,7 +6084,7 @@ msgstr ""
 "Du kan installera Fedora nu, eller välja ”Installera på hårddisk” i "
 "aktivtetsöversikten vid ett senare tillfälle."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4244,10 +6092,87 @@ msgstr ""
 "Du kan välja ”Installera på hårddisk” i\n"
 "aktivitetsöversikten vid ett senare tillfälle."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Stäng"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Värdnamnet måste börja med ett giltigt tecken i något av intervallen \"a-z"
+#~ "\", \"A-Z\" eller \"0-9\""
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Du behöver mer utrymme på följande filsystem:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Kan inte ha en fråga i kommandoradsläge!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Den monteringspunkten är ogiltig.  Försök med något annat?"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Fel när paketmetadata hämtades …"
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Inget valt"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Fast programvara (firmware) saknas"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Autenticering krävs"
+
+#~ msgid "column"
+#~ msgstr "kolumn"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Partitionstyp:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Proxy-URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Användarnamn</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Lösenord</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Den monteringspunkten är ogiltig.  Försök med något annat?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Etikett:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Filsystem:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID-enhet"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Konfigurera den valda monteringspunkten."
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr ""
+#~ "<span size=\"small\" foreground=\"white\">TILLGÄNGLIGT UTRYMME</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">TOTALT UTRYMME</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Färdigt"
 
@@ -4297,41 +6222,9 @@ msgstr "Stäng"
 #~ msgid "Install on System"
 #~ msgstr "Installera på system"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Följande fel inträffade när installationsförrådet sattes upp:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installationen kan inte gå vidare."
-
 #~ msgid "Exit installer"
 #~ msgstr "Avsluta installationsprogram"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Installationen avbröts på grund av vad som verkar vara ett problem med "
-#~ "din hårdvara.  Det exakta felmeddelandet är:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Installeraren kommer nu att avslutas."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Stötte på hårdvarufel"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Avsluta installationsprogrammet"
 
@@ -4626,9 +6519,6 @@ msgstr "Stäng"
 #~ msgid "Software Development"
 #~ msgstr "Programvaruutveckling"
 
-#~ msgid "Web Server"
-#~ msgstr "Webbserver"
-
 #~ msgid "Minimal"
 #~ msgstr "Minimal"
 
@@ -4672,50 +6562,6 @@ msgstr "Stäng"
 #~ "inte kan tas bort:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Du har inte angivit någon rotpartition (/), vilket krävs för att "
-#~ "installationen av %s ska kunna fortsätta."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Din rotpartition är mindre än 250 megabyte, vilket normalt är för litet "
-#~ "för att installera %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Denna plattform behöver /boot på en särskild partition eller logisk "
-#~ "volym.  Om du inte vill ha en /boot-volym måste du placera / på en "
-#~ "särskild icke-LVM-partition."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Din %(mount)s-partition är mindre än %(size)s megabyte vilket är mindre "
-#~ "än rekommenderat för en normal installation av %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Din %(mount)s-partition är för liten för %(format)s-formatering (tillåten "
-#~ "storlek är %(minSize)d MB till %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Din %(mount)s-partition är för stor för %(format)s-formatering (tillåten "
-#~ "storlek är %(minSize)d MB till %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4732,57 +6578,6 @@ msgstr "Stäng"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "du har inte skapat en målenhet för startprogrammets steg 1"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Du har inte skapat en startpartition."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Ditt BIOS-baserade system behöver en särskild partition för att starta "
-#~ "med %ss nya disketikettformat (GPT).  För att fortsätta, skapa en 1 MB-"
-#~ "partition av typen ”BIOS Boot”."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Du har inte angivit en växlingspartition.  %(requiredMem)s MB minne "
-#~ "behövs för att fortsätta installationen utan en växlingspartition, men du "
-#~ "har bara %(installedMem)s MB."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Du har inte angivit en växlingspartition. Även om det inte absolut krävs "
-#~ "i alla lägen kommer det att markant förbättra prestanda för de flesta "
-#~ "installationer."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Åtminstone en av dina swap-enheter har inte en UUID, vilket är vanligt i "
-#~ "växlingsutrymmen som har skapats med äldre versioner av mkswap.  Dessa "
-#~ "enheter kommer att refereras till med av enhetens sökvägen i /etc/fstab, "
-#~ "vilket inte är idealiskt eftersom enhetensökvägar kan förändras under "
-#~ "olika omständigheter. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Denna montering är ogiltig.  Katalogen %s måste finnas på /-filsystemet."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "Monteringspunkten %s måste ligga på ett linux-filsystem."
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux på %s"
 
@@ -4792,11 +6587,6 @@ msgstr "Stäng"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s för %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Formaterar DASD-enhet"
-#~ msgstr[1] "Formaterar DASD-enheter"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Förbereder %d DASD-enhet för att användas med Linux ..."
@@ -5004,9 +6794,6 @@ msgstr "Stäng"
 #~ msgid "Error setting root password"
 #~ msgstr "Fel när root-lösenord sattes"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Du måste ange och bekräfta ett lösenord."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "_Ta bort paket"
 
@@ -5026,24 +6813,12 @@ msgstr "Stäng"
 #~ msgid "%s of %s"
 #~ msgstr "%s av %s"
 
-#~ msgid "Region:"
-#~ msgstr "Region:"
-
-#~ msgid "City:"
-#~ msgstr "Stad:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-timmar"
-
-#~ msgid "AM/PM"
-#~ msgstr "fm/em"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Välj dina tillägg"
 
@@ -5117,9 +6892,6 @@ msgstr "Stäng"
 #~ msgid "configureButton"
 #~ msgstr "konfigurationsKnapp"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "_Avsluta partitioneringen"
-
 #~ msgid "Id"
 #~ msgstr "Id"
 
diff --git a/anaconda/po/ta.po b/anaconda/po/ta.po
index 9e026de..ded1bdf 100644
--- a/anaconda/po/ta.po
+++ b/anaconda/po/ta.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
@@ -26,11 +26,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/துவக்க கோப்புமுறைமை"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -39,7 +39,7 @@ msgstr ""
 "'%s' ஐக் கொண்டுள்ள RAID தொகுப்புகளில் குறைந்தது பின்வரும் ரெய்டு நிலைகளில் ஒறன்றேனும் "
 "இருக்க வேண்டும்: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -48,7 +48,7 @@ msgstr ""
 "'%s' ஐக் கொண்டுள்ள RAID தொகுப்புகளில் குறைந்தது பின்வரும் மீத்தரவுப் பதிப்புகளில் "
 "ஒறன்றேனும் இருக்க வேண்டும்: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -57,108 +57,129 @@ msgstr ""
 "'%s' ஐக் கொண்டுள்ள RAID தொகுப்புகளில் குறைந்தது பின்வரும் சாதன வகைகளில் ஒறன்றேனும் "
 "இருக்க வேண்டும்: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s இல் பின்வரும் வட்டு லேபிள் வகைகளில் ஒறன்று இருக்க வேண்டும்: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s ஆனது %s வகையாக இருக்க முடியாது."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s களில் ஒன்றில் %s மவுன்ட் செய்யப்பட வேண்டும்."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s இன் அளவு %d மற்றும் %d MB க்கு இடைப்பட்டதாக இருக்க வேண்டும்"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s ஆனது %dMB க்குக் குறைவாக இருக்கக்கூடாது."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s ஆனது %dMB க்கு அதிகமாக இருக்கக்கூடாது."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s ஆனது வட்டின் முதல் %dMB க்குள் இருக்க வேண்டும்."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s ஆனது முதன்மை பிரிவில் இருக்க வேண்டும்."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s ஆனது குறியாக்கம் செய்த தொகுதி சாதனத்தில் இருக்க முடியாது."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s ஆனது %s வகையாக இருக்க முடியாது"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "%s இல் %s கோப்பு முறைமையைப் பயன்படுத்தும் போது %s இல் grub2 க்காக core.img ஐ "
 "உட்பொதிக்க போதிய இடம் இல்லாதிருக்கலாம்"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC துவக்கவும்"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "உரை முறையை பயன்படுத்தவும்"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "கடவுச்சொல் அமைக்கப்பட்டது."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "கடவுச்சொற்கள் பொருந்தவில்லை!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "நீங்கள் ஒரு வலுவற்ற கடவுச்சொல்லை தந்துள்ளீர்கள்: %s.  அதையே பயன்படுத்த முடிந்தது என்பதை "
 "மீண்டும் கிளிக் செய்யவும்."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -166,87 +187,338 @@ msgstr ""
 "மீண்டும் கிளிக் செய்யவும்."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "வலுவற்றது"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "மிதமானது"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "நல்லது"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "வலிமையானது"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "சரி"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "ஆம் (_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "இல்லை (_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"நிறுவல் களஞ்சியத்தை அமைக்கையில் பின்வரும் பிழை ஏற்பட்டது:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"நிறுவலைத் தொடர முடியாது."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"நிறுவல் களஞ்சியத்தை அமைக்கையில் பின்வரும் பிழை ஏற்பட்டது:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"நிறுவலைத் தொடர முடியாது."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"நிறுவலுக்காக குறிக்கப்பட்டுள்ளவற்றில் பின்வரும் மென்பொருள் பிழைகளைக் கொண்டுள்ளன.  உங்கள் "
+"நிறுவல் மூலத்தில் உள்ள ஏதேனும் பிழை\n"
+"இதற்கு காரணமாக இருக்க வாய்ப்புள்ளது.  உங்கள் நிறுவலிலிருந்து நீங்கள் இந்த தொகுப்புகளை "
+"அகற்ற முயற்சிக்கலாம்.\n"
+"உங்கள் நிறுவல் மூலத்தை மாற்றலாம் அல்லது நிறுவியிலிருந்து வெளியேறலாம்."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"உங்கள் வன்பொருளில் சிக்கல் போலத் தெரிந்த ஒரு காரணத்தால் நிறுவல் நிறுத்தப்பட்டது. சரியான "
+"பிழைச் செய்தி:\n"
+"\n"
+"%s.\n"
+"\n"
+" இப்போது நிறுவி நின்றுவிடும்."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"உங்கள் வன்பொருளில் சிக்கல் போலத் தெரிந்த ஒரு காரணத்தால் நிறுவல் நிறுத்தப்பட்டது. சரியான "
+"பிழைச் செய்தி:\n"
+"\n"
+"%s.\n"
+"\n"
+" இப்போது நிறுவி நின்றுவிடும்."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "வன்பொருள் பிழை எதிர்கொண்டது"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"உங்கள் வன்பொருளில் சிக்கல் போலத் தெரிந்த ஒரு காரணத்தால் நிறுவல் நிறுத்தப்பட்டது. சரியான "
+"பிழைச் செய்தி:\n"
+"\n"
+"%s.\n"
+"\n"
+" இப்போது நிறுவி நின்றுவிடும்."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "நிறுவிய கணினியை அமைவாக்கம் செய்கிறது"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "பிணைய அமைவாக்கத்தை எழுதுகிறது"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "பயனர்களை உருவாக்குகிறது"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "நிறுவிய கணினியை அமைவாக்கம் செய்கிறது"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "முன் நிறுவல் உரைகள் இயங்குகிறது"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "நிறுவல் மூலத்தை அமைக்கிறது..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Bootloader ஐ நிறுவுகிறது"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "நிறுவலுக்குப் பிறகான அமைவுப் பணிகளை செய்கிறது"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Bootloader ஐ நிறுவுகிறது"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow சான்றிதழ் %s க்கு பிணையம் தேவை."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -258,30 +530,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s விடுபட்டுள்ளது. ஃபயர்வாலை அமைக்க முடியாது."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s விடுபட்டுள்ளது. ஃபயர்வாலை அமைக்க முடியாது."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "இந்தக் கோப்பு முறைமை லேபிள்களை ஆதரிக்காது."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "குறிப்பிட்ட %s என்ற பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "பிரிவகக் குழுப் பெயர் %s ஏற்கனவே பயன்பாட்டில் உள்ளது. மாற்றங்களைச் சேமிக்கவில்லை."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "முன் நிறுவல் உரைகள் இயங்குகிறது"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "வழங்கி பெயர் இல்லாமலோ அல்லது காலியான சரமாகவோ இருக்கக்கூடாது."
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "புரவலன் பெயர் 255 அல்லது அதற்கு குறைவான எழுத்துக்களை கொண்டிருக்க வேண்டும்."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "புரவலன் பெயர் கண்டிப்பாக 'a-z', 'A-Z' அல்லது '0-9' வரம்பிற்குள் இருக்க வேண்டும்."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -291,55 +855,55 @@ msgstr ""
 "இருக்கலாம், புள்ளிகளுக்கு இடையே ஏதேனும் எழுத்துகள் இருக்க வேண்டும், மேலும் '-' இல் "
 "தொடங்கவோ முடியவோ கூடாது."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "தெரியாதது"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "இணைக்கிறது..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "துண்டிக்கப்படுகிறது..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "வயர்டு (%s) இணைக்கப்பட்டது"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "%s க்கு வயர்லெஸ் முறையில் இணைக்கப்பட்டது"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "இணைக்கப்படவில்லை"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "பிணைய சாதனம் கிடைக்கப்பெறவில்லை"
 
@@ -348,7 +912,12 @@ msgstr "பிணைய சாதனம் கிடைக்கப்பெற
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s INSTALLATION"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "புதிய %s %s நிறுவல்"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "நீங்கள் முடிக்கும் போது  கணினியில் ஏற்றநீக்கத்திற்கு %sஐ இயக்கு."
@@ -361,8 +930,8 @@ msgstr "முடித்த பின் ஷெல்லில் இருந
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "/bin/shஐ செயல்படுத்த முடியவில்லை!  ஷெல்லை துவக்கவில்லை"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "மீட்பு"
 
@@ -409,21 +978,15 @@ msgstr "மீட்க வேண்டிய கணினி"
 msgid "Which device holds the root partition of your installation?"
 msgstr "உங்கள் நிறுவலில் எந்த சாதனம் Root பகிர்வினை கொண்டுள்ளது?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "சரி"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "வெளியேறவும்"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "ஷெல்லிருந்தும் வெளியேறினால் கணினி தானாக மீண்டும் துவங்கும்."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -433,7 +996,7 @@ msgstr ""
 "செய்துள்ளீர்கள். உங்கள் பகிர்வுகளை fsck மற்றும் மவுன்ட் செய்யகூடிய ஷெல்லைப் பெற எண்டர் விசையை "
 "அழுத்தவும். %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -454,7 +1017,7 @@ msgstr ""
 "\n"
 "%(msg)s "
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -467,30 +1030,239 @@ msgstr ""
 "\n"
 "ஷெல்லைப் பெற <return> ஐ அழுத்தவும்."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "நீங்கள் ஏதாவது Linux பகுதிகளை பெற்றிருக்கவில்லையா. மறுதுவக்கப்படுகிறது.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "ஷெல்லிருந்தும் வெளியேறினால் கணினி தானாக மீண்டும் துவங்கும்."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "மீட்பு முறைமை"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "நீங்கள் ஏதாவது Linux பகுதிகளை பெற்றிருக்கவில்லை எனில். திரும்புதல் என்பதை சொடுக்கி ஒரு "
 "ஷெல்லை பெறவும்.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "உங்கள் கணினி %s அடைவின் கீழ் ஏற்றப்பட்டுள்ளது."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "வழக்கமான பிரிவாக்கம்"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "வட்டு"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"உங்கள் கணினியில் உள்ள 'ஸ்வேப்' பகுதியை குறைந்த நினைவகத்தில் இயங்கும் போது உங்கள் இயக்க \n"
+"முறைமை பயன்படுத்துகிறது."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"உங்கள் கணினியில் உள்ள 'பூட்' பகுதியில் தான் உங்கள் இயக்க முறைமையைத் தொடங்கத் \n"
+"தேவைப்படும் கோப்புகள் சேமிக்கப்பட்டுள்ளன."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"உங்கள் கணினியில் உள்ள 'ரூட்' பகுதியில் பிரதான கணினி கோப்புகளும்\n"
+"பயன்பாடுகளும் சேமிக்கபப்டுகின்றன."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"உங்கள் கணினியில் உள்ள 'ஹோம்' பகுதியில் உங்கள் தனிப்பட்ட \n"
+"தரவு அனைத்தும் சேமிக்கப்படுகின்றன."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"BIOS வன்பொருளில் உள்ள GPT-பிரிவாக்கம் செய்யப்பட்ட வட்டுகளிலிருந்து பூட் செய்தலை \n"
+"செயல்படுத்த BIOS பூட் பிரிவாக்கம் தேவைப்படுகிறது."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"சில PPC இயங்குதளங்களில் பூட்லோடர் அமைவாக்கத்தின் பகுதியாக PReP பூட் பிரிவு \n"
+"தேவைப்படும்."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"உங்கள் Root பகிர்வு 250 மெகா பைட்டுகளுக்கு குறைவாக இடம் உள்ளது. எனவே %s ஐ நிறுவ இது "
+"போதாது."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"நீங்கள் Root பகிர்வை வரையறுக்கவில்லை (/), %s நிறுவலைத் தொடர இது அவசியம் தேவையானது."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"இந்த இயங்குதளத்திற்கு பிரத்யேகமாக ஒதுக்கப்பட்ட பிரிவு அல்லது தருக்க பிரிவகத்தில் /boot "
+"தேவை.  உங்களுக்கு /boot பிரிவகம் இருக்க விருப்பம் இல்லாவிட்டால், LVM அல்லாத பிரிவில் "
+"நீங்கள் ஒரு / ஐ இட வேண்டும்."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"உங்கள் %(mount)s  பகிர்வை விட %(size)s மெகாபைட் குறைவாக உள்ளது, ஆகையால் இயல்பான "
+"%(productName)s நிறுவலுக்கு போதாது."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"உங்கள் %(mount)s பிரிவு %(format)s வடிவமைத்தல் செய்ய முடியாத அளவுக்குச் சிறியதாக "
+"உள்ளது (அனுமதிக்கப்படும் அளவு %(minSize)d MB முதல் %(maxSize)d MB வரையாகும்)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"உங்கள் %(mount)s பிரிவு %(format)s வடிவமைத்தல் செய்ய முடியாத அளவுக்கு பெரியதாக "
+"உள்ளது (அனுமதிக்கப்படும் அளவு %(minSize)d MB முதல் %(maxSize)d MB வரையாகும்)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "புதிய சாதனத்தைச் சேர்ப்பது தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "நீங்கள் ஒரு துவக்கக்கூடிய பகிர்வை உருவாக்கவில்லை."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"உங்கள் BIOS-அடிப்படையிலான கணினிக்கு %s வின் புதிய வட்டு லேபிள் வடிவத்தில் (GPT) பூட் "
+"ஆக ஒரு சிறப்புப் பிரிவு தேவை. தொடர, ஒரு 1MB 'BIOS Boot' வகை பிரிவை உருவாக்கவும்."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"நீங்கள் ஒரு இடமாற்று பிரிவைக் குறிப்பிடவில்லை.  இடமாற்றுப் பிரிவு இல்லாமல் நிறுவலைத் "
+"தொடர %(requiredMem)s MB நினைவகம் தேவைப்படுகிறது, அனால் உங்களிடம் %(installedMem)s "
+"MB மட்டுமே உள்ளது."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"நீங்கள் ஒரு இடமாற்று பகிர்தலை குறிப்பிடவில்லை. இது எல்லா சமயங்களிலும் அவசியமாக "
+"தேவையில்லை எனினும், இது பெரும்பாலான நிறுவல்களில் செயல்பாட்டை மேம்படுத்த உதவும்."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"உங்கள் இடமாற்று சாதனங்களில் ஒன்றில் UUID இல்லை, mkswap இன் பழைய பதிப்புகளைக் கொண்டு ஸ்வேப் "
+"இடங்களை உருவாக்கினால் இது நிகழ்வது சகஜம். இந்த சாதனங்கள் /etc/fstab இல் உள்ள சாதனப் "
+"பாதையால் குறிக்கப்படும், வெவ்வேறு சூழ்நிலைகளில் சாதனப் பாதைகள் மாறக்கூடும் என்பதால் இதை "
+"நிலையான ஒன்றாகக் கருத முடியாது. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "இந்த ஏறும் புள்ளி தவறானது.  %s இந்த அடைவு / கோப்பு கணினியில் இருக்கும்."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "ஏற்றப்புள்ளி \"%s\" ஒரு லினக்ஸ் கோப்பு முறைமையாக இருக்க வேண்டும்."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "கடவுவாக்கியம்:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -601,53 +1373,138 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "வழங்கப்பட்ட VNC கடவுச்சொல்லில் குறைந்தபட்சம் 6 எழுத்துகள் இல்லை.\n"
 "புதிதாக ஒன்றை உள்ளிடவும்.  கடவுச்சொல் வேண்டாம் என்றால் காலியாக விடவும்."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "நிறுவல் மூலத்தை அமைப்பதில் தோல்வி"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "தொகுப்பு மீத்தரவைப் பதிவிறக்கம் செய்வதில் பிழை..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "நிறுவல் மூலம் கிடைக்கவில்லை"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "மென்பொருளை நிறுவுகிறது"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "தொகுப்பு நிறுவல் செயலை துவக்குகிறது"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "பின்வரும் கோப்பு முறைமைகளைக்கு அதிக இடம் தேவைப்படுகிறது:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "நிறுவும் மூலத்திலிருந்து மாற்றத்திற்கு தயாராகிறது..."
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "நிறுவுகிறது"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "தொகுப்பு மீத்தரவைப் பதிவிறக்கம் செய்கிறது..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "நிறுவுகிறது"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "நிறுவுவதற்கு தயாராகிறது"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "சேமிப்பக அமைவாக்கத்தை சோதிக்கிறது..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "DEFAULT TITLE"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "LOCALIZATION"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "LOCALIZATION"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "SOFTWARE"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "SYSTEM"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "USER SETTINGS"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -656,34 +1513,102 @@ msgstr ""
 "கோப்புமுறைமைகளில் தற்போதைய மென்பொருள் தெரிவுக்கு போதிய இடம் இல்லை.கூடுதலாக %s "
 "தேவைப்படுகிறது."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "நிறுவல் ஹப்"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "தானியக்க நிறுவலைத் தொடங்குகிறது"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "கட்டளை வரி முறையை பயன்படுத்தும்போது கேள்விகள் எதுவும் இருக்காது!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+"  தொடர மேலுள்ளவற்றிலிருந்து ஒன்றைத் தேர்வு செய்யவும் [வெளியேற - 'q'|தொடர - 'c']: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "தொடரும் முன்பு அனைத்து ஸ்போக்கையும் முடிக்கவும்"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "முன்னிருப்பு HUB தலைப்பு"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "தொடரும் முன்பு அனைத்து ஸ்போக்கையும் முடிக்கவும்"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "பிழை"
 
@@ -707,25 +1632,28 @@ msgstr "ஆம்"
 msgid "no"
 msgstr "இல்லை"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "நிச்சயம் நீங்கள் வெளியேற வேண்டுமா?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
@@ -733,7 +1661,7 @@ msgid ""
 msgstr ""
 "  தொடர மேலுள்ளவற்றிலிருந்து ஒன்றைத் தேர்வு செய்யவும் [வெளியேற - 'q'|தொடர - 'c']: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -747,220 +1675,259 @@ msgstr ""
 "உங்கள் கணினியில் X ஐ துவக்க முடியவில்லை.  VNC யை துவக்கி இந்த கணினியை வேறு "
 "கணினியுடன் இணைத்து, ஒரு வரைகலை நிறுவல் அல்லதுஉரை முறை நிறுவலை தொடர வேண்டுமா?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC கடவுச்சொல்"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "VNC கடவுச்ச்சொல்லை வழங்கவும். அதை இரு முறை தட்டச்சு செய்ய வேண்டும். \n"
 "கடவுச்சொல் வேண்டாம் என்றால் காலியாக விடவும்"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "கடவுச்சொல்:"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "கடவுச்சொல்(உறுதிசெய்): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "கடவுச்சொற்கள் பொருந்தவில்லை!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "கடவுச்சொல் குறைந்தது 6  எழுத்துக்களைக் கொண்டிருக்க வேண்டும்."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "கடவுச்சொல் குறைந்தது 6  எழுத்துக்களைக் கொண்டிருக்க வேண்டும்."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "நேர மண்டல அமைப்புகள்"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "நேர மண்டலம் அமைக்கப்படவில்லை."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "கிடைக்கும் பகுதிகள்"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "கிடைக்கும் பகுதிகள்"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "பிணைய அமைவாக்கத்தை எழுதுகிறது"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "வயர்டு (%s) இணைக்கப்பட்டது"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "வயர்டு (%s) இணைக்கப்பட்டது"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "வழங்கி பெயர்:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "வழங்கி பெயர்"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "வழங்கி பெயர்"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "வழங்கி பெயர் செல்லுபடியானதல்ல: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "அமைவாக்கத்தை முடி (_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "நுழைவாயில்"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "filesystem ஒரு வகையை விட்டுள்ளது"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "நிறுவிய கணினியை அமைவாக்கம் செய்கிறது"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "ரூட் கடவுச்சொல்:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "கடவுச்சொல் அமைக்கப்பட்டது."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "ரூட் கணக்கு முடக்கப்பட்டது."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "கடவுச்சொல் அமைக்கப்படவில்லை."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 "புதிய ரூட் கடவுச்சொல்லைத் தேர்ந்தெடுக்கவும். அதை நீங்கள் இரு முறை தட்டச்சு செய்ய வேண்டும்."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "கடவுச்சொல்:"
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "அனைத்து இடத்தையும் பயன்படுத்து"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "இருக்கும் Linux கணினி(களை) இடமாற்றவும்"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "காலி இடத்தைப் பயன்படுத்து"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "நிறுவல் இலக்கு"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "வட்டுகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "சேமிப்பக அமைவாக்கத்தை சோதிக்கும் போது பிழை"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "சேமிப்பக அமைவாக்கத்தை சோதிக்கும் போது பிழை"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "தானியக்க பிரிவாக்கம் தேர்ந்தெடுக்கப்பட்டது"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "தனிப்பயன் பிரிவாக்கம் தேர்ந்தெடுக்கப்பட்டது"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -968,40 +1935,62 @@ msgstr ""
 "வட்டுகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை. நிறுவலை முடிக்க கணினியை இயக்கம் நிறுத்திவிட்டு "
 "குறைந்தது ஒரு வட்டையாவது இணைத்து கணினியை மறுதொடக்கம் செய்யவும்."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "வட்டுகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை; நிறுவுவதற்கு குறைந்தது ஒரு வட்டையேனும் "
 "தேர்ந்தெடுக்கவும்."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "சேமிப்பகத்தை ஆய்வு செய்கிறது..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "தேர்ந்தெடுக்கவும் (_S)"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "புதுப்பிக்கப்பட்ட சேமிப்பக அமைவாக்கத்தை உருவாக்குகிறது"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "சேமிப்பக அமைவாக்கம் தோல்வியுற்றது: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "சேமிப்பக அமைவாக்கத்தை சோதிக்கிறது..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "தானியக்க பிரிவாக்க விருப்பங்கள்"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1010,41 +1999,41 @@ msgstr ""
 "நிறுவலுக்கு உங்கள் வன் வட்டு இயக்கியை பிரிவாக்கம் செய்ய வேண்டியது அவசியமாகிறது. நிறுவல் "
 "இலக்குக்கு எந்த அளவு இடத்தைப் பயன்படுத்த வேண்டும் எனத் தேர்ந்தெடுக்கவும்."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "பிரிவாக்க திட்டவடிவ அமைவாக்கம்"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "பிரிவாக்க திட்டவடிவ அமைவாக்கம்"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "நேர மண்டல அமைப்புகள்"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s நேர மண்டலம்"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "நேர மண்டலம் அமைக்கப்படவில்லை."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "பகுதி %s இல் கிடைக்கக்கூடிய நேர மண்டலங்கள்"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "கிடைக்கும் பகுதிகள்"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1053,178 +2042,196 @@ msgstr ""
 "எண்களைப் பயபடுத்தவும் அல்லது நேரடியாக பெயர்களைத் தட்டச்சு செய்யவும் [பகுதிகள் பட்டியலுக்கு "
 "- b, வெளியேற - q]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC துவக்கவும்"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "நிறுவல் நிலை"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "நெருக்கமான கண்ணாடி"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS சேவையகம் %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "மென்பொருள் மூலத்தை அமைப்பதில் பிழை"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "இணைக்கிறது..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD இயக்கி"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO கோப்பு (_I):"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "பிணைய நேரம்"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "நிறுவல் மூலம் கிடைக்கவில்லை"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "நிறுவல் மூலத்தை அமைப்பதில் தோல்வி"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "தொகுப்பு மீத்தரவைப் பதிவிறக்கம் செய்வதில் பிழை..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "நிறுவல் மூலம் கிடைக்கவில்லை"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS சேவையகம் %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS மவுன்ட் விருப்பங்கள்:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "நிறுவல் மூலத்தை அமைப்பதில் தோல்வி, தொகுப்பதிவகத்தின் url ஐ சரிபார்க்கவும்"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "சாதனம் /துவக்கத்தை கொண்டுள்ளது"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "நிறுவல் மூலத்தை அமைப்பதில் தோல்வி"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "மென்பொருள் தேர்வை மாற்றியமை (_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "மென்பொருள் சார்புத்தொகுதிகளை சோதிப்பதில் பிழை"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "நிறுவல் மூலம் அமைக்கப்படவில்லை"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "மூலம் மாறியுள்ளது - சரிபார்க்கவும்"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "தனிப்பயன் மென்பொருள் தேர்ந்தெடுக்கப்பட்டது"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "நிறுவல் மூலம் அமைக்கப்படவில்லை"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "உங்கள் சூழலைத் தேர்வுசெய்யவும்"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "அங்கீகரிப்பைப் பயன்படுத்து (_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "ஒரு கடவுச்சொல்லை வழங்கி உறுதிப்படுத்த வேண்டும்."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "எச்சரிக்கை"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1240,36 +2247,36 @@ msgstr "செயலில் உள்ளது"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tநிறுவல் முடிந்தது.  எண்டர் விசையை அழுத்தி வெளியேறவும்"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "முன்னிருப்பு ஸ்போக் தலைப்பு"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "நிலையை சோதிக்கிறது..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "புதிய சாதனம்"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "கடவுச்சொல்(உறுதிசெய்): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1278,7 +2285,7 @@ msgstr ""
 "நீங்கள் ஒரு வலுவற்ற கடவுச்சொல்லை தந்துள்ளீர்கள்: %s.  அதையே பயன்படுத்த முடிந்தது என்பதை "
 "மீண்டும் கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1287,63 +2294,47 @@ msgstr ""
 "நீங்கள் ஒரு வலுவற்ற கடவுச்சொல்லை தந்துள்ளீர்கள்: %s.  அதையே பயன்படுத்த முடிந்தது என்பதை "
 "மீண்டும் கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "கடவுச்சொல் அமைக்கப்பட்டது."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "நிறுவியை விட்டு வெளியேறு (_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "உதவி"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "வெளியேறு (_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "இல்லை (_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "ஆம் (_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "DEFAULT TITLE"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "LOCALIZATION"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "LOCALIZATION"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "SOFTWARE"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "SYSTEM"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "USER SETTINGS"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
@@ -1351,7 +2342,11 @@ msgstr ""
 "அடுத்த படிக்குச் செல்லும் முன்பு, இந்தக் குறி கொண்டு குறிக்கப்பட்டுள்ள உருப்படிகளை "
 "முடிக்கவும்."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "முடிந்தது!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1360,169 +2355,67 @@ msgstr ""
 "உங்கள் கணினியில் %s வெற்றிகரமாக நிறுவப்பட்டு இப்போது\n"
 "பயன்படுத்த தயாராக உள்ளது!  இன்னும் ஏன் தயக்கம்! அதைப் பயன்படுத்த மறுதொடக்கம் செய்யவும்!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "முடிந்தது!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "புதிய %s %s நிறுவல்"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"உங்கள் கணினியில் %s வெற்றிகரமாக நிறுவப்பட்டது, ஆனால் இன்னும் சில அமைவாக்கங்களைச் செய்து "
+"முடிக்க வேண்டியுள்ளது. \n"
+"அவற்றை முடித்துவிட்டு, பிறகு அமைவாக்கத்தை முடி என்ற பொத்தானை கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"உங்கள் கணினியில் %s வெற்றிகரமாக நிறுவப்பட்டு இப்போது\n"
+"பயன்படுத்த தயாராக உள்ளது!  இன்னும் ஏன் தயக்கம்! அதைப் பயன்படுத்த மறுதொடக்கம் செய்யவும்!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "புதிய பிரிவகக் குழுவை உருவாக்கு ..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.py:109
+msgid "Device reconfiguration failed. Click for details."
+msgstr "சாதன மறு அமைவாக்கம் தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"உங்கள் பிரிவகக் குழுவுக்கு ஒரு பெயரை உருவாக்கி கீழே உள்ள ஒரு வட்டையேனும் "
-"தேர்ந்தெடுக்கவும்."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "பிரிவகக் குழு:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "நெடுவரிசை"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
+#: pyanaconda/ui/gui/spokes/custom.py:111
 msgid ""
 "Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 "சரிசெய்ய முடியாத ஒரு பிழையின் காரணமாக சேமிப்பக அமைவாக்கம் மீட்டமைக்கப்பட்டது. "
 "விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:108
-msgid "Device reconfiguration failed. Click for details."
-msgstr "சாதன மறு அமைவாக்கம் தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
-
-#: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "ஒரு சரியான மவுன்ட் புள்ளியை உள்ளிடவும்."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "அந்த மவுன்ட் புள்ளி சரியானதல்ல. வேறொன்றை முயற்சிக்கிறீர்களா?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "அந்த மவுன்ட் புள்ளி ஏற்கனவே பயன்பாட்டில் உள்ளது. வேறொன்றை முயற்சிக்கிறீர்களா?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
-msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-"நீங்கள் தேர்ந்தெடுத்த RAID நிலைக்கு நீங்கள் தேர்ந்தெடுத்துள்ளதைக் காட்டிலும் அதிக வட்டுகள் தேவை."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "ஒரு சரியான மவுன்ட் புள்ளியை உள்ளிடவும்."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "அந்த மவுன்ட் புள்ளி சரியானதல்ல. வேறொன்றை முயற்சிக்கிறீர்களா?"
-
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "வழக்கமான பிரிவாக்கம்"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "வட்டு"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "எதுவுமில்லை"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "%s ரூட்டில் உள்ள அனைத்து கோப்புமுறைமைகளையும் கூட நீக்கவும்."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "நிச்சயமாக %s இல் உள்ள தரவு அனைத்தையும் நீக்க விரும்புகிறீர்களா?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "நிச்சயமாக %s இல் உள்ள தரவு அனைத்தையும் நீக்க விரும்புகிறீர்களா?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "MANUAL PARTITIONING"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "%d சேமிப்பக சாதனம் தேர்ந்தெடுக்கப்பட்டது"
 msgstr[1] "%d சேமிப்பக சாதனங்கள் தேர்ந்தெடுக்கப்பட்டன"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1531,131 +2424,112 @@ msgstr ""
 "நீங்கள் உங்கள் %s %s நிறுவலுக்காக மவுன்ட் புள்ளிகளை உருவாக்கும் போது,\n"
 "இங்கு நீங்கள் அவற்றின் விவரங்களைக் காண முடியும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"உங்கள் கணினியில் உள்ள 'ஸ்வேப்' பகுதியை குறைந்த நினைவகத்தில் இயங்கும் போது உங்கள் இயக்க \n"
-"முறைமை பயன்படுத்துகிறது."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"உங்கள் கணினியில் உள்ள 'பூட்' பகுதியில் தான் உங்கள் இயக்க முறைமையைத் தொடங்கத் \n"
-"தேவைப்படும் கோப்புகள் சேமிக்கப்பட்டுள்ளன."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"உங்கள் கணினியில் உள்ள 'ரூட்' பகுதியில் பிரதான கணினி கோப்புகளும்\n"
-"பயன்பாடுகளும் சேமிக்கபப்டுகின்றன."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"உங்கள் கணினியில் உள்ள 'ஹோம்' பகுதியில் உங்கள் தனிப்பட்ட \n"
-"தரவு அனைத்தும் சேமிக்கப்படுகின்றன."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"BIOS வன்பொருளில் உள்ள GPT-பிரிவாக்கம் செய்யப்பட்ட வட்டுகளிலிருந்து பூட் செய்தலை \n"
-"செயல்படுத்த BIOS பூட் பிரிவாக்கம் தேவைப்படுகிறது."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"சில PPC இயங்குதளங்களில் பூட்லோடர் அமைவாக்கத்தின் பகுதியாக PReP பூட் பிரிவு \n"
-"தேவைப்படும்."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi ஆனது %s வகை சாதனத்திலேயே இருக்க வேண்டும்"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s ஆனது %s வகை சாதனத்திலேயே இருக்க வேண்டும்"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s ஐ குறியாக்கம் செய்ய முடியாது"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "நீங்கள் மூல சாதனத்தில் ஒரு புதிய கோப்பு முறைமையை உருவாக்க வேண்டும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "%s வகை சாதனங்களுக்கு ஒரு செல்லுபடியான RAID நிலை தேர்வு அவசியம்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "சாதன அறுஅளவிடல் கோரிக்கை தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "சாதன மறுவடிவமைப்பு கோரிக்கை தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "குறிப்பிட்ட %s என்ற பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "இந்தக் கோப்பு முறைமை லேபிள்களை ஆதரிக்காது."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "வட்டுகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "கோப்பு முறைமை மறுஅளவிடப்படாது போகக்கூடும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "சேமிப்பக அமைவாக்கத்தை சரிபார்ப்பதில் பிழை.  விவரங்களுக்கு கிளிக் செய்யவும்."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "சேமிப்பக அமைவாக்கத்தை சரிபார்ப்பதில் பிழை.  விவரங்களுக்கு கிளிக் செய்யவும்."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "முன்பே உள்ள கன்டெய்னர் %s இல் புதிய %s சேர்க்கப்பட்டது."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "புதிய சாதனத்தைச் சேர்ப்பது தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "செல்லுபடியாகாத பிரிவாக்க அளவு அமைக்கப்பட்டுள்ளது. செல்லுபடியான ஒரு முழு எண்ணைப் "
 "பயன்படுத்தவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "சாதன அகற்றல் கோரிக்கை தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "பிரிவகக் குழுப் பெயர் %s ஏற்கனவே பயன்பாட்டில் உள்ளது. மாற்றங்களைச் சேமிக்கவில்லை."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs காலி"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1664,7 +2538,7 @@ msgstr ""
 "இந்த மென்பொருள் RAID அணிவரிசையில் %d இல் %d உறுப்பினர் பிரிவாக்கங்கள் விடுபட்டுள்ளன. "
 "நீங்கள் இதை நீக்கலாம் அல்லது வேறு சாதனத்தைத் தேர்ந்தெடுக்கலாம்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1673,291 +2547,145 @@ msgstr ""
 "இந்த LVM தொகுப்பு குழுவில் %d இல் %d உண்மை தொகுப்புகள் விடுபட்டுள்ளன. நீங்கள் இதை நீக்கலாம் "
 "அல்லது வேறு சாதனத்தைத் தேர்ந்தெடுக்கலாம்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "வட்டுகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "தேர்ந்தெடுத்த வட்டுகளில் போதிய காலி இடம் இல்லை."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "தானியக்க பிரிவாக்கம் தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "மென்பொருள் தேர்வை மாற்றியமை (_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "குறியாக்கம் செய்யப்பட்ட தொகுப்பு சாதனங்களை விடுவித்தல் தோல்வி. விவரங்களுக்கு கிளிக் "
 "செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"உங்கள் புதிய %(productName)s நிறுவலுக்காக கைமுறையாக கோப்புமுறைமைகளை அமைக்கத் தேர்வு "
-"செய்துள்ளீர்கள். நீங்கள் தொடங்கும் முன்பு, எது எது எப்படி என்று கற்க சில நிமிடங்கள் நீங்கள் "
-"ஒதுக்க விரும்பக்கூடும். சிறிது மாற்றம் ஏற்பட்டுள்ளது.\n"
-"\n"
-"புதிய கோப்புமுறைமைகளின் உருவாக்கம் சீரியக்கமாக்கப்பட்டது தான் மிக முக்கியமான மாற்றமாகும். "
-"இனி நீங்கள் நிலைகளில் LVM லாஜிக்கல் பிரிவகங்கள் போன்ற (உண்மை பிரிவகம், பிரிவகக் குழு, "
-"லாஜிக்கல் பிரிவகம்) சிக்கலான சாதனங்களை கட்டமைக்க வேண்டியதில்லை -- இப்போது நீங்கள் லாஜிக்கல் "
-"பிரிவகத்தை மட்டும் உருவாக்கினால் போதும், அதைக் கொண்டிருக்கத் தேவையான உண்மை "
-"பிரிவகங்களையும் பிரிவகக் குழுக்களையும் அமைக்கும் வேலையை நாங்கள் பார்த்துக்கொள்வோம். நீங்கள் "
-"லாஜிக்கல் பிரிவகங்களைச் சேர்க்கையில், நீக்குகையில், மறுஅளவு செய்கையில் பிரிவகக் குழுவை "
-"சரிசெய்யும் வேலையை நாங்கள் பார்த்துக்கொள்கிறோம், இனி நீங்கள் அவற்றைப் பற்றிய விவரங்களைப் "
-"பற்றியெல்லாம் கவலைப்பட வேண்டியதில்லை.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "DATE & TIME"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "தவறான நேரமண்டலம்"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "நீங்கள் NTP ஐப் பயன்படுத்த விரும்பினால் முதலில் நெட்வொர்க்கிங்கை அமைக்க வேண்டும்"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "உங்களிடம் இயங்கும் NTP சேவையகம் அமைவாக்கம் செய்யப்பட்டில்லை"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "INSTALLATION DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "%d சேமிப்பக சாதனம் தேர்ந்தெடுக்கப்பட்டது"
+msgstr[1] "%d சேமிப்பக சாதனங்கள் தேர்ந்தெடுக்கப்பட்டன"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "லேயவுட்டுகளிடையே மாற %s ஐப் பயன்படுத்தவும்."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "KEYBOARD"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "உங்கள் லேயவுட்டுகள் அமைவாக்கத்தை சோதிக்கும் வசதி கிடைக்கவில்லை."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "நிலையை சோதிக்கிறது..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "லேயவுட் மாறுதல் அமைவாக்கம் செய்யப்படவில்லை."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "LANGUAGE"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "நிலை தெரியவில்லை (விடுபட்டுள்ளது)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "தெரியாத நிலை"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "நிர்வகிக்கப்படாதது"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "கிடைக்கவில்லை"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "சாதன நிரல் விடுபட்டுள்ளது"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "கேபிள் துண்டிக்கப்பட்டது"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "கிடைக்கவில்லை"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "துண்டிக்கப்பட்டது"
@@ -1982,153 +2710,169 @@ msgstr "துண்டிக்கப்படுகிறது"
 msgid "Connection failed"
 msgstr "இணைப்பு தோல்வியுற்றது"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "துண்டிக்கப்பட்டது"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "ஈத்தர்நெட்"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "வயர்லெஸ்"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "துண்டிக்கப்பட்டது"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 முகவரி"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 முகவரி"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP முகவரி"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "என்டர்ப்ரைஸ்"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "எதுவுமில்லை"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "அங்கீகரிப்பு தேவை"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "கடவுச்சொல்:"
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT PASSWORD"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "கடவுச்சொல் அமைக்கப்பட்டது."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "ரூட் கடவுச்சொல் அமைக்கப்பட்டது"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "ரூட் கணக்கு முடக்கப்பட்டது"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "ரூட் கடவுச்சொல் அமைக்கப்படவில்லை"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "SOFTWARE SELECTION"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "மென்பொருள் சார்புத்தொகுதிகளை சோதிக்கிறது..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Error checking software dependencies"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "தொகுப்பு மீத்தரவைப் பதிவிறக்கம் செய்கிறது..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "குழு மீத்தரவைப் பதிவிறக்கம் செய்கிறது..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "மென்பொருள் சார்புத்தொகுதிகளை சோதிக்கிறது..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Error checking software dependencies"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "மென்பொருள் சார்புத்தொகுதிகளை சோதிப்பதில் தோல்வி. விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "நிறுவலுக்காக குறிக்கப்பட்டுள்ளவற்றில் பின்வரும் மென்பொருள் பிழைகளைக் கொண்டுள்ளன.  உங்கள் "
 "நிறுவல் மூலத்தில் உள்ள ஏதேனும் பிழை\n"
@@ -2136,46 +2880,77 @@ msgstr ""
 "அகற்ற முயற்சிக்கலாம்.\n"
 "உங்கள் நிறுவல் மூலத்தை மாற்றலாம் அல்லது நிறுவியிலிருந்து வெளியேறலாம்."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "ரத்து (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "மென்பொருள் மூலத்தை மாற்றியமை (_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "மென்பொருள் தேர்வை மாற்றியமை (_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "நிறுவல் மூலத்தை அமைக்கிறது..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "தொகுப்பு மீத்தரவைப் பதிவிறக்கம் செய்வதில் பிழை..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "அங்கீகரிப்பு தேவை"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "இந்த ஊடகம் சிறந்தது, இதிலிருந்து நிறுவலாம்."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "இந்த ஊடகம் இதிலிருந்து நிறுவ சிறந்ததல்ல."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "INSTALLATION SOURCE"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "நிறுவல் மூலத்தை அமைப்பதில் தோல்வி, தொகுப்பதிவகத்தின் url ஐ சரிபார்க்கவும்"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "தொகுபதிவகத்தை அமைப்பதில் பிழை"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "மென்பொருள் மூலத்தை அமைப்பதில் பிழை"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2183,98 +2958,80 @@ msgstr ""
 "நிறுவல் மூலத்தை அமைப்பதில் தோல்வி, தொகுப்பதிவகத்தின் url மற்றும் பதிலி அமைப்புகளை "
 "சரிபார்க்கவும்"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "தொகுபதிவகத்தை அமைப்பதில் பிழை"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "மென்பொருள் மூலத்தை அமைப்பதில் பிழை"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "சாதனம்:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS சேவையகம் %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "தவறான நேரமண்டலம்"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "தவறான நேரமண்டலம்"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "தவறான நேரமண்டலம்"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "காத்திருக்கவும்... மென்பொருள் மீத்தரவு ஏற்றப்படுகிறது."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "நீங்கள் தேர்ந்தெடுத்த வட்டுகளில் உள்ள காலி இடம் பின்வருமாறு:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "காத்திருக்கவும்... மென்பொருள் மீத்தரவு ஏற்றப்படுகிறது."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2285,7 +3042,7 @@ msgstr ""
 "சுருக்குவதன் மூலம் அல்லது அகற்றுவதன் மூலம் இடத்தைப் பெற \n"
 "நாங்கள் உங்களுக்கு உதவ முடியும்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2296,7 +3053,7 @@ msgstr ""
 "b>\n"
 "ஐ நிறுவ போதிய இடம் இல்லை."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2310,42 +3067,49 @@ msgstr ""
 "<b>%s</b> இன் சிறிய பதிப்பை நிறுவும் வகையில் உங்கள் மென்பொருள் தேர்வை மாற்றியமைக்கலாம் "
 "அல்லது நிறுவியிலிருந்து வெளியேறலாம்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "INSTALLATION DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "சேமிப்பக அமைவாக்கத்தை சேமிக்கிறது..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "சேமிப்பக அமைவாக்கத்தை சேமிப்பதில் தோல்வி..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD சாதனத்தை வடிவமைக்கிறது"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "சேமிப்பக அமைவாக்கத்தை சரிபார்ப்பதில் பிழை.  விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "சேமிப்பக அமைவாக்கத்தை சரிபார்ப்பதில் பிழை.  விவரங்களுக்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs காலி"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "%d வட்டு தேர்ந்தெடுக்கப்பட்டது; %s கொள்ளளவு; %s காலி"
 msgstr[1] "%d வட்டுகள் தேர்ந்தெடுக்கப்பட்டன; %s கொள்ளளவு; %s காலி"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2353,7 +3117,11 @@ msgstr ""
 "நீங்கள் பூட்லோடர் நிறுவலைத் தவிர்க்கத் தேர்வு செய்துள்ளீர்கள்.  உங்கள் கணினி பூட் செய்ய "
 "முடியாது போகக்கூடும்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2363,11 +3131,19 @@ msgstr ""
 "உங்கள் சேமிப்பக லேயவுட்டை மாற்றியமைக்கலாம்\n"
 "அல்லது நிறுவியிலிருந்து வெளியேறலாம்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "சேமிப்பக லேயவுட்டை மாற்றியமை (_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2378,76 +3154,80 @@ msgstr ""
 "உங்கள் சேமிப்பக லேயவுட்டை மாற்றியமைக்கலாம்\n"
 "அல்லது நிறுவியிலிருந்து வெளியேறலாம்."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "சரி"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "USER SETTINGS"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "தவறான நேரமண்டலம்"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "%s %s க்கு வரவேற்கிறோம்."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "DATA"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "நீங்கள் இன்னும் உங்கள் %s %s நிறுவலுக்கான மவுன்ட் புள்ளிகளை உருவாக்கவில்லை:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "அவற்றை தானாகவே உருவாக்க இங்கு கிளிக் செய்யவும்."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "அல்லது, '+' சின்னத்தைக் கொண்டு கீழே புதிய மவுன்ட் புள்ளிகளை உருவாக்கவும்."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2461,55 +3241,162 @@ msgstr[1] ""
 "<b>%d வட்டுகள்; %s கொள்ளளவு; %s காலி இடம்</b> (பிரிவாக்கப்படாத மற்றும் "
 "கோப்புமுறைமைகளில்)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "Bootloader ஐ நிறுவ வேண்டாம் (_D)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "பூட் சாதனமாக அமை (_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"நீங்கள் தேர்ந்தெடுத்த RAID நிலைக்கு நீங்கள் தேர்ந்தெடுத்துள்ளதைக் காட்டிலும் அதிக வட்டுகள் தேவை."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"உங்கள் பிரிவகக் குழுவுக்கு ஒரு பெயரை உருவாக்கி கீழே உள்ள ஒரு வட்டையேனும் "
+"தேர்ந்தெடுக்கவும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "பிரிவகக் குழு:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "நெடுவரிசை"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "ஏற்றப்புள்ளி \"%s\" ஒரு லினக்ஸ் கோப்பு முறைமையாக இருக்க வேண்டும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "அந்த மவுன்ட் புள்ளி ஏற்கனவே பயன்பாட்டில் உள்ளது. வேறொன்றை முயற்சிக்கிறீர்களா?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "ஒரு சரியான மவுன்ட் புள்ளியை உள்ளிடவும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "அந்த மவுன்ட் புள்ளி சரியானதல்ல. வேறொன்றை முயற்சிக்கிறீர்களா?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "%s ரூட்டில் உள்ள அனைத்து கோப்புமுறைமைகளையும் கூட நீக்கவும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "நிச்சயமாக %s இல் உள்ள தரவு அனைத்தையும் நீக்க விரும்புகிறீர்களா?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "நிச்சயமாக %s இல் உள்ள தரவு அனைத்தையும் நீக்க விரும்புகிறீர்களா?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "தவறான நேரமண்டலம்"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "நீங்கள் ஒரு வலுவற்ற கடவுவாக்கியத்தைத் தந்துள்ளீர்கள்: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "கடவுவாக்கியங்கள் பொருந்தவில்லை."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "வைத்திரு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "சுருக்கு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "நீக்கு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "இந்த சாதனத்தில் நிறுவல் மூலம் உள்ளது."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr " %(device)s -இல் %(type)s ஐ உருவாக்குகிறது"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "தயாராக இல்லை"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "காலி இடத்தைப் பயன்படுத்து"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2522,14 +3409,14 @@ msgstr ""
 "அகற்றலாம்.  ஒரு கோப்புமுறைமையை அகற்றினால் அதில் உள்ள அனைத்து தரவும் நிரந்தரமாக "
 "இழக்கப்படும்."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2537,353 +3424,762 @@ msgid_plural ""
 msgstr[0] "<b>%s வட்டு; %s மீட்டுப் பெறக்கூடிய இடம்</b> (கோப்புமுறைமைகளில்)"
 msgstr[1] "<b>%s வட்டுகள்; %s மீட்டுப் பெறக்கூடிய இடம்</b> (கோப்புமுறைமைகளில்)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "மீட்டுப் பெற தேர்ந்தெடுக்கப்பட்ட மொத்த இடம்: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "நீக்கு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "வைத்திரு"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "விநியோக நிறுவல்"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "அழைக்கும் பெயர்"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "வெளியீட்டுக்கு முந்தைய / சோதனைக்கான"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "புதிய சாதனம்"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "புதிய தேர்வி"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "முடிந்தது (_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "தொடரவும் (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "மாற்றங்களை செயல்படுத்து (_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "NETWORK CONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "குழு பெயர்"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "சரி"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "DATE & TIME"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "NTP சேவையகங்களைச் சேர்த்து பயன்பாட்டுக்காகக் குறிக்கவும்"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "இணைய சேவையகம்"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "பணிபுரிகிறது"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "பயன்படுத்து"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "அமைவாக்கம் செய் (_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "DATE & TIME"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "பகுதி:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "பகுதி:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "நகரம்:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "நகரம்:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "பிணைய பெயர் (_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "பிணைய பெயர்"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-மணி"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "INSTALLATION DESTINATION"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "கொள்ளளவு"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "இணைக்கப்படவில்லை"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "தேர்ந்தெடுத்த சாதனம்"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>லேபிள்:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "சாதன நிரல் விடுபட்டுள்ளது"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "இல்லை (_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN வகை"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "தேர்ந்தெடுத்த சாதனம்"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "சுருக்கம்"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID சாதனங்கள்"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "சேர்க்கவும் (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "முன்னிருப்பு வழி:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "சப்நெட் மாஸ்க்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "வேகம்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "வன்பொருள் முகவரி"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "அமைவாக்கம் செய் (_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "பாதுகாப்பு"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "பிணைய பெயர் (_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "பிணைய பெயர்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "பாதுகாப்பு விசை"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "ஹாட்ஸ்பாட்டாகப் பயன்படுத்தவும்... (_U)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "ஹாட்ஸ்பாட்டை நிறுத்து... (_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "அமைவாக்கம் செய் (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "வழங்குநர்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "அமைவாக்கம் செய் (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN வகை"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "நுழைவாயில்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "குழு பெயர்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "குழு கடவுச்சொல்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "பயனர்பெயர்"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "அமைவாக்கம் செய் (_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "முறை (_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "அமைவாக்க URL (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP பதிலி (_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS பதிலி (_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP பதிலி (_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "சாக்ஸ்  வழங்கி (_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "பிணைய அமைவாக்கத்தை எழுதுகிறது"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "விடுவி"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "விமானப் பயன்முறை (_p)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "பிணைய அமைவாக்கத்தை எழுதுகிறது"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "வழங்கி பெயர்:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "NETWORK CONFIGURATION"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2892,282 +4188,204 @@ msgstr ""
 "உங்கள் இருப்பிடம் பற்றிய தகவலைப் பெற்று உங்கள் மென்பொருள்\n"
 "புதுப்பிப்புகள் உங்களுக்குக் கிடைக்கச் செய்ய எங்களுக்கு பிணைய அணுகல் தேவை."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "முன்னிருப்பு வழி:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "சப்நெட் மாஸ்க்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "வேகம்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "வன்பொருள் முகவரி"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "அமைவாக்கம் செய் (_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "பாதுகாப்பு"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "பிணைய பெயர் (_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "பிணைய பெயர்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "பாதுகாப்பு விசை"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "ஹாட்ஸ்பாட்டாகப் பயன்படுத்தவும்... (_U)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "ஹாட்ஸ்பாட்டை நிறுத்து... (_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "அமைவாக்கம் செய் (_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "வழங்குநர்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN வகை"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "நுழைவாயில்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "குழு பெயர்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "குழு கடவுச்சொல்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "பயனர்பெயர்"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "முறை (_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "அமைவாக்க URL (_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP பதிலி (_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS பதிலி (_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP பதிலி (_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "சாக்ஸ்  வழங்கி (_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "விடுவி"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "விமானப் பயன்முறை (_p)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "வழங்கி பெயர்:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "அங்கீகரிப்பைப் பயன்படுத்து (_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "அங்கீகரிப்பு தேவை"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "இணைக்கப்பட்டது"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "SOFTWARE SELECTION"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "உங்கள் சூழலைத் தேர்வுசெய்யவும்"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "நெடுவரிசை"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "ரத்து செய்துவிட்டு & மேலும் வட்டுகளைச் சேர் (_a)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "INSTALLATION OPTIONS"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>பிரிவாக்க வகை:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "என் தரவை குறியாக்கம் செய். பிறகு கடவுவாக்கியம் அமைப்பேன்."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "தனிப்பயன் பிரிவாக்கம் தேர்ந்தெடுக்கப்பட்டது"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "இடத்தை மீட்டுப் பெறு (_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "INSTALLATION OPTIONS"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "இங்கு நடப்பு மென்பொருள் தேர்வுக்கு எவ்வளவு இடம் தேவை என விவரிக்கிறோம்."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "வட்டு காலி"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "பயன்படுத்த உள்ள காலி இடம்."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs காலி"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "காலி இடம் இல்லை, ஆனால் இப்போதுள்ள பிரிவாக்கங்களில் இருந்து மீட்டுப்பெற முடியும்."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "இங்கு உங்களுக்கு என்னென்ன விருப்பங்கள் உள்ளன என விவரிக்கிறோம்."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "காலி இடத்தைப் பயன்படுத்து"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "நிறுவியிலிருந்து வெளியேறு (_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "சாதன விளக்கம்"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "கணினியில் உள்ள நிலையான வட்டுகள்"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "பிரிவாக்கத்தை முடி (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "குறியாக்கம் (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "தானியக்க பிரிவாக்கம் தேர்ந்தெடுக்கப்பட்டது"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "பிரிவாக்கத்தை முடி (_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "குறியாக்கம் (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "என் தரவை குறியாக்கம் செய். பிறகு கடவுவாக்கியம் அமைப்பேன்."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "தானியக்க பிரிவாக்க விருப்பங்கள்"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "சுருக்கம்"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "முழு வட்டு சுருக்கம் மற்றும் விருப்பங்கள்..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ADD A KEYBOARD LAYOUT"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "நீங்கள் கீழே உள்ள ஒரு விசைப்பலகை லேயவுட்டைத் தேர்ந்தெடுத்து அதைச் சேர்க்கலாம்:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "பெயர்"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "KEYBOARD LAYOUT"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3176,7 +4394,7 @@ msgstr ""
 "நீங்கள் ஒரு லேயவுட்டை முன்னிருப்பு லேயவுட்டாகப் பயன்படுத்த விரும்பினால், அதை இந்தப் "
 "பட்டியலின் மேல் பகுதிக்கு நகர்த்தினால் போதும்."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3184,355 +4402,485 @@ msgstr ""
 "இந்த மாற்றங்கள் நிறுவப்பட்ட கணினிகளுக்கு மட்டுமே பொருந்தும். நிறுவல் செயலாக்கத்திற்கான "
 "விசைப்பலகையை அமைவாக்கம் செய்ய டெஸ்க்டாப்பின் கருவியைப் பயன்படுத்தவும்."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "பெயர்"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "லேயவுட்டைச் சேர்"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "லேயவுட்டை நீக்கு"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "தேர்ந்தெடுத்த ஒரு லேயவுட்டை மேலே நகர்த்து"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "லேயவுட்டைச் சேர்"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "லேயவுட்டை நீக்கு"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "தேர்ந்தெடுத்த ஒரு லேயவுட்டை மேலே நகர்த்து"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "தேர்ந்தெடுத்த ஒரு லேயவுட்டை கீழே நகர்த்து"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "லேயவுட்டை மாதிரிக்காட்சி காட்டு"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "உங்கள் லேயவுட்டுகள் அமைவாக்கத்தை சோதிக்கும் வசதி கிடைக்கவில்லை."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "லேயவுட்டுகளிடையே மாற்ற Alt + Shift ஐ அழுத்தவும்."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "விருப்பங்கள் (_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "சேர்க்கவும் (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ADD A KEYBOARD LAYOUT"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "நீங்கள் கீழே உள்ள ஒரு விசைப்பலகை லேயவுட்டைத் தேர்ந்தெடுத்து அதைச் சேர்க்கலாம்:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "பெயர்"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "கிடைக்கும் பகுதிகள்"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "லேயவுட்டைச் சேர்"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "சரி"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "லேயவுட் மாறுதல் விருப்பங்கள்"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "விசைப்பலகை லேயவுட்டுகளை ஒன்றிலிருந்து ஒன்றுக்கு மாற்ற நீங்கள் எந்த விசைச் சேர்க்கைகளைப் "
 "பயன்படுத்த விரும்புகிறீர்கள்?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "பயன்"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "விளக்கம்"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS மவுன்ட் விருப்பங்கள்:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "LANGUAGE"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT PASSWORD"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "ரூட் கடவுச்சொல்:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "உறுதிப்படுத்தவும்:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC கடவுச்சொல்"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "ரூட் கடவுச்சொல்லை அமை"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 "Root கணக்கு கணினியை நிர்வாகிக்க பயன்படும்.  ரூட் பயனருக்கான ஒரு கடவுச்சொல்லை உள்ளிடவும்."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "முடிந்தது (_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "ஊடக சரிபார்ப்பு"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "ஊடகத்தை சரிபார்க்கிறது, காத்திருக்கவும்..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "சேர்க்கவும் (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "சரி"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP பதிலியை செயல்படுத்து (_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>பதிலி URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>எடுத்துக்காட்டு:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "அங்கீகரிப்பைப் பயன்படுத்து (_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>பயனர்பெயர்</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "பயனர்பெயர்"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>கடவுச்சொல்</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "கடவுச்சொல்:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "INSTALLATION SOURCE"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "எந்த நிறுவல் மூலத்தைப் பயன்படுத்த விரும்புகிறீர்கள்?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "தானாக கண்டறியப்பட்ட நிறுவல் ஊடகம் (_A):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "சாதனம்:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>லேபிள்:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "சரிபார் (_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO கோப்பு (_I):"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "சாதனம்:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "ஒரு ISO வை தேர்வு செய்யவும் (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "பிணையத்தில்: (_n)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "பதிலி அமைவு (_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "இந்த URL ஒரு மிரர் பட்டியலைக் குறிக்கிறது (_m)."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS மவுன்ட் விருப்பங்கள்:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "இந்தப் புலம் கட்டாயமல்ல."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora மக்கள் தொகுப்பதிவகங்கள்"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "புதிய மவுன்ட்புள்ளியைச் சேர்."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "சேர்க்கவும் (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "தேர்ந்தெடுத்த மவுன்ட் புள்ளிகளை நீக்கு."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "நீக்கு (_R)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "செயல்பாட்டுப் பிழை."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ரூட் கடவுச்சொல்லை அமை"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "இந்த URL ஒரு மிரர் பட்டியலைக் குறிக்கிறது (_m)."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "பெயர்:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>பதிலி URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "பயனர்பெயர்"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "கடவுச்சொல்:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "அந்த மவுன்ட் புள்ளி சரியானதல்ல. வேறொன்றை முயற்சிக்கிறீர்களா?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "இங்கிருந்து வெளியேறு (_G)!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "என்ன ஆனாலும் பரவாயில்லை (_I)."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "இது நிலையற்ற, வெளியீட்டுக்கு முந்தைய மென்பொருள்."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3544,204 +4892,264 @@ msgstr ""
 "பிரச்சனையோடுதான் வாழ வேண்டும். எதிர்காலத்தில் முழுமையடையும் இந்த OS நீங்கள் நம்பிப் "
 "பயன்படுத்த நிலையான OS அல்ல.  இது சோதனை நோக்கங்களுக்காக மட்டுமே ஆனது."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "%s %s க்கு வரவேற்கிறோம்."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "நிறுவலின் போது நீங்கள் பயன்படுத்த விரும்பும் மொழி என்ன?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "தொடரவும் (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "பயனர்பெயர்"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "குழு பெயர்"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "கடவுச்சொல்:"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC கடவுச்சொல்"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "மவுன்ட் புள்ளியைச் சேர் (_A)"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>விரும்பும் கொள்ளளவு:</b>"
+msgid "Add a new mount point."
+msgstr "புதிய மவுன்ட்புள்ளியைச் சேர்."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>மவுன்ட் புள்ளி:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "சேர்க்கவும் (_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "புதிய மவுன்ட் புள்ளியைச் சேர்"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"கீழே உள்ள மவுன்ட் புள்ளியை உருவாக்கிய பிறகு\n"
-"கூடுதல் தனிப்பயனாக்க விருப்பங்கள் கிடைக்கும்."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"அந்த மவுன்ட் புள்ளி ஏற்கனவே பயன்பாட்டில் உள்ளது.\n"
-"வேறொன்றை முயற்சிக்கிறீர்களா?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "எ.கா: \"20 GB\", \"500mb\" (மேற்கோள் குறிகளை விட்டுவிடவும்)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "நீக்கு (_D)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "சேமி (_S)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "CONFIGURE MOUNT POINT"
+msgid "Remove the selected mount point(s)."
+msgstr "தேர்ந்தெடுத்த மவுன்ட் புள்ளிகளை நீக்கு."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"உங்கள் பிரிவகக் குழுவுக்கு ஒரு பெயரை உருவாக்கி கீழே உள்ள ஒரு வட்டையேனும் "
-"தேர்ந்தெடுக்கவும்."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "நீக்கு (_R)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "வெற்று"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID சாதனங்கள்"
+msgid "Reload storage configuration from disk."
+msgstr "சேமிப்பக அமைவாக்கம் தோல்வியுற்றது: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "குறியாக்கம் (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "தேர்ந்தெடுத்த சாதனம்"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "சாதன விளக்கம்"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>மவுன்ட் புள்ளி:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>விரும்பும் கொள்ளளவு:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>லேபிள்:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>சாதன வகை:</b>"
+msgid "Device(s):"
+msgstr "சாதனம்:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>கோப்பு முறைமை:</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "குறியாக்கம் (_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "மீண்டும் வடிவமை"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "பிரிவகக் குழு:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "மாற்றியமை ..."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "பெயர்:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>சாதன வகை:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "குறியாக்கம் (_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "கோப்பு முறைமை"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "மீண்டும் வடிவமை"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "பிரிவகக் குழு:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "மாற்றியமை ..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "RAID சாதனங்கள்"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3749,17 +5157,19 @@ msgstr ""
 "இந்த சாதனம் குறியாக்கம் செய்யப்பட்டது, இதை சரியான கடவுவாக்கியமின்றி படிக்க முடியாது. "
 "கீழே அதை நீங்கள் விடுவித்தாக வேண்டும்."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "கடவுவாக்கியம்:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "விடுவி (_U)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3767,295 +5177,572 @@ msgstr ""
 "இந்த சாதனத்தை நேரடியாக திருத்த முடியாது. நீங்காள் அதை நீக்கலாம் அல்லது வேறு சாதனத்தைத் "
 "தேர்ந்தெடுக்கலாம்."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "புதிய மவுன்ட்புள்ளியைச் சேர்."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "தேர்ந்தெடுத்த மவுன்ட் புள்ளிகளை நீக்கு."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "தேர்ந்தெடுத்த மவுன்ட் புள்ளியை அமைவாக்கம் செய்."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "அமைவாக்கம் செய் (_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "சேமிப்பக அமைவாக்கம் தோல்வியுற்றது: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "உதவிக்கு கிளிக் செய்யவும்"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "உதவி"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">கிடைக்கக்கூடிய இடம்</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">மொத்த இடம்</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "தேர்ந்தெடுக்கவும் (_S)"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "CONFIGURE MOUNT POINT"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "Select one or more disks this device may reside on."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "சரி"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP முகவரி"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "ஒரு  iSCSI துவக்கி பெயரை கொடுக்க வேண்டும்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "அங்கீகரிப்பைப் பயன்படுத்து (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>எடுத்துக்காட்டு:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "பயனர்பெயர்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "VNC கடவுச்சொல்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "பயனர்பெயர்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC கடவுச்சொல்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "பயனர்பெயர்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "VNC கடவுச்சொல்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "பிணைய பெயர்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "அங்கீகரிப்பைப் பயன்படுத்து (_U)"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "பயனர்பெயர்"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC கடவுச்சொல்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "பயனர்பெயர்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC கடவுச்சொல்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "பயனர்பெயர்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC கடவுச்சொல்"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "இணைப்பு தோல்வியுற்றது"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "சரி"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "சாதனம்:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "தேர்ந்தெடுத்த வட்டுகள்"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "மூடு (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "பூட்"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "விளக்கம்"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "வெற்று"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "நீக்கு (_R)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "வட்டு பற்றிய விவரச் சுருக்கம் இதோ"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "நீக்கு (_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "தேர்ந்தெடுக்கவும் (_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "CONFIGURE MOUNT POINT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "Select one or more disks this device may reside on."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "மவுன்ட் புள்ளியைச் சேர் (_A)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>விரும்பும் கொள்ளளவு:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>மவுன்ட் புள்ளி:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "புதிய மவுன்ட் புள்ளியைச் சேர்"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"கீழே உள்ள மவுன்ட் புள்ளியை உருவாக்கிய பிறகு\n"
+"கூடுதல் தனிப்பயனாக்க விருப்பங்கள் கிடைக்கும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"அந்த மவுன்ட் புள்ளி ஏற்கனவே பயன்பாட்டில் உள்ளது.\n"
+"வேறொன்றை முயற்சிக்கிறீர்களா?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "எ.கா: \"20 GB\", \"500mb\" (மேற்கோள் குறிகளை விட்டுவிடவும்)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "சேமி (_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "CONFIGURE MOUNT POINT"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"உங்கள் பிரிவகக் குழுவுக்கு ஒரு பெயரை உருவாக்கி கீழே உள்ள ஒரு வட்டையேனும் "
+"தேர்ந்தெடுக்கவும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "பெயர்:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID சாதனங்கள்"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "குறியாக்கம் (_E)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "ஒரு சரியான மவுன்ட் புள்ளியை உள்ளிடவும்."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "சரி"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD சாதனத்தை வடிவமைக்கிறது"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "நிறுவலின் போது ஏதோ தெரியாத பிழை நேர்ந்தது.  கீழே விவரம் கொடுக்கப்பட்டுள்ளது."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "வட்டு குறியாக்க கடவுவாக்கியம்"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "கடவுவாக்கியத்தைச் சேமி"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "வட்டு குறியாக்க கடவுவாக்கியம்"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4064,7 +5751,19 @@ msgstr ""
 "உங்கள் தரவில் சிலவற்றை குறியாக்கம் செய்ய தேர்வு செய்துள்ளீர்கள். கணினியைத் துவக்கும் போது "
 "உங்கள் தரவை அணுக பயன்படுத்த வேண்டிய ஒரு கடவுவாக்கியத்தை உருவாக்க வேண்டும்."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "கடவுவாக்கியம்:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "உறுதிப்படுத்தவும்:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4074,117 +5773,172 @@ msgstr ""
 "லேயவுட்டை மாற்றினால், நிறுவலுக்குப் பிறகு உங்கள் வட்டை நீங்கள் குறியீடுநீக்கம் செய்ய "
 "முடியாது."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "வட்டு இடத்தை மீட்டுப் பெறு"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "சரி"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "இடத்தை மீட்டுப் பெறு (_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "வட்டு இடத்தை மீட்டுப் பெறு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "விளக்கம் இங்குள்ளது."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "கோப்பு முறைமை"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "மீட்டுப் பெறக்கூடிய இடம்"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "செயல்"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "வைத்திரு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "நீக்கு"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "சுருக்கு"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "தனிப்பயன் பிரிவாக்கம் தேர்ந்தெடுக்கப்பட்டது"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "மாற்றங்களை செயல்படுத்து (_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "சாதனம்:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "மவுன்ட் புள்ளியைச் சேர் (_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "நிறுவியை விட்டு வெளியேறு (_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "இல்லை (_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "ஆம் (_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4192,51 +5946,50 @@ msgstr ""
 "நிச்சயமாக நிறுவல்\n"
 "செயலாக்கத்திலிருந்து வெளியேற விரும்புகிறீர்களா?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "வெளியேறு (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "INSTALLATION SUMMARY"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "நிறுவலைத் தொடங்கு (_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "CONFIGURATION"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "நிறுவுவதற்கு தயாராகிறது"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"உங்கள் கணினியில் %s வெற்றிகரமாக நிறுவப்பட்டது, ஆனால் இன்னும் சில அமைவாக்கங்களைச் செய்து "
-"முடிக்க வேண்டியுள்ளது. \n"
-"அவற்றை முடித்துவிட்டு, பிறகு அமைவாக்கத்தை முடி என்ற பொத்தானை கிளிக் செய்யவும்."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "அமைவாக்கத்தை முடி (_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"உங்கள் கணினியில் %s வெற்றிகரமாக நிறுவப்பட்டு இப்போது\n"
-"பயன்படுத்த தயாராக உள்ளது!  இன்னும் ஏன் தயக்கம்! அதைப் பயன்படுத்த மறுதொடக்கம் செய்யவும்!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "மறு துவக்கு (_R)"
 
@@ -4252,16 +6005,16 @@ msgstr "நிறுவுதல்"
 msgid "Install the live CD to your hard disk"
 msgstr "உங்கள் நிலைவட்டில் நேரடி குறுவட்டை நிறுவவும்"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "வன் இயக்கியில் நிறுவல் துவங்குகிறது"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Fedora க்கு வரவேற்கிறோம்"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4270,25 +6023,26 @@ msgstr ""
 "நிறுவுவதற்கு %s ஆனது %s MB தேவைப்படுகிறது, ஆனால் இந்த கணினியில் நீங்கள் %s MB மட்டுமே "
 "கொண்டுள்ளீர்கள்.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "The %s graphical installer requires %s MB of memory, but you only have %s MB."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "ராம் இடம் இல்லை"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4302,24 +6056,24 @@ msgstr ""
 "\n"
 "கட்டளையைப் பயன்படுத்தி உரை பயன்முறை நிறுவியைப் பயன்படுத்த முயற்சிக்கவும்."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "உரை முறைமையை துவக்குகிறது."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "பிழை"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY மாறி அமைக்கப்படவில்லை. உரை முறையை துவக்குகிறது."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "வரைகலை நிறுவல் இல்லை. உரை முறையை துவக்குகிறது."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4330,20 +6084,20 @@ msgstr ""
 "பகிர்வு அமைப்பு அல்லது தொகுப்பு தேர்ந்தெடுத்தலை குறிக்க அனுமதிக்கும். நீங்கள் VNC "
 "பயன்முறையை பயன்படுத்த வேண்டுமா?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "நிறுவலைத் தொடங்க ssh install@%s ஐப் பயன்படுத்தவும்."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "நிறுவலைத் தொடர ssh install@<host> ஐப் பயன்படுத்தவும்."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Fedora வை முயற்சித்துப் பாருங்கள்"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4353,7 +6107,7 @@ msgstr ""
 "இப்போது நீங்கள் Fedora வை நிறுவலாம் அல்லது பிறகு எப்போது விரும்பினாலும் செயல்பாடுகள் "
 "மேலோட்டத்திலிருந்து \"வன் வட்டு இயக்கிக்கு நிறுவவும்\" என்பதைத் தேர்வு செய்து நிறுவலாம்."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4362,10 +6116,290 @@ msgstr ""
 "\"\n"
 "என்பதைத் தேர்வு செய்து நிறுவலாம்."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "மூடு"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "புரவலன் பெயர் கண்டிப்பாக 'a-z', 'A-Z' அல்லது '0-9' வரம்பிற்குள் இருக்க வேண்டும்."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "பின்வரும் கோப்பு முறைமைகளைக்கு அதிக இடம் தேவைப்படுகிறது:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "கட்டளை வரி முறையை பயன்படுத்தும்போது கேள்விகள் எதுவும் இருக்காது!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "அந்த மவுன்ட் புள்ளி சரியானதல்ல. வேறொன்றை முயற்சிக்கிறீர்களா?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "உங்கள் புதிய %(productName)s நிறுவலுக்காக கைமுறையாக கோப்புமுறைமைகளை அமைக்கத் "
+#~ "தேர்வு செய்துள்ளீர்கள். நீங்கள் தொடங்கும் முன்பு, எது எது எப்படி என்று கற்க சில நிமிடங்கள் "
+#~ "நீங்கள் ஒதுக்க விரும்பக்கூடும். சிறிது மாற்றம் ஏற்பட்டுள்ளது.\n"
+#~ "\n"
+#~ "புதிய கோப்புமுறைமைகளின் உருவாக்கம் சீரியக்கமாக்கப்பட்டது தான் மிக முக்கியமான "
+#~ "மாற்றமாகும். இனி நீங்கள் நிலைகளில் LVM லாஜிக்கல் பிரிவகங்கள் போன்ற (உண்மை பிரிவகம், "
+#~ "பிரிவகக் குழு, லாஜிக்கல் பிரிவகம்) சிக்கலான சாதனங்களை கட்டமைக்க வேண்டியதில்லை -- "
+#~ "இப்போது நீங்கள் லாஜிக்கல் பிரிவகத்தை மட்டும் உருவாக்கினால் போதும், அதைக் கொண்டிருக்கத் "
+#~ "தேவையான உண்மை பிரிவகங்களையும் பிரிவகக் குழுக்களையும் அமைக்கும் வேலையை நாங்கள் "
+#~ "பார்த்துக்கொள்வோம். நீங்கள் லாஜிக்கல் பிரிவகங்களைச் சேர்க்கையில், நீக்குகையில், மறுஅளவு "
+#~ "செய்கையில் பிரிவகக் குழுவை சரிசெய்யும் வேலையை நாங்கள் பார்த்துக்கொள்கிறோம், இனி நீங்கள் "
+#~ "அவற்றைப் பற்றிய விவரங்களைப் பற்றியெல்லாம் கவலைப்பட வேண்டியதில்லை.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "NETWORK CONFIGURATION"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "தொகுப்பு மீத்தரவைப் பதிவிறக்கம் செய்வதில் பிழை..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "சாதன நிரல் விடுபட்டுள்ளது"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "அங்கீகரிப்பு தேவை"
+
+#~ msgid "column"
+#~ msgstr "நெடுவரிசை"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>பிரிவாக்க வகை:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>பதிலி URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>பயனர்பெயர்</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>கடவுச்சொல்</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "அந்த மவுன்ட் புள்ளி சரியானதல்ல. வேறொன்றை முயற்சிக்கிறீர்களா?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>லேபிள்:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>கோப்பு முறைமை:</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID சாதனங்கள்"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "தேர்ந்தெடுத்த மவுன்ட் புள்ளியை அமைவாக்கம் செய்."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "உதவிக்கு கிளிக் செய்யவும்"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">கிடைக்கக்கூடிய இடம்</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">மொத்த இடம்</span>"
+
 #~ msgid "Completed"
 #~ msgstr "முடிந்தது"
 
@@ -4417,41 +6451,9 @@ msgstr "மூடு"
 #~ msgid "Install on System"
 #~ msgstr "கணினியில் நிறுவவும்"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "நிறுவல் களஞ்சியத்தை அமைக்கையில் பின்வரும் பிழை ஏற்பட்டது:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "நிறுவலைத் தொடர முடியாது."
-
 #~ msgid "Exit installer"
 #~ msgstr "நிறுவி விட்டு வெளியேறுதல்"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "உங்கள் வன்பொருளில் சிக்கல் போலத் தெரிந்த ஒரு காரணத்தால் நிறுவல் நிறுத்தப்பட்டது. சரியான "
-#~ "பிழைச் செய்தி:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " இப்போது நிறுவி நின்றுவிடும்."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "வன்பொருள் பிழை எதிர்கொண்டது"
-
 #~ msgid "_Exit installer"
 #~ msgstr "நிறுவி விட்டு வெளியேறு (_E)"
 
@@ -4744,9 +6746,6 @@ msgstr "மூடு"
 #~ msgid "Software Development"
 #~ msgstr "மென்பொருள் உருவாக்கம்"
 
-#~ msgid "Web Server"
-#~ msgstr "இணைய சேவையகம்"
-
 #~ msgid "Minimal"
 #~ msgstr "குறிநைபட்ச"
 
@@ -4790,49 +6789,6 @@ msgstr "மூடு"
 #~ "முடியாது:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "நீங்கள் Root பகிர்வை வரையறுக்கவில்லை (/), %s நிறுவலைத் தொடர இது அவசியம் தேவையானது."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "உங்கள் Root பகிர்வு 250 மெகா பைட்டுகளுக்கு குறைவாக இடம் உள்ளது. எனவே %s ஐ நிறுவ "
-#~ "இது போதாது."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "இந்த இயங்குதளத்திற்கு பிரத்யேகமாக ஒதுக்கப்பட்ட பிரிவு அல்லது தருக்க பிரிவகத்தில் /"
-#~ "boot தேவை.  உங்களுக்கு /boot பிரிவகம் இருக்க விருப்பம் இல்லாவிட்டால், LVM அல்லாத "
-#~ "பிரிவில் நீங்கள் ஒரு / ஐ இட வேண்டும்."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "உங்கள் %(mount)s  பகிர்வை விட %(size)s மெகாபைட் குறைவாக உள்ளது, ஆகையால் இயல்பான "
-#~ "%(productName)s நிறுவலுக்கு போதாது."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "உங்கள் %(mount)s பிரிவு %(format)s வடிவமைத்தல் செய்ய முடியாத அளவுக்குச் சிறியதாக "
-#~ "உள்ளது (அனுமதிக்கப்படும் அளவு %(minSize)d MB முதல் %(maxSize)d MB வரையாகும்)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "உங்கள் %(mount)s பிரிவு %(format)s வடிவமைத்தல் செய்ய முடியாத அளவுக்கு பெரியதாக "
-#~ "உள்ளது (அனுமதிக்கப்படும் அளவு %(minSize)d MB முதல் %(maxSize)d MB வரையாகும்)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4849,54 +6805,6 @@ msgstr "மூடு"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "நீங்கள் bootloader stage1 இலக்கு சாதனத்தை உருவாக்கவில்லை"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "நீங்கள் ஒரு துவக்கக்கூடிய பகிர்வை உருவாக்கவில்லை."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "உங்கள் BIOS-அடிப்படையிலான கணினிக்கு %s வின் புதிய வட்டு லேபிள் வடிவத்தில் (GPT) "
-#~ "பூட் ஆக ஒரு சிறப்புப் பிரிவு தேவை. தொடர, ஒரு 1MB 'BIOS Boot' வகை பிரிவை "
-#~ "உருவாக்கவும்."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "நீங்கள் ஒரு இடமாற்று பிரிவைக் குறிப்பிடவில்லை.  இடமாற்றுப் பிரிவு இல்லாமல் நிறுவலைத் "
-#~ "தொடர %(requiredMem)s MB நினைவகம் தேவைப்படுகிறது, அனால் உங்களிடம் "
-#~ "%(installedMem)s MB மட்டுமே உள்ளது."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "நீங்கள் ஒரு இடமாற்று பகிர்தலை குறிப்பிடவில்லை. இது எல்லா சமயங்களிலும் அவசியமாக "
-#~ "தேவையில்லை எனினும், இது பெரும்பாலான நிறுவல்களில் செயல்பாட்டை மேம்படுத்த உதவும்."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "உங்கள் இடமாற்று சாதனங்களில் ஒன்றில் UUID இல்லை, mkswap இன் பழைய பதிப்புகளைக் கொண்டு "
-#~ "ஸ்வேப் இடங்களை உருவாக்கினால் இது நிகழ்வது சகஜம். இந்த சாதனங்கள் /etc/fstab இல் உள்ள "
-#~ "சாதனப் பாதையால் குறிக்கப்படும், வெவ்வேறு சூழ்நிலைகளில் சாதனப் பாதைகள் மாறக்கூடும் "
-#~ "என்பதால் இதை நிலையான ஒன்றாகக் கருத முடியாது. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "இந்த ஏறும் புள்ளி தவறானது.  %s இந்த அடைவு / கோப்பு கணினியில் இருக்கும்."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "ஏற்றப்புள்ளி \"%s\" ஒரு லினக்ஸ் கோப்பு முறைமையாக இருக்க வேண்டும்."
-
 #~ msgid "Linux on %s"
 #~ msgstr "%s இல் Linux"
 
@@ -4906,11 +6814,6 @@ msgstr "மூடு"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s for %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD சாதனத்தை வடிவமைக்கிறது"
-#~ msgstr[1] "DASD சாதனங்களை வடிவமைக்கிறது"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "%d DASD சாதனமானது Linux உடன் பயன்படுத்த தயாராகிறது..."
@@ -5179,9 +7082,6 @@ msgstr "மூடு"
 #~ msgid "Error setting root password"
 #~ msgstr "ரூட் கடவுச்சொல்லை அமைப்பதில் பிழை"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "ஒரு கடவுச்சொல்லை வழங்கி உறுதிப்படுத்த வேண்டும்."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "தொகுப்புகளை நீக்கு (_R)"
 
@@ -5216,24 +7116,12 @@ msgstr "மூடு"
 #~ msgid "%s of %s"
 #~ msgstr "%s இல் %s"
 
-#~ msgid "Region:"
-#~ msgstr "பகுதி:"
-
-#~ msgid "City:"
-#~ msgstr "நகரம்:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-மணி"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "உங்கள் துணை நிரல்களைத் தேர்வு செய்யவும்"
 
@@ -5322,9 +7210,6 @@ msgstr "மூடு"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "பிரிவாக்கத்தை முடி (_F)"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "CONFIGURE VOLUME GROUP"
 
diff --git a/anaconda/po/te.po b/anaconda/po/te.po
index e81910e..2e83c45 100644
--- a/anaconda/po/te.po
+++ b/anaconda/po/te.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/"
@@ -22,211 +22,472 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot ఫైల్‌సిస్టమ్"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "'%s' కలిగివున్న RAID సమితిలు కింది వాటిలో వొక raid స్థాయి కలిగివుండాలి: %s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr "'%s' కలిగివున్న RAID సమితులు కింది మెటాడాటా వర్షన్లలో వొకదానిని కలిగివుండాలి: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "'%s' కలిగివున్న RAID సమితులు కింది పరికర రకాలలో వొకటి కలిగివుండాలి: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s తప్పక కింది డిస్కులేబుల్ రకాలలో వొకటి కలిగివుండాలి: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s అనునది %s రకముది కాలేదు."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s అనునది తప్పక పరిమాణంలో %d మరియు %d MB మద్యవుండాలి"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s అనునది %dMB కన్నా చిన్నది కాకూడదు."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s అనునది %dMB కన్నా పెద్దది కాకూడదు."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s అనునది తప్పక డిస్కు యొక్క మొదటి %dMB లోపల వుండవలెను."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s అనునది యెన్క్రిప్టెడ్ బ్లాక్ పరికరంపై వుండలేదు."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s అనునది %s రకముది కాలేదు"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNCని ప్రారంభించు"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "పాఠ్య రీతిని ఉపయోగించు"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "సరే"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"సంస్థాపనా రిపోజిటరీను అమర్చునప్పుడు కింది దోషము యెదురైంది:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"సంస్థాపన కొనసాగలేదు."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"సంస్థాపనా రిపోజిటరీను అమర్చునప్పుడు కింది దోషము యెదురైంది:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"సంస్థాపన కొనసాగలేదు."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"మీ హార్డువేరు నందలి సమస్య కారణంగా సంస్థాపన అనునది ఆపివేయబడింది. ఖచ్చితమైన దోష సందేశం:\n"
+"\n"
+"%s.\n"
+"\n"
+"సంస్థాపకి యిప్పుడు అంతమగును."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"మీ హార్డువేరు నందలి సమస్య కారణంగా సంస్థాపన అనునది ఆపివేయబడింది. ఖచ్చితమైన దోష సందేశం:\n"
+"\n"
+"%s.\n"
+"\n"
+"సంస్థాపకి యిప్పుడు అంతమగును."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "హోర్డువేర్ దోషము యెదురైంది"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"మీ హార్డువేరు నందలి సమస్య కారణంగా సంస్థాపన అనునది ఆపివేయబడింది. ఖచ్చితమైన దోష సందేశం:\n"
+"\n"
+"%s.\n"
+"\n"
+"సంస్థాపకి యిప్పుడు అంతమగును."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr ""
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "ముందస్తు-సంస్థాపనా స్క్రిప్టులు నడుస్తున్నాయి"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "సంస్థాపనా కార్యక్రమమును ప్రారంభించుచున్నది"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "సంస్థాపన-అనంతరం ఆకృతీకరణను జరుపుచున్నది"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -238,86 +499,377 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "ముందస్తు-సంస్థాపనా స్క్రిప్టులు నడుస్తున్నాయి"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "హోస్టునామము తప్పక 255 లేదా తక్కువ అక్షరాల పొడవు కలిగి ఉండాలి."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"హోస్టునామము తప్పక 'a-z, 'A-Z', లేదా '0-9' పరిధిలమధ్యలో వొక విలువైన అక్షరముతో ప్రారంభమవ్వాలి"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -326,7 +878,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s సంస్థాపన"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "మీరు ముగించగానే సిస్టమ్ అన్‌మౌంట్ కావుటకు %s నడుపుము."
@@ -339,8 +896,8 @@ msgstr "పూర్తయ్యిన తర్వాత దయచేసి మ
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "నిర్వర్తించుటకు /bin/sh కనుగొనలేక పోయింది! షెల్‌ను ప్రారంభించుటలేదు"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "పరిరక్షించు"
 
@@ -378,21 +935,15 @@ msgstr "కంప్యూటరు పరిరక్షణకు"
 msgid "Which device holds the root partition of your installation?"
 msgstr "మీ సంస్థాపన యొక్క root విభజనను ఏ పరికరము కలిగివుంటుంది?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "సరే"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "బయటకు"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "షెల్‌నుండీ మీరు బయటకి వచ్చినప్పుడు కంప్యూటరు స్వయంచాలకంగా పునఃప్రారంభించబడుతుంది."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -401,7 +952,7 @@ msgstr ""
 "మీ కంప్యూటరు మరల్పుకు వీలుకాని చాలా చెడ్డ ఫైళ్ల వ్యవస్థని కలిగి ఉంది.  fsck మరియూ మీ విభజనలను "
 "మరల్చగల షెల్‌ని పొందటానికి returnని నొక్కండి. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -422,7 +973,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -435,28 +986,214 @@ msgstr ""
 "\n"
 "షెల్ పొందుటకు <return> వత్తుము."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "మీరు ఏ లైనక్సు విభజనలను కలిగిలేరు.  పునఃప్రారంభిస్తోంది.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "మీరు షెల్ నుండి నిష్క్రమించగానే సిస్టమ్ స్వయంచాలకంగా పునఃప్రారంభించబడును.c"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "పరిరక్షణ రీతి"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "మీరు ఏ లైనక్సు విభజనలను కలిగిలేరు.  షెల్ ను పొందుటకు return నొక్కుము.%st"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "మీ కంప్యూటరు %s డైరెక్టరీ కింద ఉంది."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "మీ మూల(root) విభజన 250 మెగాబైట్లకన్నా తక్కువగా ఉంది. ఇది సంస్థాపనకు చాలా తక్కువైంది.%s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "%s సంస్థాపన కొనసాగింపుకి అవసరమైన, root విభజన (/)ను మీరు నిర్వచించలేదు."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"కేటాయించిన విభజన లేదా లాజికల్ వాల్యూమ్ పైన యీ ప్లాట్‌ఫాంనకు /boot అవసరం. మీకు /boot వాల్యూమ్ అక్కరలేక "
+"పోతే, కేటాయించిన నాన్-LVM విభజనపై మీరు తప్పక / వుంచాలి."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"మీ %(mount)s విభజన %(size)s మెగాబైట్లకంటె తక్కువ ఉంది. %(productName)s సాధారణ సంస్థాపనకు "
+"తక్కువ మద్దతిచ్చేది."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(format)s ఫార్మేటింగ్‌కు మీరు %(mount)s విభజన చాలా చిన్నది (అనుమతించదగు పరిమాణం %(minSize)d "
+"MB నుండి %(maxSize)d MB వరకు)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"%(format)s ఫార్మేటింగ్‌కు మీరు %(mount)s విభజన చాలా పెద్దది (అనుమతించదగు పరిమాణం %(minSize)d "
+"MB నుండి %(maxSize)d MB వరకు)"
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "మీరు బూటబుల్ విభజనను సృష్టించలేదు."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"మీరు స్వాప్ విభజనను తెలుపలేదు. swap విభజన లేకుండా సంస్థాపనను కొనసాగించుటకు మీకు "
+"%(requiredMem)s MB మెమొరీ కావలెను, కాని మీరు %(installedMem)s MB మాత్రమే కలిగివున్నారు."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"మీరు swap విభజనను తెలుపలేదు.  అన్ని సమయాలలోనూ తప్పక అవసరంకాకపోవచ్చు, ఇది ఎక్కువ సంస్థాపనలకు "
+"గుర్తించదగ్గ పాత్రని కలిగి ఉంది."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"మీ swap పరికరాలలో కనీసం వొకటి UUID కలిగిలేదు, mkswap యొక్క పాత వర్షన్లను వుపయోగించి సృష్టించిన "
+"swap జాగానందు యేదైతో సాధారణమో. ఈ పరికరాలు /etc/fstab నందలి డివైస్ పాత్ చేత సూచించబడును, వైవిధ్యమైన "
+"పరిస్థితులలో డివైస్ పాత్‌లు మారును కనుక యిది సమంజసం కాదు."
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "ఈ మరల్పు కేంద్రము చెల్లనిది. %s డైరెక్టరీ తప్పక / దస్త్ర వ్యవస్థనందు వుండాలి."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "మరల్పు కేంద్రము %s తప్పక లైనక్సు దస్త్ర వ్యవస్థనందు వుండాలి."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -568,84 +1305,232 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "సంస్థాపనా ఆధారంనుండీ వ్యవహారమును సిద్థముచేస్తోంది"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "ప్యాకేజీను సంస్థాపించుటలో దోషము"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "మీకు కింది ఫైలు విధానానికి ఎక్కువ ఖాళీ కావలసి ఉంది:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "సంస్థాపనా ఆధారంనుండీ వ్యవహారమును సిద్థముచేస్తోంది"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "ప్యాకేజీను సంస్థాపించుటలో దోషము"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "అనంతర సంస్థాపన"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "సంస్థాపించుటకు సిద్దమౌతోంది"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "అనంతర సంస్థాపన"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "ఆదేశ క్రమ రీతిలో  ప్రశ్నని కలిగిఉండదు!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "దోషం"
 
@@ -669,31 +1554,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -707,452 +1594,523 @@ msgstr ""
 "మీ కంప్యూటరులో X ని ప్రారంభించటానికి వీలుకాదు.  మీరు ఈ కంప్యూటరునుండీ వేరొక కంప్యూటరుకి "
 "అనుసంధానం పొందటానికి VNC ని మరియూ చిత్ర సంస్థాపనని లేదా పాఠ్య రీతి సంస్థాపనని ప్రారంభించాలనుకుంటున్నారా?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "సంకేతపదం తప్పకుండా కనీసం ఆరు అక్షరాల పొడవుండాలి."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "సంకేతపదం తప్పకుండా కనీసం ఆరు అక్షరాల పొడవుండాలి."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "దస్త్రవ్యవస్థ ఆకృతీకరణ ఒక రకమును కలిగిలేదు"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "సంస్థాపన ప్రారంభించుచున్నది"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "నవీకరణ-తరువాతి ఆకృతీకరణను జరుపుచున్నది"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNCని ప్రారంభించు"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "సంస్థాపక ప్రగతి"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "సంస్థాపనా ఆధారంనుండీ వ్యవహారమును సిద్థముచేస్తోంది"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "ప్యాకేజీను సంస్థాపించుటలో దోషము"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "పరికరము /boot ను కలిగివుందివద"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "సాఫ్టువేర్ అభివృద్ధి"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "హెచ్చరిక"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1168,580 +2126,405 @@ msgstr "పురోగతినందు వుంది"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s సంస్థాపన"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "root పరికరంపై మీరు తప్పక వొక ఫైల్‌సిస్టమ్ సృష్టించాలి."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "root పరికరంపై మీరు తప్పక వొక ఫైల్‌సిస్టమ్ సృష్టించాలి."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "సాఫ్టువేర్ అభివృద్ధి"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1768,279 +2551,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 చిరునామా"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 చిరునామాIPv6 Addres"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "రద్దు (_C)చేయ"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "సాఫ్టువేర్ అభివృద్ధి"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "రిపోజిటరీని అమర్చుటలో దోషము"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "రిపోజిటరీని అమర్చుటలో దోషము"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2048,14 +2855,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2064,128 +2871,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD పరికరమును ఫార్మాట్ చేయుట"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "సరే"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2196,68 +3024,165 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "మరల్పు కేంద్రము %s తప్పక లైనక్సు దస్త్ర వ్యవస్థనందు వుండాలి."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "root పరికరంపై మీరు తప్పక వొక ఫైల్‌సిస్టమ్ సృష్టించాలి."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s పై %(type)s సృష్టించుచున్నది"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2265,951 +3190,1372 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "కొనసాగించు(_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "సరే"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "వెబ్ సేవిక"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "నిర్ధారించుము"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ఏ నెట్వర్కు అందుబాటులోలేదు"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "పాఠ్య రీతిని ఉపయోగించు"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "సామర్థ్యము"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID సాధనం"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "జతచేయు(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "నిర్ధారించుము"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ఏ నెట్వర్కు అందుబాటులోలేదు"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "నిర్ధారించుము"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "నిర్ధారించుము"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "నిర్ధారించుము"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "వినియోగదారినామము"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "అనుసంధించబడింది!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI సిస్టమ్ విభజన"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "సంస్థాపకి నిష్క్రమించుము (_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI సిస్టమ్ విభజన"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "ఎన్క్రిప్టెడ్"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI సిస్టమ్ విభజన"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "జతచేయు(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "సరే"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "నిర్ధారించుము"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "జతచేయు(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "సరే"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID సాధనం"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "జతచేయు(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "ఆపరేషనల్ దోషము."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "ఆపరేషనల్ దోషము."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3217,649 +4563,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "సంస్థాపనా విధానంలో మీరు ఏ భాషని ఉపయోగించాలనుకుంటున్నారు?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "కొనసాగించు(_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "నిర్ధారించుము"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ఖాళీ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID సాధనం"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "జతచేయు(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "ఎన్క్రిప్టెడ్"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "సామర్థ్యము"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID సాధనం"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID సాధనం"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "ఎన్క్రిప్టెడ్"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID సాధనం"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "నిర్ధారించుము"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "సరే"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4 చిరునామా"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "మీరు తప్పక ఒక iSCSI సిద్దీకరణి నామమును సమకూర్చాలి"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "వినియోగదారినామము"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "సరే"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID సాధనం"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ఖాళీ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "సామర్థ్యము"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "వినియోగదారినామము"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID సాధనం"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "ఎన్క్రిప్టెడ్"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "సరే"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD పరికరమును ఫార్మాట్ చేయుట"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "నిర్ధారించుము"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "సరే"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "రద్దు (_C)చేయ"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI సిస్టమ్ విభజన"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "అనంతర సంస్థాపన"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "సంస్థాపించుటకు సిద్దమౌతోంది"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "నవీకరణ-తరువాతి ఆకృతీకరణను జరుపుచున్నది"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "పునఃప్రారంభించు (_b)"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3873,16 +5610,16 @@ msgstr "సంస్థాపన"
 msgid "Install the live CD to your hard disk"
 msgstr "మీ హార్డుడిస్కు కి లైవ్ CD ని సంస్ధాపించండి."
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "హార్డడ్రైవ్ కు సంస్థాపించుట ప్రారంభిస్తోందిహార్డడ్రైవ్ కు సంస్థాపించండ"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3890,24 +5627,25 @@ msgid ""
 msgstr ""
 "%s కు సంస్థాపించుటకు %s MB మెమొరీ కావాలి, అయితే యీ మిషన్‌పై మీరు %s MB మాత్రమే కలిగివున్నారు.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s గ్రాఫికల్ సంస్థాపికకు %s MB మెమొరీ కావాలి, అయితే మీరు %s MB మాత్రమే కలిగివున్నారు."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "చాలినంత RAM లేదు"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3921,24 +5659,24 @@ msgstr ""
 "\n"
 "root టెర్మినల్ నుండి.toఇది నడుపుట ద్వారా పాఠ్య రీతి సంస్థాపికను ప్రయత్రor"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "ప్రారంభ పాఠ్య రీతి."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "దోషం"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "ప్రదర్శనా చరరాశి (వేరిబుల్) అమర్చబడలేదు. పాఠ్య రీతిలో ప్రారంభిస్తోంది."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "చిత్రాత్మిక సంస్థాపన అందుబాటులో లేదు...  పాఠ్య రీతిలో ప్రారంభిస్తోది."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -3948,36 +5686,56 @@ msgstr ""
 "పాఠ రీతి అనునది పరిమితమైన సంస్థాపనా ఐచ్చికాలను యిస్తుంది.  మీ స్వంత విభజన నమూనా లేదా ప్యాకేజీ ఎంపికలను "
 "తెలుపుటకు మిమ్ములను అనుమతించదు.  మీరు బదులుగా VNC రీతిను వుపయోగించుటకు యిష్టపడతారా?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "హోస్టునామము తప్పక 'a-z, 'A-Z', లేదా '0-9' పరిధిలమధ్యలో వొక విలువైన అక్షరముతో ప్రారంభమవ్వాలి"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "మీకు కింది ఫైలు విధానానికి ఎక్కువ ఖాళీ కావలసి ఉంది:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "ఆదేశ క్రమ రీతిలో  ప్రశ్నని కలిగిఉండదు!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "వినియోగదారినామము"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID సాధనం"
+
 #~ msgid "Completed"
 #~ msgstr "పూర్తయ్యింది"
 
@@ -4025,43 +5783,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "కంప్యూటరులో సంస్థాపించు"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "సంస్థాపనా రిపోజిటరీను అమర్చునప్పుడు కింది దోషము యెదురైంది:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "సంస్థాపన కొనసాగలేదు."
-
 #~ msgid "Exit installer"
 #~ msgstr "సంస్థాపిక నుండి బయటకు."
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "మీ హార్డువేరు నందలి సమస్య కారణంగా సంస్థాపన అనునది ఆపివేయబడింది. ఖచ్చితమైన దోష సందేశం:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ "సంస్థాపకి యిప్పుడు అంతమగును."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "హోర్డువేర్ దోషము యెదురైంది"
-
-#~ msgid "_Exit installer"
-#~ msgstr "సంస్థాపకి నిష్క్రమించుము (_E)"
-
 #~ msgid ""
 #~ "After shutdown, please perform a manual IPL from %s to continue "
 #~ "installation."
@@ -4155,9 +5879,6 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "రిపోజిటరీ %r ఆకృతీకరణనందు నామమును కోల్పోయింది, id వుపయోగిస్తోంది"
 
-#~ msgid "No Network Available"
-#~ msgstr "ఏ నెట్వర్కు అందుబాటులోలేదు"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
@@ -4165,9 +5886,6 @@ msgstr ""
 #~ "మీ సాఫ్టువేరు రీపోజిటరీలలో కొన్నిటికి నెట్వర్కు అవసరమైంది, అయితే మీ సిస్టమ్ నందు నెట్వర్కును చేతనము "
 #~ "చేయుటలో దోషమువుంది."
 
-#~ msgid "Re_boot"
-#~ msgstr "పునఃప్రారంభించు (_b)"
-
 #~ msgid "_Eject"
 #~ msgstr "బయటకునెట్టు(_E)"
 
@@ -4314,9 +6032,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "గ్రాఫికల్ డెస్కుటాప్"
 
-#~ msgid "Web Server"
-#~ msgstr "వెబ్ సేవిక"
-
 #~ msgid "Minimal"
 #~ msgstr "కనీస"
 
@@ -4356,46 +6071,6 @@ msgstr ""
 #~ "ఈ పరికరము తొలగించుటకు వీలుకాని లాజికల్ విభజనలను కలిగివున్న పొడిగింపు విభజనది:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr "%s సంస్థాపన కొనసాగింపుకి అవసరమైన, root విభజన (/)ను మీరు నిర్వచించలేదు."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "మీ మూల(root) విభజన 250 మెగాబైట్లకన్నా తక్కువగా ఉంది. ఇది సంస్థాపనకు చాలా తక్కువైంది.%s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "కేటాయించిన విభజన లేదా లాజికల్ వాల్యూమ్ పైన యీ ప్లాట్‌ఫాంనకు /boot అవసరం. మీకు /boot వాల్యూమ్ "
-#~ "అక్కరలేక పోతే, కేటాయించిన నాన్-LVM విభజనపై మీరు తప్పక / వుంచాలి."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "మీ %(mount)s విభజన %(size)s మెగాబైట్లకంటె తక్కువ ఉంది. %(productName)s సాధారణ "
-#~ "సంస్థాపనకు తక్కువ మద్దతిచ్చేది."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(format)s ఫార్మేటింగ్‌కు మీరు %(mount)s విభజన చాలా చిన్నది (అనుమతించదగు పరిమాణం "
-#~ "%(minSize)d MB నుండి %(maxSize)d MB వరకు)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "%(format)s ఫార్మేటింగ్‌కు మీరు %(mount)s విభజన చాలా పెద్దది (అనుమతించదగు పరిమాణం "
-#~ "%(minSize)d MB నుండి %(maxSize)d MB వరకు)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4412,48 +6087,6 @@ msgstr ""
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "మీరు బూట్‌లోడర్ స్టేజ్1 లక్ష్యపు పరికరం సృష్టించలేదు"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "మీరు బూటబుల్ విభజనను సృష్టించలేదు."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "మీరు స్వాప్ విభజనను తెలుపలేదు. swap విభజన లేకుండా సంస్థాపనను కొనసాగించుటకు మీకు "
-#~ "%(requiredMem)s MB మెమొరీ కావలెను, కాని మీరు %(installedMem)s MB మాత్రమే కలిగివున్నారు."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "మీరు swap విభజనను తెలుపలేదు.  అన్ని సమయాలలోనూ తప్పక అవసరంకాకపోవచ్చు, ఇది ఎక్కువ "
-#~ "సంస్థాపనలకు గుర్తించదగ్గ పాత్రని కలిగి ఉంది."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "మీ swap పరికరాలలో కనీసం వొకటి UUID కలిగిలేదు, mkswap యొక్క పాత వర్షన్లను వుపయోగించి సృష్టించిన "
-#~ "swap జాగానందు యేదైతో సాధారణమో. ఈ పరికరాలు /etc/fstab నందలి డివైస్ పాత్ చేత సూచించబడును, "
-#~ "వైవిధ్యమైన పరిస్థితులలో డివైస్ పాత్‌లు మారును కనుక యిది సమంజసం కాదు."
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "ఈ మరల్పు కేంద్రము చెల్లనిది. %s డైరెక్టరీ తప్పక / దస్త్ర వ్యవస్థనందు వుండాలి."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "మరల్పు కేంద్రము %s తప్పక లైనక్సు దస్త్ర వ్యవస్థనందు వుండాలి."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD పరికరమును ఫార్మాట్ చేయుట"
-#~ msgstr[1] "DASD పరికరములను ఫార్మాట్ చేయుట"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "లైనక్సుతో వుపయోగించుట కొరకు %d DASD పరికరమును సిద్దపరచుట..."
diff --git a/anaconda/po/tg.po b/anaconda/po/tg.po
index b8f6ccc..bd17bfd 100644
--- a/anaconda/po/tg.po
+++ b/anaconda/po/tg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/fedora/language/"
@@ -20,208 +20,442 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "системаи файлҳои /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "Андозаи %s бояд байни %d ва %d МБ бошад"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s бояд аз %dМБ камтар бошад."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s бояд аз %dМБ калонтар бошад."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Оғози VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Ҳолати матниро истифода баред"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "OK"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -230,85 +464,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -317,7 +843,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -330,8 +861,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Барқарорсозӣ"
 
@@ -369,28 +900,22 @@ msgstr "Барқарорсозии система"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "OK"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Хуруҷ"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -403,7 +928,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -412,28 +937,199 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Тарзи барқарорсозӣ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr ""
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -524,84 +1220,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Сабт кунед"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Сабт кунед"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Хато"
 
@@ -625,31 +1466,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -660,447 +1503,519 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+msgid "The password cannot be more than eight characters long."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Ҳолати сабткунӣ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Оғози VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Ҳолати сабткунӣ"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Барноманависии нармафзор"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Огоҳӣ"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1116,580 +2031,405 @@ msgstr "Иҷро шуда истодааст"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Барноманависии нармафзор"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1716,279 +2456,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Суроғаи IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Суроғаи IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Бекор кардан"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Барноманависии нармафзор"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Ҳангоми танзими феҳраст хато пайдо шуд"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Ҳангоми танзими феҳраст хато пайдо шуд"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1996,14 +2760,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2012,128 +2776,149 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Шаклбании дастгоҳи DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2144,68 +2929,164 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(type)s дар %(device)s эҷод шуда истодааст"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2213,948 +3094,1368 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Давом диҳед"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "OK"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Хидматгоҳи Веб"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Тасдиқ"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Интернет дастнорас аст"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Ҳолати матниро истифода баред"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Дастгоҳи RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Илова"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Тасдиқ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Интернет дастнорас аст"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Тасдиқ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Тасдиқ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Тасдиқ"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Номи корбар"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Пайваст карда шуд!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_Хуруҷи сабткунанда"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Огоҳӣ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Илова"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Тасдиқ"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Илова"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Дастгоҳи RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Илова"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3162,647 +4463,1033 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Кадом забонро Шумо мехоҳед барои сабткунии система истифода мебаред?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Давом диҳед"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Тасдиқ"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Холӣ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Дастгоҳи RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Илова"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Дастгоҳи RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Дастгоҳи RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Дастгоҳи RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Тасдиқ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "Суроғаи IPv4"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Номи корбар"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Дастгоҳи RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Холӣ"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Номи корбар"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Дастгоҳи RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Шаклбании дастгоҳи DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Тасдиқ"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "OK"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Бекор кардан"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Сабт кунед"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Боз_худборшавӣ"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3816,40 +5503,41 @@ msgstr "Сабт кунед"
 msgid "Install the live CD to your hard disk"
 msgstr "CD-диски зиндаро ба компютер сабт намоед"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Шумо хотираи кофии RAM надоред"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3858,60 +5546,68 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Оғозкунии ҳолати матнӣ."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Хато"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Номи корбар"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Дастгоҳи RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Тайёр шуд"
 
@@ -3925,9 +5621,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "Хуруҷи сабткунанда"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_Хуруҷи сабткунанда"
-
 #~ msgid "IP address is missing."
 #~ msgstr "Суроғаи IP намерасад"
 
@@ -3957,12 +5650,6 @@ msgstr ""
 #~ msgid "Wrong Disc"
 #~ msgstr "Диски нодуруст"
 
-#~ msgid "No Network Available"
-#~ msgstr "Интернет дастнорас аст"
-
-#~ msgid "Re_boot"
-#~ msgstr "Боз_худборшавӣ"
-
 #~ msgid "_Eject"
 #~ msgstr "_Баровардани диск"
 
@@ -3981,14 +5668,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Мизи кории графикӣ"
 
-#~ msgid "Web Server"
-#~ msgstr "Хидматгоҳи Веб"
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Шаклбании дастгоҳи DASD"
-#~ msgstr[1] "Шаклбании дастгоҳҳои DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Омодасозии дастгоҳи %d DASD барои истифодабарӣ дар Linux..."
diff --git a/anaconda/po/th.po b/anaconda/po/th.po
index 8de7eee..f43b5ae 100644
--- a/anaconda/po/th.po
+++ b/anaconda/po/th.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,211 +22,444 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "เริ่มโปรแกรม VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "ใช้โหมดตัวอักษร"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "ตกลง"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "กำลังเรียกใช้สคริปต์ก่อนติดตั้ง..."
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "กำลังเริ่มกระบวนการติดตั้ง"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "กำลังปรับแต่งหลังติดตั้ง..."
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -235,85 +468,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "กำลังเรียกใช้สคริปต์ก่อนติดตั้ง..."
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "ชื่อโฮสต์ควรมีความยาวไม่เกิน 64 ตัวอักษร"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "ชื่อโฮสต์จะต้องเริ่มต้นด้วยตัวอักษร 'a-z', 'A-Z' หรือ '0-9'"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -322,7 +847,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -335,8 +865,8 @@ msgstr "เมื่อเสร็จแล้ว กรุณาออกจ
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "ไม่สามารถหา /bin/sh เพื่อเรียกใช้ จะไม่เปิดเชลล์"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "กู้ระบบ"
 
@@ -374,28 +904,22 @@ msgstr "ระบบที่จะกู้"
 msgid "Which device holds the root partition of your installation?"
 msgstr "อุปกรณ์ใดเก็บพาร์ทิชัน root ที่คุณติดตั้งไว้?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "ตกลง"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "ออกจากโปรแกรมติดตั้ง"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -408,7 +932,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -417,28 +941,201 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "คุณไม่มีพาร์ติชั่นลินุกซ์เลย จะเริ่มต้นระบบใหม่\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "โหมดกู้ระบบ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "ระบบของคุณถูกเมานท์ภายใต้ไดเรกทอรี %s"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "พาร์ทิชัน root ของคุณ (/) มีขนาดเล็กกว่า 250 เมกะไบต์ ซึ่งเล็กเกินไปที่จะติดตั้ง %s"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "คุณยังไม่ได้กำหนดพาร์ทิชัน root (/) ซึ่งจำเป็นต้องใช้ เพื่อให้การติดตั้ง %s ดำเนินการต่อไป"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr "พาร์ทิชัน root ของคุณ (/) มีขนาดเล็กกว่า 250 เมกะไบต์ ซึ่งเล็กเกินไปที่จะติดตั้ง %s"
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "คุณยังไม่ได้สร้างพาร์ติชั่นที่บูทได้"
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"คุณยังไม่ระบุพาร์ทิชัน swap แม้ว่าจะไม่ได้จำเป็นต้องใช้นักในทุกกรณี "
+"แต่มันจะทำให้เพิ่มประสิทธิภาพในการติดตั้งแทบทุกกรณี"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "จุดเมานต์นี้ผิด พาร์ติชั่น %s จะต้องอยู่บนระบบแฟ้ม /"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "ตำแหน่งเมานท์ %s ต้องอยู่บนระบบแฟ้มลินุกซ์"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -548,84 +1245,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "กำลังเตรียมการส่งข้อมูลจากแหล่งติดตั้ง..."
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "คุณต้องการเนื้อที่เพิ่มเติมในระบบแฟ้มต่อไปนี้:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "กำลังเตรียมการส่งข้อมูลจากแหล่งติดตั้ง..."
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "แพคเกจเก่ากว่า"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "ช่วงหลังติดตั้ง"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "กำลังเตรียมการติดตั้ง"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "ช่วงหลังติดตั้ง"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "ไม่สามารถถามคำถามขณะที่อยู่ในโหมดบรรทัดคำสั่งได้!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "เกิดข้อผิดพลาด"
 
@@ -649,31 +1492,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -688,450 +1533,522 @@ msgstr ""
 "เพื่อเชื่อมต่อคอมพิวเตอร์เครื่องนี้จากเครื่องอื่นแล้วทำการติดตั้งแบบกราฟิกได้ "
 "หรือทำต่อไปโดยติดตั้งบนโหมดตัวอักษร"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "รหัสผ่านต้องยาวอย่างน้อย 6 ตัวอักษร"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "รหัสผ่านต้องยาวอย่างน้อย 6 ตัวอักษร"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "การตั้งค่าระบบแฟ้มขาดชนิด"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "กำลังเริ่มการติดตั้ง"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "กำลังดำเนินการปรับแต่งหลังการอัพเดต"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "เริ่มโปรแกรม VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "กระบวนการติดตั้ง"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "กำลังเตรียมการส่งข้อมูลจากแหล่งติดตั้ง..."
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "การพัฒนาซอฟต์แวร์"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "ข้อความเตือน"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1147,579 +2064,402 @@ msgstr "กำลังดำเนินการ"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "การพัฒนาซอฟต์แวร์"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1746,279 +2486,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "การพัฒนาซอฟต์แวร์"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "เกิดข้อผิดพลาดในการตั้งคลังแพคเกจ"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "เกิดข้อผิดพลาดในการตั้งคลังแพคเกจ"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2026,14 +2790,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2042,127 +2806,147 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "ตกลง"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2172,1015 +2956,1520 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "ตำแหน่งเมานท์ %s ต้องอยู่บนระบบแฟ้มลินุกซ์"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_ต่อไป"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "ตกลง"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "เว็บเซิร์ฟเวอร์"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "ยึนยัน"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "ไม่มีเครือข่าย"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ใช้โหมดตัวอักษร"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "อุปกรณ์ RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "เ_พิ่ม"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "ยึนยัน"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "ไม่มีเครือข่าย"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "ยึนยัน"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "ยึนยัน"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "ยึนยัน"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "เชื่อมต่อได้แล้ว!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "พาร์ติชั่นระบบ EFI"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "_ออกจากการติดตั้ง"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "พาร์ติชั่นระบบ EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "พาร์ติชั่นระบบ EFI"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "เ_พิ่ม"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "ตกลง"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "ยึนยัน"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "เ_พิ่ม"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "ตกลง"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "อุปกรณ์ RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "เ_พิ่ม"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3188,645 +4477,1011 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "ภาษาอะไรที่คุณต้องการใช้ในระหว่างกระบวนการการติดตั้ง?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_ต่อไป"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "ยึนยัน"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "ว่าง"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "อุปกรณ์ RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "เ_พิ่ม"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "อุปกรณ์ RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "อุปกรณ์ RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "อุปกรณ์ RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "ยึนยัน"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "ตกลง"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "ไม่ได้ระบุชื่อ initiator"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "ตกลง"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "อุปกรณ์ RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "ว่าง"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "อุปกรณ์ RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "ตกลง"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "ยึนยัน"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "ตกลง"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "พาร์ติชั่นระบบ EFI"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "ช่วงหลังติดตั้ง"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "กำลังดำเนินการปรับแต่งหลังการอัพเดต"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "_รีบูต"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3840,40 +5495,41 @@ msgstr "ติดตั้ง"
 msgid "Install the live CD to your hard disk"
 msgstr "ติดตั้ง live CD ลงฮาร์ดดิสก์"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3882,60 +5538,75 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "เกิดข้อผิดพลาด"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "ไม่ได้กำหนดตัวแปร DISPLAY จึงจะใช้โหมดข้อความ."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "ไม่สามารถติดตั้งแบบกราฟิก... กำลังเริ่มการติดตั้งบนโหมดตัวอักษร"
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "ชื่อโฮสต์จะต้องเริ่มต้นด้วยตัวอักษร 'a-z', 'A-Z' หรือ '0-9'"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "คุณต้องการเนื้อที่เพิ่มเติมในระบบแฟ้มต่อไปนี้:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "ไม่สามารถถามคำถามขณะที่อยู่ในโหมดบรรทัดคำสั่งได้!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "อุปกรณ์ RAID"
+
 #~ msgid "Completed"
 #~ msgstr "เสร็จสมบูรณ์"
 
@@ -3968,9 +5639,6 @@ msgstr ""
 #~ msgid "Exit installer"
 #~ msgstr "ออกจากตัวติดตั้ง"
 
-#~ msgid "_Exit installer"
-#~ msgstr "_ออกจากการติดตั้ง"
-
 #~ msgid "IP address is missing."
 #~ msgstr "ไม่มีหมายเลข IP"
 
@@ -4007,18 +5675,12 @@ msgstr ""
 #~ msgid "Repository %r is missing name in configuration, using id"
 #~ msgstr "คลังแพคเกจ %r ไม่ระบุชื่อในการตั้งค่า จะใช้ id แทน"
 
-#~ msgid "No Network Available"
-#~ msgstr "ไม่มีเครือข่าย"
-
 #~ msgid ""
 #~ "Some of your software repositories require networking, but there was an "
 #~ "error enabling the network on your system."
 #~ msgstr ""
 #~ "คลังแพคเกจบางอันของคุณต้องการระบบเครือข่าย แต่ไม่สามารถเปิดใช้ระบบเครือข่ายบนเครื่องได้"
 
-#~ msgid "Re_boot"
-#~ msgstr "_รีบูต"
-
 #~ msgid "_Eject"
 #~ msgstr "_ดีดแผ่น"
 
@@ -4058,9 +5720,6 @@ msgstr ""
 #~ msgid "file conflicts"
 #~ msgstr "ไฟล์ขัดแย้งกัน"
 
-#~ msgid "older package(s)"
-#~ msgstr "แพคเกจเก่ากว่า"
-
 #~ msgid "insufficient disk space"
 #~ msgstr "เนื้อที่ดิสก์ไม่เพียงพอ"
 
@@ -4137,9 +5796,6 @@ msgstr ""
 #~ msgid "Retrieving installation information for %s."
 #~ msgstr "กำลังรับข้อมูลการติดตั้งของ %s..."
 
-#~ msgid "Web Server"
-#~ msgstr "เว็บเซิร์ฟเวอร์"
-
 #~ msgid "This partition is holding the data for the hard drive install."
 #~ msgstr "คุณไม่สามารถลบพาร์ทิชันนี้ได้ เพราะมันเป็นที่เก็บข้อมูลสำหรับการติดตั้งผ่านฮาร์ดไดรฟ์"
 
@@ -4166,17 +5822,6 @@ msgstr ""
 #~ "พาร์ติชั่นนี้เป็นพาร์ติชั่น extended ซึ่งเก็บพาร์ติชั่น logical ซึึ่งไม่สามารถลบได้:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "คุณยังไม่ได้กำหนดพาร์ทิชัน root (/) ซึ่งจำเป็นต้องใช้ เพื่อให้การติดตั้ง %s ดำเนินการต่อไป"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "พาร์ทิชัน root ของคุณ (/) มีขนาดเล็กกว่า 250 เมกะไบต์ ซึ่งเล็กเกินไปที่จะติดตั้ง %s"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "กำลังติดตั้งบนอุปกรณ์ USB ซึ่งอาจสร้างระบบที่ทำงานไม่ได้"
@@ -4186,25 +5831,6 @@ msgstr ""
 #~ "system."
 #~ msgstr "กำลังติดตั้งบนอุปกรณ์ FireWire ซึ่งอาจสร้างระบบที่ทำงานไม่ได้"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "คุณยังไม่ได้สร้างพาร์ติชั่นที่บูทได้"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "คุณยังไม่ระบุพาร์ทิชัน swap แม้ว่าจะไม่ได้จำเป็นต้องใช้นักในทุกกรณี "
-#~ "แต่มันจะทำให้เพิ่มประสิทธิภาพในการติดตั้งแทบทุกกรณี"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "จุดเมานต์นี้ผิด พาร์ติชั่น %s จะต้องอยู่บนระบบแฟ้ม /"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "ตำแหน่งเมานท์ %s ต้องอยู่บนระบบแฟ้มลินุกซ์"
-
 #~ msgid "vginfo failed for %s"
 #~ msgstr "vginfo ล้มเหลวสำหรับ %s"
 
diff --git a/anaconda/po/tr.po b/anaconda/po/tr.po
index 9ffdb2a..bf154ff 100644
--- a/anaconda/po/tr.po
+++ b/anaconda/po/tr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/fedora/language/"
@@ -26,211 +26,456 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "VNC'yi başlat"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Metin kullan"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Tamam"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"Kurulum deposu kurulurken aşağıdaki hata oluştu:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Kurulum devam edemez."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"Kurulum deposu kurulurken aşağıdaki hata oluştu:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Kurulum devam edemez."
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Kurulum öncesi betikleri çalıştırılıyor"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Kurulum işlemleri başlıyor"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr ""
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Kurulum sonrası ayarlar yapılıyor"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -239,87 +484,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Kurulum öncesi betikleri çalıştırılıyor"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Konak Adı 255 veya daha az karakter uzunluğunda olmalıdır."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Konak Adı  'a-z', 'A-Z', veya '0-9' aralığında olan geçerli bir karakter ile "
-"başlamalıdır."
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -328,7 +863,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "%(productName)s %(productVersion)s kurulumu"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Bitirdiğiniz zaman %s 'i çalıştırarak sistemi ayırınız."
@@ -341,8 +881,8 @@ msgstr "Bittiğinde lütfen 'exit' ile kabuktan çıkıp sistemi yeniden başlat
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Çalıştırmak için /bin/sh bulunamıyor! Kabuk başlatılamıyor"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Kurtar"
 
@@ -380,28 +920,22 @@ msgstr "Kurtarılacak Sistem"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Kurulumunuzun kök disk bölümü hangi aygıt üzerinde tutuluyor?"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Tamam"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Çıkış"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Kabuktan çıktığınızda sistem kendiliğinden tekrar başlatılacaktır."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -422,7 +956,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -431,30 +965,206 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "Herhangi bir Linux bölümü bulunamadı. Yeniden başlatılıyor.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Kabuktan çıktığınızda sistem kendiliğinden tekrar başlatılacaktır."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Kurtarma Kipi"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Herhangi bir Linux bölümü bulunamadı. Kabuğa düşmek için enter tuşuna "
 "basınız.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Dosya sisteminiz %s altına bağlandı."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "Kök disk bölümü 250 MB'dan küçük ve %s kurulumu için bu alan yetersiz."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"%s kurulumuna devam edebilmek için bir kök disk bölümü (/) belirtmelisiniz."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"%(mount)s disk bölümünüz %(size)s MB'dan az, ki bu normal bir "
+"%(productName)s kurulumu için önerilenden daha düşüktür."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Önyüklenebilen bir disk bölümü oluşturmadınız."
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Bir takas alanı belirtmediniz. Bu çok gerekli değil ama bir çok kurulumda "
+"başarımı arttırdığı görülmüştür."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, fuzzy, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "%s bağlama noktası bir linux dosya sistemi üzerinde olmalıdır."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "%s bağlama noktası bir linux dosya sistemi üzerinde olmalıdır."
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -558,85 +1268,230 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Paket Yükleme Hatası"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-"Aşağıdaki dosya sistemleri üzerinde daha fazla boş alana gereksiminiz var:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Paket Yükleme Hatası"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Kurulum Sonrası"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Yüklemek için hazırlanıyor"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Kurulum Sonrası"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Komut satırı kipinde bir soru olamaz!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Hata"
 
@@ -660,31 +1515,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -699,450 +1556,522 @@ msgstr ""
 "bilgisayara bağlanmayı ve grafik arayüzlü kurulumla veya metin tabanlı "
 "kurulumla devam etmeyi ister misiniz?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Parola en az altı karakter uzunluğunda olmalı."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Parola en az altı karakter uzunluğunda olmalı."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Kurulum Başlıyor"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Yükseltme sonrası ayarları yapılıyor"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "VNC'yi başlat"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Kurulum Süreci"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Paket Yükleme Hatası"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "/boot içeren aygıt"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Yazılım Geliştirme"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Uyarı"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1158,579 +2087,402 @@ msgstr "İşlem devam ediyor"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
-#, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "%(productName)s %(productVersion)s kurulumu"
+#: pyanaconda/ui/gui/hubs/progress.py:219
+#, python-format
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Kök aygıtı üzerinde yeni bir dosya sistemi oluşturmalısınız."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Kök aygıtı üzerinde yeni bir dosya sistemi oluşturmalısınız."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Yazılım Geliştirme"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1757,279 +2509,303 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4  Adresi"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 Adresi"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_İptal"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Yazılım Geliştirme"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
-msgid ""
-"Failed to set up installation source; check the repo url and proxy settings"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:515
+#: pyanaconda/ui/gui/spokes/source.py:533
 #, fuzzy
 msgid "Error setting up base repository"
 msgstr "Depo Kurma Hatası"
 
-#: pyanaconda/ui/gui/spokes/source.py:526
+#: pyanaconda/ui/gui/spokes/source.py:544
 #, fuzzy
 msgid "Error setting up ISO file"
 msgstr "Depo Kurma Hatası"
 
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:670
+msgid ""
+"Failed to set up installation source; check the repo url and proxy settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2037,14 +2813,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2053,127 +2829,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "DASD Aygıtı Biçimlendiriliyor"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Tamam"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2183,1019 +2980,1537 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "%s bağlama noktası bir linux dosya sistemi üzerinde olmalıdır."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Kök aygıtı üzerinde yeni bir dosya sistemi oluşturmalısınız."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "%(device)s üzerinde %(type)s oluşturuluyor"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Devam"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_İptal"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Tamam"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Web Sunucusu"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "Onayla"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "Ağ Mevcut Değil"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Metin kullan"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Kapasite"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID Aygıtı"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Ekle"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "Onayla"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "Ağ Mevcut Değil"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "Onayla"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "Onayla"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "Onayla"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Kullanıcı adı"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Bağlandı!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "EFI Sistem Bölümü"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
-msgid "_Quit installer"
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Quit installer"
+msgstr "Kurulumdan _Çık"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "EFI Sistem Bölümü"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "Şifrelendi"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "EFI Sistem Bölümü"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Ekle"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Tamam"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Onayla"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Ekle"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Tamam"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "RAID Aygıtı"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Ekle"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Çalıştırma hatası."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Çalıştırma hatası."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
-msgstr ""
+msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3203,649 +4518,1040 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Kurulum sırasında hangi dili kullanmak istiyorsunuz?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Devam"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
-msgstr ""
+msgstr "Onayla"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Boş"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "RAID Aygıtı"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Ekle"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "Şifrelendi"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "Kapasite"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "RAID Aygıtı"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "RAID Aygıtı"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "Şifrelendi"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID Aygıtı"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "Onayla"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_İptal"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Tamam"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IPv4  Adresi"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Bir iSCSI başlatıcı adı girmelisiniz"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
-msgstr ""
+msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Kullanıcı adı"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Tamam"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "RAID Aygıtı"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Boş"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "Kapasite"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Kullanıcı adı"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "RAID Aygıtı"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "Şifrelendi"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Tamam"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "DASD Aygıtı Biçimlendiriliyor"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Onayla"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Tamam"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
+msgstr "EFI Sistem Bölümü"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Kurulum Sonrası"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Yüklemek için hazırlanıyor"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
-msgstr ""
+msgstr "Yükseltme sonrası ayarları yapılıyor"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Yeniden_Başlat"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3859,16 +5565,16 @@ msgstr "Kur"
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Sabit Diske Kurulum Başlıyor"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -3877,26 +5583,27 @@ msgstr ""
 "%s kurulum için %s MB hafızaya ihtiyaç duyuyor, ancak bu makinede sadece %s "
 "MB hafıza bulunmakta.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "%s grafik kipinde kurulum %s MB hafızaya gereksinim duyuyor, fakat sizin "
 "sadece %s MB hafızanız bulunmakta."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "RAM yetersiz"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3910,60 +5617,83 @@ msgstr ""
 "\n"
 "komutunu çalıştırarak metin kipinde kurulumu deneyin."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " Metin kipi başlatılıyor."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Hata"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY değişkeni ayarlanmamış. Metin kipi başlatılıyor."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Grafik kipinde kurulum mevcut değil. Metin kipinde kuruluma geçiliyor."
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Konak Adı  'a-z', 'A-Z', veya '0-9' aralığında olan geçerli bir karakter "
+#~ "ile başlamalıdır."
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr ""
+#~ "Aşağıdaki dosya sistemleri üzerinde daha fazla boş alana gereksiminiz "
+#~ "var:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Komut satırı kipinde bir soru olamaz!"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "Kullanıcı adı"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID Aygıtı"
+
 #~ msgid "Completed"
 #~ msgstr "Tamamlandı"
 
@@ -3994,26 +5724,9 @@ msgstr ""
 #~ msgid "Install on System"
 #~ msgstr "Sistemde Kurulum"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "Kurulum deposu kurulurken aşağıdaki hata oluştu:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Kurulum devam edemez."
-
 #~ msgid "Exit installer"
 #~ msgstr "Kurulumdan Çık"
 
-#~ msgid "_Exit installer"
-#~ msgstr "Kurulumdan _Çık"
-
 #~ msgid "IP address is missing."
 #~ msgstr "IP adresi eksik."
 
@@ -4055,12 +5768,6 @@ msgstr ""
 #~ msgid "That's not the correct %s disc."
 #~ msgstr "Bu doğru %s diski değil."
 
-#~ msgid "No Network Available"
-#~ msgstr "Ağ Mevcut Değil"
-
-#~ msgid "Re_boot"
-#~ msgstr "Yeniden_Başlat"
-
 #~ msgid "_Eject"
 #~ msgstr "_Çıkart"
 
@@ -4153,9 +5860,6 @@ msgstr ""
 #~ msgid "Graphical Desktop"
 #~ msgstr "Grafiksel Masaüstü"
 
-#~ msgid "Web Server"
-#~ msgstr "Web Sunucusu"
-
 #~ msgid "Minimal"
 #~ msgstr "En az"
 
@@ -4165,26 +5869,6 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "DASD biçimli bir LDL bölümünü silemezsiniz."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "%s kurulumuna devam edebilmek için bir kök disk bölümü (/) "
-#~ "belirtmelisiniz."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Kök disk bölümü 250 MB'dan küçük ve %s kurulumu için bu alan yetersiz."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "%(mount)s disk bölümünüz %(size)s MB'dan az, ki bu normal bir "
-#~ "%(productName)s kurulumu için önerilenden daha düşüktür."
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4198,24 +5882,6 @@ msgstr ""
 #~ "Bir FireWire aygıtı üzerine kuruluyor.  Bunun sonucunda düzgün çalışan "
 #~ "bir sistem elde edilemeyebilir."
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Önyüklenebilen bir disk bölümü oluşturmadınız."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Bir takas alanı belirtmediniz. Bu çok gerekli değil ama bir çok kurulumda "
-#~ "başarımı arttırdığı görülmüştür."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "%s bağlama noktası bir linux dosya sistemi üzerinde olmalıdır."
-
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "DASD Aygıtı Biçimlendiriliyor"
-
 #~ msgid "Back"
 #~ msgstr "Geri"
 
diff --git a/anaconda/po/uk.po b/anaconda/po/uk.po
index 70dc529..645fb8d 100644
--- a/anaconda/po/uk.po
+++ b/anaconda/po/uk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-05 07:17+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "файлову систему /boot"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
@@ -35,7 +35,7 @@ msgstr ""
 "Набори RAID, які містять «%s», мають належати до одного з таких рівнів RAID: "
 "%s."
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
@@ -44,7 +44,7 @@ msgstr ""
 "Набори RAID, що містять «%s», мають належати до однієї з таких версій "
 "метаданих: %s."
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
@@ -53,108 +53,129 @@ msgstr ""
 "Набори RAID, що містять «%s», мають зберігатися на пристрої одного з таких "
 "типів: %s."
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s має бути позначено міткою одного з таких типів: %s."
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s не може належати до типу %s."
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s має бути змонтовано на одному з %s."
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s має бути розміром від %d до %d МБ"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "Розмір %s має перевищувати %d МБ."
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s не повинен перевищувати за розміром %d МБ."
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s має перебувати у перших %d МБ диска."
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s має зберігатися на основному розділі."
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s не може зберігатися на зашифрованому блоковому пристрої."
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s не може належати до типу %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "На %s може бути недостатньо місця для вбудовування core.img grub2, якщо буде "
 "використано файлову систему %s для %s"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Запускати VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Використовувати текстовий режим"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "Пароль встановлено."
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "Паролі не збігаються!"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 "Вами вказано надто простий пароль: %s. Натисніть «Виконано» ще раз, якщо "
 "слід використовувати саме цей пароль."
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
@@ -162,89 +183,340 @@ msgstr ""
 "слід використовувати саме цей пароль."
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "Простий"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "Нормальний"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "Якісний"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "Складний"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Гаразд"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "_Так"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "_Ні"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"При налаштовуванні сховища для встановлення виявлено таку помилку:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Продовження встановлення неможливе."
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"При налаштовуванні сховища для встановлення виявлено таку помилку:\n"
+"\n"
+"%(e)s\n"
+"\n"
+"Продовження встановлення неможливе."
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"У вказаному нижче позначеному для встановлення програмному забезпеченні "
+"виявлено помилки. Ймовірно, причиною цього є помилка\n"
+"на носії для встановлення. Ви можете спробувати вилучити ці пакунки зі "
+"списку для встановлення, змінити\n"
+"джерело для встановлення або вийти з програми для встановлення."
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Встановлення припинено, ймовірно, через проблеми з вашим обладнанням. "
+"Повідомлення про помилку повністю:\n"
+"\n"
+"%s.\n"
+"\n"
+" Роботу програми для встановлення буде завершено."
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"Встановлення припинено, ймовірно, через проблеми з вашим обладнанням. "
+"Повідомлення про помилку повністю:\n"
+"\n"
+"%s.\n"
+"\n"
+" Роботу програми для встановлення буде завершено."
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "Сталася апаратна помилка"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"Встановлення припинено, ймовірно, через проблеми з вашим обладнанням. "
+"Повідомлення про помилку повністю:\n"
+"\n"
+"%s.\n"
+"\n"
+" Роботу програми для встановлення буде завершено."
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "Налаштовуємо встановлену систему"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "Записуємо налаштування мережі"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "Створюємо записи користувачів"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "Налаштовуємо встановлену систему"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "Запуск сценаріїв перед встановленням"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "Налаштовування джерела для встановлення…"
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "Встановлюємо завантажувач"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "Виконуємо завдання з налаштовування після встановлення"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "Встановлюємо завантажувач"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 "Для використання сертифіката з умовним депонуванням за адресою %s слід "
 "увімкнути мережу."
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -256,32 +528,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "Не знайдено %s. Налаштовування брандмауера неможливе."
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "Не знайдено %s. Налаштовування брандмауера неможливе."
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "У цій файловій системі не передбачено підтримки міток."
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "Вказану назву, %s, вже використано."
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "Назву групи томів %s вже використано. Зміни не збережено."
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "Запуск сценаріїв перед встановленням"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "Назвою вузла не може бути назва «Немає» або порожня назва"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "Довжина назви комп'ютера не повинна перевищувати 255 символів."
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-"Назва комп'ютера повинна починатись з символів в діапазоні 'a-z', 'A-Z' або "
-"0-9 "
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -291,55 +853,55 @@ msgstr ""
 "Частини назв між крапками повинні бути непорожніми і не можуть починатися з "
 "«-» або завершуватися на «-»."
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "Встановлення з’єднання…"
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "Роз’єднання…"
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "Дротова (%s), з’єднано"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "Бездротове з’єднання з %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "Не з’єднано"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "Не виявлено жодного пристрою для роботи у мережі"
 
@@ -348,7 +910,12 @@ msgstr "Не виявлено жодного пристрою для робот
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "ВСТАНОВЛЕННЯ %(productName)s %(productVersion)s"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "Нове встановлення %s %s"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "Віддайте команду %s, щоб демонтувати систему після завершення."
@@ -363,8 +930,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "Не вдається знайти /bin/sh для запуску! Оболонку не буде запущено."
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Відновлення"
 
@@ -413,21 +980,15 @@ msgstr "Система відновлення"
 msgid "Which device holds the root partition of your installation?"
 msgstr "Вкажіть пристрій, на якому міститься коренева файлова система"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Гаразд"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Вийти"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "Систему буде автоматично перезавантажено після виходу з оболонки."
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -437,7 +998,7 @@ msgstr ""
 "підключення. Натисніть \"Enter\", щоб перейти у оболонку, у якій можна "
 "виконати fsck та підключити ці розділи. %s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -458,7 +1019,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -471,30 +1032,240 @@ msgstr ""
 "\n"
 "Натисніть <Enter>, щоб потрапити до оболонки."
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "У системі немає розділів Linux. Буде виконано перезавантаження.\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr " Систему буде автоматично перезавантажено після виходу з оболонки."
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Режим відновлення"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 "Розділів Linux не виявлено. Натисніть Enter, щоб повернутися до командної "
 "оболонки.%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Систему підключено у каталог %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "Стандартний розділ"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "Диск"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"Область «swap» використовується операційною системою, якщо\n"
+"залишається обмаль оперативної пам’яті."
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"Область «boot» призначено для зберігання файлів, потрібних\n"
+"для запуску операційної системи."
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr "Область «root» призначено для зберігання файлів системи та програм."
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr "Область «home» призначено для зберігання ваших особистих даних."
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"Для уможливлення завантаження з дисків з GPT-поділом на обладнанні\n"
+"з BIOS доведеться створити розділ завантаження BIOS."
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"На деяких платформах PPC частиною налаштовування завантажувача\n"
+"є створення розділу завантаження PReP."
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Ваш кореневий розділ менше ніж 250 мегабайтів, чого, зазвичай, дуже мало для "
+"встановлення %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Ви не вказали кореневий розділ (/), який вимагається для продовження "
+"встановлення %s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"Для цієї платформи потрібна тека /boot на окремому розділі або логічному "
+"томі. Якщо ви не бажаєте створювати том /boot, вам слід розташувати кореневу "
+"теку (/) на окремому розділі, який не є частиною LVM."
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Розмір розділу %(mount)s менший ніж %(size)s мегабайтів, що менше ніж "
+"рекомендовано для нормального встановлення %(productName)s."
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Ваш розділ %(mount)s занадто малий для форматування для %(format)s (діапазон "
+"можливих розмірів: від %(minSize)d МБ до %(maxSize)d МБ)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"Ваш розділ %(mount)s занадто великий для форматування для %(format)s "
+"(діапазон можливих розмірів: від %(minSize)d МБ до %(maxSize)d МБ)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "Не вдалося додати новий пристрій. Натисніть, щоб дізнатися більше."
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "Необхідно створити завантажувальний розділ."
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"Вашій системі, заснованій на BIOS, потрібен окремий розділ для завантаження "
+"з новим форматом міток дисків %s (GPT). Щоб продовжити встановлення, будь "
+"ласка, створіть розділ типу «BIOS Boot» розміром у 1 МБ."
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"Вами не було вказано розділу резервної пам’яті. Для продовження встановлення "
+"без такого розділу потрібно %(requiredMem)s МБ, маємо лише %(installedMem)s "
+"МБ."
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Ви не вказали розділ резервної пам’яті.  Хоча він не є обов'язковим для "
+"роботи, він може суттєво поліпшити швидкодію системи."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"Принаймні один з ваших пристроїв зберігання резервної області пам’яті "
+"(свопінґу) не має UUID. Причиною цього може бути створення області за "
+"допомогою застарілої версії mkswap. Тані пристрої визначатимуться за шляхом "
+"до пристрою у /etc/fstab, що не є ідеальним, оскільки шлях до такого "
+"пристрою може змінитися через певні обставини. "
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+"Неправильна точка монтування. Каталог %s має розташовуватись у файловій "
+"системі /."
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "Точка монтування \"%s\" має розташовуватись у файловій системі Linux. "
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "Пароль:"
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -610,54 +1381,139 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "Вказаний пароль VNC складався менше ніж з 6 символів.\n"
 "Будь ласка, вкажіть інший пароль. Не заповнюйте, якщо пароль не "
 "використовуватиметься."
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "Не вдалося налаштувати джерело встановлення"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "Помилка під час спроби отримання метаданих пакунків…"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "Джерело встановлення недоступне"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "Встановлення програм"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "Розпочинаємо процедуру встановлення пакунків"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "Потрібно більше місця на наступних файлових системах:\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "Підготовка транзакції з джерела встановлення"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "Встановлення"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "Отримання метаданих пакунків…"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Встановлення"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "Підготовка до встановлення"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "Перевіряємо налаштування носія…"
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "ТИПОВИЙ ЗАГОЛОВОК"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "ЛОКАЛІЗАЦІЯ"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "ЛОКАЛІЗАЦІЯ"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "ПРОГРАМИ"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "СИСТЕМА"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "ПАРАМЕТРИ ЗАПИСУ КОРИСТУВАЧА"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
@@ -666,34 +1522,102 @@ msgstr ""
 "У файловій системі недостатньо місця для встановлення визначеного вами "
 "набору програмного забезпечення. Потрібно ще %s."
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Вузол встановлення"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "Розпочинаємо автоматичне встановлення"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "У режимі командного рядка питання не підтримуються!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr " Повідомте про ваш вибір [«q» — вийти | «c» — продовжити]: "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "Будь ласка, завершіть все, перш ніж продовжити"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "Типовий заголовок вузла"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "Будь ласка, завершіть все, перш ніж продовжити"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Помилка"
 
@@ -717,32 +1641,35 @@ msgstr "так"
 msgid "no"
 msgstr "ні"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "Справді хочете вийти?"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr " Повідомте про ваш вибір [«q» — вийти | «c» — продовжити]: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -758,219 +1685,258 @@ msgstr ""
 "продовжити графічне встановлення, або ж продовжити встановлення у текстовому "
 "режимі?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "Пароль до VNC"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "Будь ласка, вкажіть пароль до VNC. Цей пароль слід буде вказати двічі.\n"
 "Не заповнюйте, якщо пароль не використовуватиметься."
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "Пароль: "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "Пароль (підтвердження): "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "Паролі не збігаються!"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Пароль має складатися принаймні з 6 символів."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Пароль має складатися принаймні з 6 символів."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "Параметри часового поясу"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "Часовий пояс не встановлено."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "Доступні регіони"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "Доступні регіони"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "Записуємо налаштування мережі"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "Дротова (%s), з’єднано"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "Дротова (%s), з’єднано"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "Назва вузла:"
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "Назва вузла"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "Назва вузла"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "Назва вузла є некоректною: %s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "За_вершити налаштовування"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "Шлюз"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "у описі файлової системи відсутнє поле тип"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "Налаштовуємо встановлену систему"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Пароль root:"
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "Пароль встановлено."
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "Обліковий запис root вимкнено."
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "Пароль не встановлено."
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "Будь ласка, виберіть новий пароль root. Пароль слід ввести двічі."
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "Пароль: "
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "Використати все місце"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "Замінити вже створені системи Linux"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "Використати вільне місце"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Місце встановлення"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "Не позначено жодного диска"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "Помилка під час спроби перевірити налаштування носія"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "Помилка під час спроби перевірити налаштування носія"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "Визначено автоматичний розподіл на розділи"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "Визначено нетиповий розподіл на розділи"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
@@ -978,40 +1944,62 @@ msgstr ""
 "Не виявлено дисків. Вимкніть комп’ютер, з’єднайте з ним принаймні один диск "
 "і знову увімкніть його, щоб завершити встановлення."
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 "Не позначено жодного диска, будь ласка, позначте принаймні один диск, на "
 "який слід встановити систему."
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "Зондування носія…"
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "По_значити"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "Створення оновлених даних щодо налаштування сховищ"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "спроба налаштувати сховище завершилася невдало: %s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "Перевіряємо налаштування носія…"
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "Параметри автоматичного поділу"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
@@ -1020,41 +2008,41 @@ msgstr ""
 "Для встановлення потрібні розділи на жорсткому диску. Виберіть місце, куди "
 "буде встановлено систему."
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "Налаштування схеми розділів"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "Налаштування схеми розділів"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "Параметри часового поясу"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "Часовий пояс %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "Часовий пояс не встановлено."
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "Доступні часові пояси у регіоні %s"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "Доступні регіони"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1063,178 +2051,196 @@ msgstr ""
 "Вкажіть числовий код або впишіть назву безпосередньо [b — список регіонів, q "
 "— вийти]: "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Запускати VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Процес встановлення"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "Найближче дзеркало"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "Сервер NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "Помилка під час спроби налаштовування джерела програм"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "Нічого не позначено"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "Встановлення з’єднання…"
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "КД/DVD"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "_Файл ISO:"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "Мережевий час"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "Джерело встановлення недоступне"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "Не вдалося налаштувати джерело встановлення"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "Помилка під час спроби отримання метаданих пакунків…"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "Джерело встановлення недоступне"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "Сервер NFS %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "Параметри монтування NFS:"
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "Не вдалося налаштувати джерело встановлення. Перевірте адресу сховища."
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "пристрій містить каталог /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "Не вдалося налаштувати джерело встановлення"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "З_мінити вибір програмного забезпечення"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "Помилка під час спроби перевірити набір програмного забезпечення"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "Не вказано джерело встановлення"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "Джерело змінено. Будь ласка, перевірте."
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "Нетиповий вибір програм"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "Не вказано джерело встановлення"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "Виберіть робоче середовище"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "Ви_користовувати розпізнавання"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "Вам слід вказати той самий пароль двічі."
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Увага"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1250,36 +2256,36 @@ msgstr "Триває обробка"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\tВстановлення завершено. Натисніть Enter, щоб вийти."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "Типовий заголовок з назвою"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "тестування стану…"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "Новий пристрій"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "Пароль (підтвердження): "
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
@@ -1288,7 +2294,7 @@ msgstr ""
 "Вами вказано надто простий пароль: %s. Натисніть «Виконано» ще раз, якщо "
 "слід використовувати саме цей пароль."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
@@ -1297,70 +2303,58 @@ msgstr ""
 "Вами вказано надто простий пароль: %s. Натисніть «Виконано» ще раз, якщо "
 "слід використовувати саме цей пароль."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "Пароль встановлено."
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "_Перервати встановлення"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "Довідка"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "_Ні"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "_Так"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "ТИПОВИЙ ЗАГОЛОВОК"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "ЛОКАЛІЗАЦІЯ"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "ЛОКАЛІЗАЦІЯ"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "ПРОГРАМИ"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "СИСТЕМА"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "ПАРАМЕТРИ ЗАПИСУ КОРИСТУВАЧА"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 "Будь ласка, заповніть пункти з цією піктограмою, перш ніж рухатися далі."
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "Завершено!"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1369,173 +2363,71 @@ msgstr ""
 "%s успішно встановлено на ваш комп’ютер. Тепер системою можна\n"
 "користуватися! Давайте, перезавантажте комп’ютер і працюйте!"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "Завершено!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "Ви_йти"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "Нове встановлення %s %s"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s успішно встановлено на ваш комп’ютер, але потрібно виконати певне "
+"налаштовування. \n"
+"Після його завершення натисніть, будь ласка, кнопку «Завершити "
+"налаштовування»."
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s успішно встановлено на ваш комп’ютер. Тепер системою можна\n"
+"користуватися! Давайте, перезавантажте комп’ютер і працюйте!"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "Створити групу томів…"
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-"Будь ласка, вкажіть назву вашої групи томів і виберіть принаймні один з "
-"дисків."
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "Група томів:"
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "стовпчик"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-"Налаштування сховища даних вилучено через критичну помилку. Натисніть, щоб "
-"дізнатися більше."
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 "Спроба повторного налаштовування зазнала невдачі. Натисніть, щоб дізнатися "
 "більше."
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "Будь ласка, вкажіть чинну точку монтування."
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "Ця точка монтування є некоректною. Спробуємо іншу?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "Ця точка монтування вже використовується. Спробуємо іншу?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
-"Використання вказаного вами рівня RAID потребує більшої кількості дисків, "
-"ніж вказано зараз."
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "Будь ласка, вкажіть чинну точку монтування."
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "Ця точка монтування є некоректною. Спробуємо іншу?"
+"Налаштування сховища даних вилучено через критичну помилку. Натисніть, щоб "
+"дізнатися більше."
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "Стандартний розділ"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "Диск"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "Немає"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "Вилучити також всі інші файлові системи у корені %s."
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "Ви справді хочете вилучити всі дані з %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "Ви справді хочете вилучити всі дані з %s?"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "РОЗПОДІЛ НА РОЗДІЛИ ВРУЧНУ"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "позначено %d пристрій зберігання даних"
 msgstr[1] "позначено %d пристрої зберігання даних"
 msgstr[2] "позначено %d пристроїв зберігання даних"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1544,131 +2436,121 @@ msgstr ""
 "Після створення точок монтування для вашого встановлення %s %s,\n"
 "тут ви зможете переглянути їхні параметри."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"Область «swap» використовується операційною системою, якщо\n"
-"залишається обмаль оперативної пам’яті."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"Область «boot» призначено для зберігання файлів, потрібних\n"
-"для запуску операційної системи."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr "Область «root» призначено для зберігання файлів системи та програм."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr "Область «home» призначено для зберігання ваших особистих даних."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"Для уможливлення завантаження з дисків з GPT-поділом на обладнанні\n"
-"з BIOS доведеться створити розділ завантаження BIOS."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"На деяких платформах PPC частиною налаштовування завантажувача\n"
-"є створення розділу завантаження PReP."
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi має бути розташовано на пристрої типу %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s має бути розташовано на пристрої %s"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s не можна шифрувати"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "Вам слід створити нову файлову систему на кореневому пристрої."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 "Використання пристроїв типу %s вимагає визначення належного рівня RAID."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 "Не вдалося виконати зміну розмірів пристрою. Натисніть, щоб дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 "Не вдалося виконати повторне форматування пристрою. Натисніть, щоб дізнатися "
 "більше."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "Вказану назву, %s, вже використано."
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "У цій файловій системі не передбачено підтримки міток."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "Не позначено жодного диска"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "Змінювати розміри таких файлових систем не можна."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+"Помилка під час перевірки налаштувань сховища даних. Натисніть, щоб "
+"дізнатися більше."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+"Помилка під час перевірки налаштувань сховища даних. Натисніть, щоб "
+"дізнатися більше."
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "Додано новий %s до вже створеного контейнера %s."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "Не вдалося додати новий пристрій. Натисніть, щоб дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 "Встановлено некоректний розмір розділу. Вам слід вказати коректне ціле число."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 "Не вдалося виконати вилучення пристрою. Натисніть, щоб дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "Назву групи томів %s вже використано. Зміни не збережено."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "вільно у фс"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1677,7 +2559,7 @@ msgstr ""
 "У цьому програмному масиві RAID не вистачає %d з %d складових розділів. Ви "
 "можете вилучити його або вказати інший пристрій."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1686,299 +2568,149 @@ msgstr ""
 "У цій групі LVM не вистачає %d з %d фізичних томів. Ви можете вилучити його "
 "або вказати інший пристрій."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "Не позначено жодного диска."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "Не позначених дисках недостатньо вільного місця."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 "Не вдалося виконати автоматичний поділ. Натисніть, щоб дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "З_мінити вибір програмного забезпечення"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 "Не вдалося розблокувати зашифрований блоковий пристрій. Натисніть, щоб "
 "дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"Ви вибрали налаштовування файлових систем для вашого нового встановлення "
-"%(productName)s вручну. Перш ніж ви розпочнете це налаштовування, варто "
-"витратити хвилинку на вивчення того, як все працює. Дещо доволі суттєво "
-"змінилося.\n"
-"\n"
-"Найважливішою зміною є створення нових файлових систем у один крок. У вас "
-"більше не буде потреби у створення складених пристроїв, зокрема логічних "
-"томів LVM у декілька кроків (фізичний том, потім група томів, потім логічний "
-"том), — тепер достатньо створити логічний том, а налаштовування фізичних "
-"томів та створення групи томів, що їх міститиме, виконає програма. Також "
-"програма коригуватиме розмір групи томів після додавання, вилучення або "
-"зміни розмірів логічних томів. Вам не потрібно буде перейматися нудними "
-"подробицями.\n"
-"\n"
-"\n"
-"Компонування екрана\n"
-"\n"
-"У лівій частині вікна буде показано список операційних систем, які було "
-"виявлено на цьому комп’ютері. Пункт нової системи %(productName)s показано "
-"на початку списку. Ви можете натискати пункти встановлених систем для того, "
-"щоб переглянути список файлових системи відповідної операційної системи.\n"
-"\n"
-"Під списком встановлених систем та точок монтування ліворуч показано кнопки "
-"для додавання нової файлової системи, вилучення позначених файлових систем "
-"та налаштовування позначеної файлової системи.\n"
-"\n"
-"За допомогою правої частини вікна можна налаштовувати поточну позначену "
-"точку монтування.\n"
-"\n"
-"Внизу ліворуч ви побачите резюме щодо дисків, які ви наказали програмі "
-"використати під час встановлення. Ви можете натиснути фрагменти тексту, "
-"позначені синім кольором, щоб переглянути докладні дані щодо вибраних вами "
-"дисків.\n"
-"\n"
-"\n"
-"Створення нової файлової системи на новому пристрої\n"
-"\n"
-"1. Натисніть кнопку «+».\n"
-"2. Вкажіть точку монтування та розмір. (Підказка: наведіть вказівник миші на "
-"поля для введення тексту, щоб переглянути панелі з довідковою інформацією "
-"щодо полів.)\n"
-"3. Виберіть нову точку монтування під пунктом «Нове встановлення "
-"%(productName)s» у лівій частині і налаштуйте її відповідно до ваших "
-"потреб.\n"
-"\n"
-"\n"
-"Повторне форматування пристрою або файлової системи, яка вже існує на диску\n"
-"\n"
-"1. Позначте пункт файлової системи у лівій частині вікна.\n"
-"2. Натисніть пункт «Налаштувати» на панелі налаштовування точки монтування у "
-"правій частині вікна.\n"
-"3. Позначте пункт «Переформатувати», виберіть тип файлової системи і, якщо "
-"потрібно, вкажіть точку монтування у полі «Точка монтування».\n"
-"4. Натисніть кнопку «Застосувати зміни».\n"
-"\n"
-"\n"
-"Встановлення точки монтування для файлової системи, яка вже існує на диску\n"
-"\n"
-"1. Позначте файлову систему зі списку у лівій частині вікна.\n"
-"2. Вкажіть точку монтування у полі «Точка монтування» на панелі "
-"налаштовування точки монтування.\n"
-"3. Натисніть кнопку «Застосувати зміни».\n"
-"\n"
-"\n"
-"Вилучення файлових систем, які вже існують на диску\n"
-"\n"
-"1. Позначте пункт файлової системи, яку ви хочете вилучити у списку, "
-"розташованому у лівій частині вікна.\n"
-"2. Натисніть кнопку «-».\n"
-"\n"
-"Підказка: вилучення пристрою, який вже існує на диску, зі списку «Нове "
-"встановлення %(productName)s» не вилучить його з диска. Таке вилучення лише "
-"поверне пристрій до початкового стану. Для вилучення пристрою, який вже "
-"існує на вашому диску, вам слід позначити його у списку будь-якої іншої "
-"виявленої системи (або гілці «Невідомо») і натиснути кнопку «-».\n"
-"\n"
-"\n"
-"Підказки і настанови\n"
-"\n"
-"Ви можете вказувати розміри нових файлових систем, які перевищуватимуть "
-"загальний об’єм доступного місця. Засіб встановлення спробує якомога точніше "
-"виконати ваші запити.\n"
-"\n"
-"Типово нові пристрої використовують будь-які або всі позначені вами диски.\n"
-"\n"
-"Ви можете змінити перелік дисків, на яких буде розміщено новий пристрій, "
-"натисканням кнопки налаштовування (кнопку з відкруткою на гайковим ключем), "
-"якщо у списку позначено відповідний пристрій.\n"
-"\n"
-"Під час додавання нової точки монтування натисканням кнопки «+» не "
-"заповнюйте поле розміру, щоб для нового пристрою було використано все "
-"доступне вільне місце.\n"
-"\n"
-"Якщо ви вилучите останній пристрій з пристрою-контейнера, подібного до групи "
-"томів LVM, програма автоматично вилучить пристрій-контейнер для того, щоб "
-"звільнити місце для нових пристроїв.\n"
-"\n"
-"Після вилучення з диска останнього розділу цей диск може бути повторно "
-"ініціалізовано новою таблицею розділів, якщо програма вважатиме, що для "
-"цього диска можна визначити кращий тип.\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "ДАТА І ЧАС"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "Некоректний часовий пояс"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "ПО"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 "Якщо ви хочете використовувати NTP, вам слід спочатку налаштувати доступ до "
 "мережі"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "Вами не вказано працездатного сервера NTP"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "МІСЦЕ ДЛЯ ВСТАНОВЛЕННЯ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "позначено %d пристрій зберігання даних"
+msgstr[1] "позначено %d пристрої зберігання даних"
+msgstr[2] "позначено %d пристроїв зберігання даних"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s для перемикання розкладок."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "КЛАВІАТУРА"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "Налаштовування тестових компонувань недоступне."
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "тестування стану…"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "Перемикання розкладок не налаштовано."
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "МОВА"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "Невідомий стан (не вказано)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "Невідомий стан"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "Не керується"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "Недоступне"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "Не вистачає мікрокоду"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "Кабель від’єднано"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "Недоступне"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "Від’єднано"
@@ -2003,155 +2735,171 @@ msgstr "Від’єднуємося"
 msgid "Connection failed"
 msgstr "Спроба встановлення з’єднання зазнала невдачі"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "від’єднано"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "Бездротова"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "від’єднано"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "Адреса IPv4"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "Адреса IPv6"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP-адреса"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Мб/с"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "Немає"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "Слід пройти розпізнавання"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "Пароль: "
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "НАЛАШТУВАННЯ МЕРЕЖІ"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ПАРОЛЬ ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "Пароль встановлено."
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Встановлено пароль root"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Обліковий запис root вимкнено"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Не встановлено пароль root"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "ВИБІР ПРОГРАМ"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "Перевіряємо залежності програмного забезпечення…"
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "Помилка під час спроби перевірити залежності програмного забезпечення"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "Отримання метаданих пакунків…"
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "Отримання метаданих груп…"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "Перевіряємо залежності програмного забезпечення…"
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "Помилка під час спроби перевірити залежності програмного забезпечення"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 "Помилка під час спроби перевірити залежності програмного забезпечення. "
 "Натисніть, щоб ознайомитися з подробицями."
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "У вказаному нижче позначеному для встановлення програмному забезпеченні "
 "виявлено помилки. Ймовірно, причиною цього є помилка\n"
@@ -2159,46 +2907,77 @@ msgstr ""
 "списку для встановлення, змінити\n"
 "джерело для встановлення або вийти з програми для встановлення."
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "_Скасувати"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "Ви_йти"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "З_мінити джерело програм"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "З_мінити вибір програмного забезпечення"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "Налаштовування джерела для встановлення…"
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "Помилка під час спроби отримання метаданих пакунків…"
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "Слід пройти розпізнавання"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "Цей носій є придатним для встановлення з нього системи."
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "Цей носій є непридатним для встановлення з нього системи."
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "ДЖЕРЕЛО ВСТАНОВЛЕННЯ"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "Не вдалося налаштувати джерело встановлення. Перевірте адресу сховища."
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "Помилка при налаштовуванні репозиторію"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "Помилка під час спроби налаштовування джерела програм"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
@@ -2206,98 +2985,80 @@ msgstr ""
 "Не вдалося налаштувати джерело встановлення. Перевірте адресу сховища та "
 "параметри проксі-сервера."
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "Помилка при налаштовуванні репозиторію"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "Помилка під час спроби налаштовування джерела програм"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "Пристрій:"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "Сервер NFS %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "Некоректний часовий пояс"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "Некоректний часовий пояс"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "Некоректний часовий пояс"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "Зачекайте… завантажуємо метадані програмного забезпечення."
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "На позначених вами дисках виявлено такий об’єм вільного місця:"
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "Зачекайте… завантажуємо метадані програмного забезпечення."
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2308,7 +3069,7 @@ msgstr ""
 "місце\n"
 "може бути отримано стисканням або вилученням вже створених розділів."
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2319,7 +3080,7 @@ msgstr ""
 "навіть якщо ви використаєте\n"
 "все доступне вільне місце на всіх позначених дисках."
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2334,39 +3095,46 @@ msgstr ""
 "до вашого набору програмного забезпечення з метою встановлення звуженої "
 "версії <b>%s</b> або перервати встановлення."
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "МІСЦЕ ДЛЯ ВСТАНОВЛЕННЯ"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "Зберігаємо налаштування дисків…"
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "Не вдалося зберегти налаштування сховища даних…"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "Форматування пристрою DASD"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 "Помилка під час перевірки налаштувань сховища даних. Натисніть, щоб "
 "дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 "Помилка під час перевірки налаштувань сховища даних. Натисніть, щоб "
 "дізнатися більше."
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "вільно у фс"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
@@ -2374,7 +3142,7 @@ msgstr[0] "Вибрано %d диск; місткість: %s; вільно: %s"
 msgstr[1] "Вибрано %d диски; місткість: %s; вільно: %s"
 msgstr[2] "Вибрано %d дисків; місткість: %s; вільно: %s"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
@@ -2382,7 +3150,11 @@ msgstr ""
 "Ви наказали засобу встановлення пропустити встановлення завантажувача. "
 "Ймовірно, ви не зможете завантажити вашу систему."
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2392,11 +3164,19 @@ msgstr ""
 "Ви можете змінити компонування\n"
 "областей зберігання даних або завершити роботу програми для встановлення."
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "Ви_йти"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "З_мінити компонування дисків"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2407,53 +3187,53 @@ msgstr ""
 "Ви можете змінити компонування\n"
 "областей зберігання даних або завершити роботу програми для встановлення."
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Гаразд"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "ПАРАМЕТРИ ЗАПИСУ КОРИСТУВАЧА"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "Некоректний часовий пояс"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "ВІТАЄМО У %s %s."
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "ДАНІ"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
@@ -2461,25 +3241,29 @@ msgid ""
 msgstr ""
 "Вами ще не створено жодних точок монтування для вашого встановлення %s %s:"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "Натисніть тут, щоб створити їх автоматично."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 "Або створіть точки монтування нижче за допомогою натискання кнопки з "
 "піктограмою «+»."
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2497,55 +3281,163 @@ msgstr[2] ""
 "<b>%d дисків; місткість: %s; вільно: %s</b> (не зайнято розділами і "
 "файловими системами)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "_Не встановлювати завантажувач"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "З_робити завантажувальним пристроєм"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+"Використання вказаного вами рівня RAID потребує більшої кількості дисків, "
+"ніж вказано зараз."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+"Будь ласка, вкажіть назву вашої групи томів і виберіть принаймні один з "
+"дисків."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "Група томів:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "стовпчик"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "Точка монтування \"%s\" має розташовуватись у файловій системі Linux. "
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "Ця точка монтування вже використовується. Спробуємо іншу?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "Будь ласка, вкажіть чинну точку монтування."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "Ця точка монтування є некоректною. Спробуємо іншу?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "Вилучити також всі інші файлові системи у корені %s."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "Ви справді хочете вилучити всі дані з %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "Ви справді хочете вилучити всі дані з %s?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "Некоректний часовий пояс"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "Ви_йти"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "Вами вказано надто простий пароль: %s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "Паролі не збігаються."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "Зберегти"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "Стиснути"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "Вилучити"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "На пристрої зберігаються дані пакунків для встановлення."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "Створення %(type)s на %(device)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "Неготове"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "Використати вільне місце"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2558,14 +3450,14 @@ msgstr ""
 "встановлення. Вилучення файлової системи призведе до остаточного вилучення "
 "всіх даних, що на ній зберігаються."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2574,353 +3466,762 @@ msgstr[0] "<b>%s диск; %s придатного місця</b> (у файло
 msgstr[1] "<b>%s диски; %s придатного місця</b> (у файлових системах)"
 msgstr[2] "<b>%s дисків; %s придатного місця</b> (у файлових системах)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "Загалом позначено місця для отримання: <b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "Вилучити"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "Зберегти"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "ВСТАНОВЛЕННЯ ДИСТРИБУТИВА"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "НАЗВА"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "ТЕСТОВИЙ"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "Новий пристрій"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 МБ"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 ГБ"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "Новий вибір"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "_Досить"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "П_родовжити"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "З_астосувати зміни"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "НАЛАШТУВАННЯ МЕРЕЖІ"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "Назва групи"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "_Скасувати"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Гаразд"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "ДАТА І ЧАС"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "ПО"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "Додавання і позначення для використання серверів NTP"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "Веб-сервер"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "Працює"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "Використання"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "_Налаштувати…"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "ДАТА І ЧАС"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "Область:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "Область:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "Місто:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "Місто:"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "_Назва мережі"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Назва мережі"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "ДО/ПО"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "ДО/ПО"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-годинний"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "ДО/ПО"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "МІСЦЕ ДЛЯ ВСТАНОВЛЕННЯ"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "Місткість"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "Не з’єднано"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "Ід."
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "Позначений пристрій"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "Нічого не позначено"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>Мітка:</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "Не вистачає мікрокоду"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "_Ні"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "Тип VPN"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "Позначений пристрій"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "резюме"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "пристрій RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Додати"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "Типовий маршрут"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "Маска підмережі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "Швидкість"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "Апаратна адреса"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "На_лаштувати…"
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "Захист"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "_Назва мережі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "Назва мережі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "Ключ захисту"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "_Використовувати як обчислювальний вузол…"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "З_упинити обчислювальний вузол…"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Налаштувати…"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "Постачальник послуг"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Налаштувати…"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "Тип VPN"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "Назва групи"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "Пароль групи"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "Користувач"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Налаштувати…"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "С_посіб"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "_Адреса налаштувань"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "П_роксі-сервер HTTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "Про_ксі-сервер HTTPS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "Прокс_і-сервер FTP"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "_Вузол Socks"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "Записуємо налаштування мережі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "Розблокувати"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "Ре_жим літака"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "Записуємо налаштування мережі"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "Назва вузла:"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "НАЛАШТУВАННЯ МЕРЕЖІ"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2930,206 +4231,61 @@ msgstr ""
 "а отже для того, щоб\n"
 "зробити систему доступною для вас."
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "Типовий маршрут"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "Маска підмережі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "Швидкість"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "Апаратна адреса"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "На_лаштувати…"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "Захист"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "_Назва мережі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "Назва мережі"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "Ключ захисту"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "_Використовувати як обчислювальний вузол…"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "З_упинити обчислювальний вузол…"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "_Налаштувати…"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "Постачальник послуг"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "Тип VPN"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "Шлюз"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "Назва групи"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "Пароль групи"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "Користувач"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "С_посіб"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "_Адреса налаштувань"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "П_роксі-сервер HTTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "Про_ксі-сервер HTTPS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "Прокс_і-сервер FTP"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "_Вузол Socks"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "Розблокувати"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "Ре_жим літака"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "Назва вузла:"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "Ви_користовувати розпізнавання"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "Слід пройти розпізнавання"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "З’єднано"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "ВИБІР ПРОГРАМ"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "Виберіть робоче середовище"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "стовпчик"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "Скасувати і _додати ще дисків"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "ПАРАМЕТРИ ВСТАНОВЛЕННЯ"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>Тип розділу:</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "Зашифрувати мої дані. Пароль буде встановлено пізніше."
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "Визначено нетиповий розподіл на розділи"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "_Отримати місце"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "ПАРАМЕТРИ ВСТАНОВЛЕННЯ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
@@ -3137,79 +4293,146 @@ msgstr ""
 "Тут описано, скільки місця потрібно для поточного набору програмного "
 "забезпечення."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "вільно на диску"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "Вільне місце, яким можна скористатися."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "вільно у фс"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 "Вільне місце, яке є зараз недоступним, але яке можна отримати пересуванням "
 "меж вже створених розділів."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "Тут описано варіанти вибору."
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "Використати вільне місце"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "Ви_йти зі встановлювача"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "Опис пристрою"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "Локальні стандартні диски"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "З_авершити поділ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "За_шифрувати"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "Визначено автоматичний розподіл на розділи"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "З_авершити поділ"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "За_шифрувати"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "Зашифрувати мої дані. Пароль буде встановлено пізніше."
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "Параметри автоматичного поділу"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "резюме"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "Повне резюме даних щодо диска та параметрів…"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "ДОДАВАННЯ РОЗКЛАДКИ КЛАВІАТУРИ"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "Ви можете додати розкладку клавіатури позначенням її у списку нижче:"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "Назва"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "РОЗКЛАДКА КЛАВІАТУРИ"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3218,7 +4441,7 @@ msgstr ""
 "можете пересунути будь-яку з розкладок на вершину списку і зробити її "
 "типовою."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3227,118 +4450,200 @@ msgstr ""
 "засобами стільничного середовища для налаштування клавіатури на час "
 "процедури встановлення."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "назва"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "Додати розкладку"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "Вилучити розкладку"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "Пересунути позначену розкладку вище"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "Додати розкладку"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "Вилучити розкладку"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "Пересунути позначену розкладку вище"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "Пересунути позначену розкладку нижче"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "Переглянути розкладку"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "Налаштовування тестових компонувань недоступне."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "Alt + Shift для перемикання розкладок."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "_Параметри"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Додати"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "ДОДАВАННЯ РОЗКЛАДКИ КЛАВІАТУРИ"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "Ви можете додати розкладку клавіатури позначенням її у списку нижче:"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "Назва"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "Доступні регіони"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "Додати розкладку"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Гаразд"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "ПАРАМЕТРИ ПЕРЕМИКАННЯ РОЗКЛАДОК"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 "Яким комбінаціям клавіш ви надаєте перевагу для перемикання між розкладками "
 "клавіатури?"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "використання"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "опис"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "Параметри монтування NFS:"
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "МОВА"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "назваРідною"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "назваАнглійською"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "Нічого не позначено"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ПАРОЛЬ ROOT"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Пароль root:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "Підтвердження:"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Пароль до VNC"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "Встановлення пароля root"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
@@ -3346,237 +4651,285 @@ msgstr ""
 "Обліковий запис адміністратора (root) використовується для керування "
 "системою. Вкажіть пароль до облікового запису користувача root."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "_Досить"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "ПЕРЕВІРКА НОСІЯ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "Зачекайте, перевіряємо носій даних встановлення…"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Додати"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Гаразд"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "_Увімкнути проксі-сервер HTTP"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>Адреса проксі</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>Приклад:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "Ви_користовувати розпізнавання"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>Користувач</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "Користувач"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>Пароль</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "Пароль: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "ДЖЕРЕЛО ВСТАНОВЛЕННЯ"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "Яким джерелом даних для встановлення ви хочете скористатися?"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "_Автоматично виявити носій для встановлення:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "Пристрій:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>Мітка:</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "Пере_вірити"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "_Файл ISO:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Пристрій:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "Ви_брати ISO"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "У _мережі:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "_Налаштувати проксі-сервер…"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "Це адреса списку _дзеркал."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "Параметри монтування NFS:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "Заповнювати це поле необов’язково."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Сховища учасників проекту Fedora"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "Додати нову точку монтування."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Додати"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "Вилучити позначені точки монтування."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "Ви_лучити"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "Операційна помилка."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "Встановлення пароля root"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "Це адреса списку _дзеркал."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "Назва:"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>Адреса проксі</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "Користувач"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "Пароль: "
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "Ця точка монтування є некоректною. Спробуємо іншу?"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "_Випустіть мене звідси!"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "_Така моя доля, погоджуюся."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "Це нестабільне програмне забезпечення недостатньої якості."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3588,204 +4941,264 @@ msgstr ""
 "боротися. Ця ОС майбутнього не є стабільною ОС, на яку можна покластися. Її "
 "призначено лише для тестування."
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "ВІТАЄМО У %s %s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Яку мову ви хотіли б використовувати під час встановлення?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "Ви_йти"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "П_родовжити"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "Користувач"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "Назва групи"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "Пароль: "
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "Пароль до VNC"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
-msgstr "_Додати точку монтування"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
-msgstr "<b>Бажана місткість:</b>"
+msgid "Add a new mount point."
+msgstr "Додати нову точку монтування."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
-msgstr "<b>Точка монтування:</b>"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Додати"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
-msgstr "ДОДАВАННЯ НОВОЇ ТОЧКИ МОНТУВАННЯ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
-msgstr ""
-"Доступ до інших параметрів налаштовування можна\n"
-"отримати після створення точки монтування нижче."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
-msgstr ""
-"Ця точка монтування вже використовується.\n"
-"Спробувати щось інше?"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
-msgstr "приклад: «20 GB», «500mb» (без лапок)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "Ви_лучити її"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr "З_берегти"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/custom.glade:200
 #, fuzzy
-msgid "CONFIGURE CONTAINER"
-msgstr "НАЛАШТУВАННЯ ТОЧКИ МОНТУВАННЯ"
+msgid "Remove the selected mount point(s)."
+msgstr "Вилучити позначені точки монтування."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/custom.glade:201
 #, fuzzy
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-"Будь ласка, вкажіть назву вашої групи томів і виберіть принаймні один з "
-"дисків."
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "Ви_лучити"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Вільно"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:216
 #, fuzzy
-msgid "RAID Level:"
-msgstr "пристрій RAID"
+msgid "Reload storage configuration from disk."
+msgstr "спроба налаштувати сховище завершилася невдало: %s"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-#, fuzzy
-msgid "Encrypt"
-msgstr "За_шифрувати"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr "Позначений пристрій"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr "Опис пристрою"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
+#: pyanaconda/ui/gui/spokes/custom.glade:361
 #, fuzzy
-msgid "<b>_Label:</b>"
+msgid "Mount _Point:"
+msgstr "<b>Точка монтування:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>Бажана місткість:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
 msgstr "<b>Мітка:</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
+#: pyanaconda/ui/gui/spokes/custom.glade:509
 #, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>Тип пристрою:</b>"
+msgid "Device(s):"
+msgstr "Пристрій:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>Файлова система</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "За_шифрувати"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "Переформатувати"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "Група томів:"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr "Змінити…"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
 #, fuzzy
-msgid "R_AID Level:"
+msgid "_Name:"
+msgstr "Назва:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>Тип пристрою:</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "За_шифрувати"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "Файлова система"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "Переформатувати"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "Група томів:"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "Змінити…"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
 msgstr "пристрій RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
@@ -3793,17 +5206,19 @@ msgstr ""
 "Цей пристрій зашифровано, його дані не можна прочитати без пароля. "
 "Розблокувати дані можна нижче."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
 #, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr "Пароль:"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr "_Розблокувати"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
@@ -3811,297 +5226,574 @@ msgstr ""
 "Запис пристрою не можна редагувати безпосередньо. Вам слід вилучити його або "
 "вибрати інший пристрій."
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "Додати нову точку монтування."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "Вилучити позначені точки монтування."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "Налаштувати відповідну точку монтування."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "_Налаштувати…"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "спроба налаштувати сховище завершилася невдало: %s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "Натисніть, щоб отримати довідку"
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "Довідка"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ДОСТУПНО МІСЦЯ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">ВСЬОГО МІСЦЯ</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "По_значити"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "_Скасувати"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "НАЛАШТУВАННЯ ТОЧКИ МОНТУВАННЯ"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-"Вкажіть один або декілька дисків, на яких може бути розташовано цей пристрій."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Гаразд"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr "IP-адреса"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr "Потрібно вказати назву ініціатора iSCSI"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr "Ви_користовувати розпізнавання"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 #, fuzzy
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr "<span size=\"small\"><b>Приклад:</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr "Користувач"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr "Пароль до VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Користувач"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Пароль до VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
-msgstr ""
+msgstr "Користувач"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
-msgstr ""
+msgstr "Пароль до VNC"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 #, fuzzy
 msgid "Node Name"
 msgstr "Назва мережі"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
 #, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr "Ви_користовувати розпізнавання"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "Користувач"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "Пароль до VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "Користувач"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "Пароль до VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "Користувач"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "Пароль до VNC"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "Спроба встановлення з’єднання зазнала невдачі"
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Гаразд"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Пристрій:"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr "ПОЗНАЧЕНІ ДИСКИ"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr "_Закрити"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr "Завантаження"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr "Опис"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Вільно"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr "Ви_лучити"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr "Тут буде наведено резюме щодо дисків"
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "Ви_лучити її"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "По_значити"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "НАЛАШТУВАННЯ ТОЧКИ МОНТУВАННЯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+"Вкажіть один або декілька дисків, на яких може бути розташовано цей пристрій."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr "_Додати точку монтування"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr "<b>Бажана місткість:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr "<b>Точка монтування:</b>"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr "ДОДАВАННЯ НОВОЇ ТОЧКИ МОНТУВАННЯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+"Доступ до інших параметрів налаштовування можна\n"
+"отримати після створення точки монтування нижче."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+"Ця точка монтування вже використовується.\n"
+"Спробувати щось інше?"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr "приклад: «20 GB», «500mb» (без лапок)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr "З_берегти"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+#, fuzzy
+msgid "CONFIGURE CONTAINER"
+msgstr "НАЛАШТУВАННЯ ТОЧКИ МОНТУВАННЯ"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+#, fuzzy
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+"Будь ласка, вкажіть назву вашої групи томів і виберіть принаймні один з "
+"дисків."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "Назва:"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "пристрій RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+#, fuzzy
+msgid "Encrypt"
+msgstr "За_шифрувати"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Будь ласка, вкажіть чинну точку монтування."
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Гаразд"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "Форматування пристрою DASD"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 "Під час встановлення сталася невідома помилка. Нижче наведено подробиці."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "ПАРОЛЬ ШИФРУВАННЯ ДИСКА"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "Зберегти пароль"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "ПАРОЛЬ ШИФРУВАННЯ ДИСКА"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -4111,7 +5803,19 @@ msgstr ""
 "пароль, яким ви користуватиметеся для отримання доступу до ваших даних під "
 "час запуску операційної системи."
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "Пароль:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "Підтвердження:"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -4121,117 +5825,172 @@ msgstr ""
 "розкладку клавіатури, ймовірно, ви не зможете розшифрувати дані на ваших "
 "дисках після встановлення."
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "ОТРИМАННЯ МІСЦЯ НА ДИСКУ"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Гаразд"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "_Скасувати"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "_Отримати місце"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "ОТРИМАННЯ МІСЦЯ НА ДИСКУ"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "Тут має бути опис."
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "Файлова система"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "Придатне місце"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "Дія"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "Зберегти"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "Вилучити"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "Стиснути"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "Визначено нетиповий розподіл на розділи"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "З_астосувати зміни"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "Пристрій:"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "_Додати точку монтування"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "_Перервати встановлення"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "_Ні"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "_Так"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4239,52 +5998,50 @@ msgstr ""
 "Ви справді хочете перервати процедуру\n"
 "встановлення?"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "Ви_йти"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "РЕЗЮМЕ ЩОДО ВСТАНОВЛЕННЯ"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "Ви_йти"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "_Почати встановлення"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "НАЛАШТУВАННЯ"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "Підготовка до встановлення"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s успішно встановлено на ваш комп’ютер, але потрібно виконати певне "
-"налаштовування. \n"
-"Після його завершення натисніть, будь ласка, кнопку «Завершити "
-"налаштовування»."
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "За_вершити налаштовування"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s успішно встановлено на ваш комп’ютер. Тепер системою можна\n"
-"користуватися! Давайте, перезавантажте комп’ютер і працюйте!"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "П_ерезавантажити"
 
@@ -4300,16 +6057,16 @@ msgstr "Встановити"
 msgid "Install the live CD to your hard disk"
 msgstr "Встановити live CD на жорсткий диск"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "Початок встановлення на жорсткий диск"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "Вітаємо у Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
@@ -4317,25 +6074,26 @@ msgid ""
 msgstr ""
 "Для встановлення %s потрібно %s МБ, але у цій системі вільно лише %s МБ.\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 "Для встановлення %s у графічному режимі потрібно %s МБ, маємо лише %s МБ."
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "Недостатньо оперативної пам’яті"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4349,24 +6107,24 @@ msgstr ""
 "\n"
 " відданої у терміналі адміністративного користувача (root)."
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "Запуск текстового режиму."
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Помилка"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "Змінна DISPLAY не встановлена. Запускається текстовий режим."
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "Графічне встановлення неможливе. Запускається текстовий режим."
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4377,21 +6135,21 @@ msgstr ""
 "створювати власну розмітку диска або зробити вибір набору пакунків. "
 "Використовувати режим VNC натомість?"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "Скористайтеся командою ssh install@%s, щоб розпочати встановлення."
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 "Скористайтеся командою ssh install@<вузол>, щоб продовжити встановлення."
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "Спробувати Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4401,7 +6159,7 @@ msgstr ""
 "Ви можете встановити Fedora зараз або скористатися пунктом «Встановити на "
 "жорсткий диск» на панелі огляду «Діяльність» будь-коли пізніше."
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
@@ -4409,10 +6167,298 @@ msgstr ""
 "Ви можете скористатися пунктом «Встановити на\n"
 "жорсткий диск» на панелі огляду «Діяльність» будь-коли пізніше."
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "Закрити"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr ""
+#~ "Назва комп'ютера повинна починатись з символів в діапазоні 'a-z', 'A-Z' "
+#~ "або 0-9 "
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "Потрібно більше місця на наступних файлових системах:\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "У режимі командного рядка питання не підтримуються!"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "Ця точка монтування є некоректною. Спробуємо іншу?"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "Ви вибрали налаштовування файлових систем для вашого нового встановлення "
+#~ "%(productName)s вручну. Перш ніж ви розпочнете це налаштовування, варто "
+#~ "витратити хвилинку на вивчення того, як все працює. Дещо доволі суттєво "
+#~ "змінилося.\n"
+#~ "\n"
+#~ "Найважливішою зміною є створення нових файлових систем у один крок. У вас "
+#~ "більше не буде потреби у створення складених пристроїв, зокрема логічних "
+#~ "томів LVM у декілька кроків (фізичний том, потім група томів, потім "
+#~ "логічний том), — тепер достатньо створити логічний том, а налаштовування "
+#~ "фізичних томів та створення групи томів, що їх міститиме, виконає "
+#~ "програма. Також програма коригуватиме розмір групи томів після додавання, "
+#~ "вилучення або зміни розмірів логічних томів. Вам не потрібно буде "
+#~ "перейматися нудними подробицями.\n"
+#~ "\n"
+#~ "\n"
+#~ "Компонування екрана\n"
+#~ "\n"
+#~ "У лівій частині вікна буде показано список операційних систем, які було "
+#~ "виявлено на цьому комп’ютері. Пункт нової системи %(productName)s "
+#~ "показано на початку списку. Ви можете натискати пункти встановлених "
+#~ "систем для того, щоб переглянути список файлових системи відповідної "
+#~ "операційної системи.\n"
+#~ "\n"
+#~ "Під списком встановлених систем та точок монтування ліворуч показано "
+#~ "кнопки для додавання нової файлової системи, вилучення позначених "
+#~ "файлових систем та налаштовування позначеної файлової системи.\n"
+#~ "\n"
+#~ "За допомогою правої частини вікна можна налаштовувати поточну позначену "
+#~ "точку монтування.\n"
+#~ "\n"
+#~ "Внизу ліворуч ви побачите резюме щодо дисків, які ви наказали програмі "
+#~ "використати під час встановлення. Ви можете натиснути фрагменти тексту, "
+#~ "позначені синім кольором, щоб переглянути докладні дані щодо вибраних "
+#~ "вами дисків.\n"
+#~ "\n"
+#~ "\n"
+#~ "Створення нової файлової системи на новому пристрої\n"
+#~ "\n"
+#~ "1. Натисніть кнопку «+».\n"
+#~ "2. Вкажіть точку монтування та розмір. (Підказка: наведіть вказівник миші "
+#~ "на поля для введення тексту, щоб переглянути панелі з довідковою "
+#~ "інформацією щодо полів.)\n"
+#~ "3. Виберіть нову точку монтування під пунктом «Нове встановлення "
+#~ "%(productName)s» у лівій частині і налаштуйте її відповідно до ваших "
+#~ "потреб.\n"
+#~ "\n"
+#~ "\n"
+#~ "Повторне форматування пристрою або файлової системи, яка вже існує на "
+#~ "диску\n"
+#~ "\n"
+#~ "1. Позначте пункт файлової системи у лівій частині вікна.\n"
+#~ "2. Натисніть пункт «Налаштувати» на панелі налаштовування точки "
+#~ "монтування у правій частині вікна.\n"
+#~ "3. Позначте пункт «Переформатувати», виберіть тип файлової системи і, "
+#~ "якщо потрібно, вкажіть точку монтування у полі «Точка монтування».\n"
+#~ "4. Натисніть кнопку «Застосувати зміни».\n"
+#~ "\n"
+#~ "\n"
+#~ "Встановлення точки монтування для файлової системи, яка вже існує на "
+#~ "диску\n"
+#~ "\n"
+#~ "1. Позначте файлову систему зі списку у лівій частині вікна.\n"
+#~ "2. Вкажіть точку монтування у полі «Точка монтування» на панелі "
+#~ "налаштовування точки монтування.\n"
+#~ "3. Натисніть кнопку «Застосувати зміни».\n"
+#~ "\n"
+#~ "\n"
+#~ "Вилучення файлових систем, які вже існують на диску\n"
+#~ "\n"
+#~ "1. Позначте пункт файлової системи, яку ви хочете вилучити у списку, "
+#~ "розташованому у лівій частині вікна.\n"
+#~ "2. Натисніть кнопку «-».\n"
+#~ "\n"
+#~ "Підказка: вилучення пристрою, який вже існує на диску, зі списку «Нове "
+#~ "встановлення %(productName)s» не вилучить його з диска. Таке вилучення "
+#~ "лише поверне пристрій до початкового стану. Для вилучення пристрою, який "
+#~ "вже існує на вашому диску, вам слід позначити його у списку будь-якої "
+#~ "іншої виявленої системи (або гілці «Невідомо») і натиснути кнопку «-».\n"
+#~ "\n"
+#~ "\n"
+#~ "Підказки і настанови\n"
+#~ "\n"
+#~ "Ви можете вказувати розміри нових файлових систем, які перевищуватимуть "
+#~ "загальний об’єм доступного місця. Засіб встановлення спробує якомога "
+#~ "точніше виконати ваші запити.\n"
+#~ "\n"
+#~ "Типово нові пристрої використовують будь-які або всі позначені вами "
+#~ "диски.\n"
+#~ "\n"
+#~ "Ви можете змінити перелік дисків, на яких буде розміщено новий пристрій, "
+#~ "натисканням кнопки налаштовування (кнопку з відкруткою на гайковим "
+#~ "ключем), якщо у списку позначено відповідний пристрій.\n"
+#~ "\n"
+#~ "Під час додавання нової точки монтування натисканням кнопки «+» не "
+#~ "заповнюйте поле розміру, щоб для нового пристрою було використано все "
+#~ "доступне вільне місце.\n"
+#~ "\n"
+#~ "Якщо ви вилучите останній пристрій з пристрою-контейнера, подібного до "
+#~ "групи томів LVM, програма автоматично вилучить пристрій-контейнер для "
+#~ "того, щоб звільнити місце для нових пристроїв.\n"
+#~ "\n"
+#~ "Після вилучення з диска останнього розділу цей диск може бути повторно "
+#~ "ініціалізовано новою таблицею розділів, якщо програма вважатиме, що для "
+#~ "цього диска можна визначити кращий тип.\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "НАЛАШТУВАННЯ МЕРЕЖІ"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "Помилка під час спроби отримання метаданих пакунків…"
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "Нічого не позначено"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "Не вистачає мікрокоду"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "Слід пройти розпізнавання"
+
+#~ msgid "column"
+#~ msgstr "стовпчик"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>Тип розділу:</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>Адреса проксі</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>Користувач</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>Пароль</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "Ця точка монтування є некоректною. Спробуємо іншу?"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>Мітка:</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>Файлова система</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "пристрій RAID"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "Налаштувати відповідну точку монтування."
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "Натисніть, щоб отримати довідку"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ДОСТУПНО МІСЦЯ</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">ВСЬОГО МІСЦЯ</span>"
+
 #~ msgid "Completed"
 #~ msgstr "Завершено"
 
@@ -4465,41 +6511,9 @@ msgstr "Закрити"
 #~ msgid "Install on System"
 #~ msgstr "Встановлення системи"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "При налаштовуванні сховища для встановлення виявлено таку помилку:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Продовження встановлення неможливе."
-
 #~ msgid "Exit installer"
 #~ msgstr "Перервати встановлення"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "Встановлення припинено, ймовірно, через проблеми з вашим обладнанням. "
-#~ "Повідомлення про помилку повністю:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " Роботу програми для встановлення буде завершено."
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "Сталася апаратна помилка"
-
 #~ msgid "_Exit installer"
 #~ msgstr "_Перервати встановлення"
 
@@ -4801,9 +6815,6 @@ msgstr "Закрити"
 #~ msgid "Software Development"
 #~ msgstr "Розробка програм"
 
-#~ msgid "Web Server"
-#~ msgstr "Веб-сервер"
-
 #~ msgid "Minimal"
 #~ msgstr "Мінімально"
 
@@ -4847,50 +6858,6 @@ msgstr "Закрити"
 #~ "вилучити:\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Ви не вказали кореневий розділ (/), який вимагається для продовження "
-#~ "встановлення %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Ваш кореневий розділ менше ніж 250 мегабайтів, чого, зазвичай, дуже мало "
-#~ "для встановлення %s."
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "Для цієї платформи потрібна тека /boot на окремому розділі або логічному "
-#~ "томі. Якщо ви не бажаєте створювати том /boot, вам слід розташувати "
-#~ "кореневу теку (/) на окремому розділі, який не є частиною LVM."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "Розмір розділу %(mount)s менший ніж %(size)s мегабайтів, що менше ніж "
-#~ "рекомендовано для нормального встановлення %(productName)s."
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Ваш розділ %(mount)s занадто малий для форматування для %(format)s "
-#~ "(діапазон можливих розмірів: від %(minSize)d МБ до %(maxSize)d МБ)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "Ваш розділ %(mount)s занадто великий для форматування для %(format)s "
-#~ "(діапазон можливих розмірів: від %(minSize)d МБ до %(maxSize)d МБ)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr ""
@@ -4907,59 +6874,6 @@ msgstr "Закрити"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "вами не було створено пристрою призначення для завантажувача stage1"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "Необхідно створити завантажувальний розділ."
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "Вашій системі, заснованій на BIOS, потрібен окремий розділ для "
-#~ "завантаження з новим форматом міток дисків %s (GPT). Щоб продовжити "
-#~ "встановлення, будь ласка, створіть розділ типу «BIOS Boot» розміром у 1 "
-#~ "МБ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "Вами не було вказано розділу резервної пам’яті. Для продовження "
-#~ "встановлення без такого розділу потрібно %(requiredMem)s МБ, маємо лише "
-#~ "%(installedMem)s МБ."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Ви не вказали розділ резервної пам’яті.  Хоча він не є обов'язковим для "
-#~ "роботи, він може суттєво поліпшити швидкодію системи."
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "Принаймні один з ваших пристроїв зберігання резервної області пам’яті "
-#~ "(свопінґу) не має UUID. Причиною цього може бути створення області за "
-#~ "допомогою застарілої версії mkswap. Тані пристрої визначатимуться за "
-#~ "шляхом до пристрою у /etc/fstab, що не є ідеальним, оскільки шлях до "
-#~ "такого пристрою може змінитися через певні обставини. "
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr ""
-#~ "Неправильна точка монтування. Каталог %s має розташовуватись у файловій "
-#~ "системі /."
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr ""
-#~ "Точка монтування \"%s\" має розташовуватись у файловій системі Linux. "
-
 #~ msgid "Linux on %s"
 #~ msgstr "Linux на %s"
 
@@ -4969,12 +6883,6 @@ msgstr "Закрити"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s для %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "Форматування пристрою DASD"
-#~ msgstr[1] "Форматування пристроїв DASD"
-#~ msgstr[2] "Форматування пристроїв DASD"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "Підготовка %d пристрою DASD для використання з Linux..."
@@ -5254,9 +7162,6 @@ msgstr "Закрити"
 #~ msgid "Error setting root password"
 #~ msgstr "Помилка під час спроби встановлення пароля root"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "Вам слід вказати той самий пароль двічі."
-
 #~ msgid "_Remove Packages"
 #~ msgstr "Ви_лучити пакунки"
 
@@ -5291,24 +7196,12 @@ msgstr "Закрити"
 #~ msgid "%s of %s"
 #~ msgstr "%s з %s"
 
-#~ msgid "Region:"
-#~ msgstr "Область:"
-
-#~ msgid "City:"
-#~ msgstr "Місто:"
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-годинний"
-
-#~ msgid "AM/PM"
-#~ msgstr "ДО/ПО"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "Виберіть додатки"
 
@@ -5396,9 +7289,6 @@ msgstr "Закрити"
 #~ msgid "configureButton"
 #~ msgstr "Кнопка налаштовування"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "З_авершити поділ"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "НАЛАШТУВАННЯ ГРУПИ ТОМІВ"
 
diff --git a/anaconda/po/ur.po b/anaconda/po/ur.po
index 8b00858..7d39321 100644
--- a/anaconda/po/ur.po
+++ b/anaconda/po/ur.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Urdu <trans-urdu@lists.fedoraproject.org>\n"
@@ -19,208 +19,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "شروع ھے VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "ٹیکسٹ مووڈ استمال کریں "
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "درست"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -229,85 +462,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -316,7 +841,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -330,8 +860,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "امداد"
 
@@ -369,28 +899,22 @@ msgstr "امداد کے لیے سسٹم"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "درست"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "اخراج"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -403,7 +927,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -412,28 +936,206 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "مدادی موڈ"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "ڈیرکٹری کے  ماتحت ماونُٹ ہو گیا ہے۔  %s  آپ کا سسٹم"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"تنصیب کے لیےُ ناکافی ہے۔ %s آپ کی روٹ پارٹیشن 250 میگابایٹُز سے کم ہے جو کہ "
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"آپ نے روٹ پارٹیشن  (/) کی تعریف نہیں کی، جو کہ  تنصیب %s کے جاری رہنے کے "
+"لیےُ  ضروری "
+"ہے۔                                                                                                                                                       "
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"تنصیب کے لیےُ ناکافی ہے۔ %s آپ کی روٹ پارٹیشن 250 میگابایٹُز سے کم ہے جو کہ "
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"آپ نے سوُیپ پارٹیشن منتخب نہیں کی۔ یہ تمام حالتوں میں لازمی نہیں چاہیے، یہ "
+"بیشتر تنصیبات کی کارکردگی بہتر بنا سکتی ہے۔"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -525,84 +1227,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "انسٹالیش کی پیش رفت"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "انسٹالیش کی پیش رفت"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "!کمانڈ لاین موڈ میں سوال نھیں ھو سکتا"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "نقص"
 
@@ -626,31 +1473,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -665,447 +1514,520 @@ msgstr ""
 "کرے اور گرافیکل تنصیب کرے یا ٹیکسٹ موڈ تنصیب کے ساتھ جاری رہے؟ VNC آپ کی "
 "مشین پر شروع ہونے سے قاصر ہے۔ کیا آپ X "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "خفیہ الفاظ کم از کم چھ حروف پر مشتمل ھونا چاھیے"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "خفیہ الفاظ کم از کم چھ حروف پر مشتمل ھونا چاھیے"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "انسٹالیش کی پیش رفت"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "شروع ھے VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "انسٹالیش کی پیش رفت"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "سافٹ ویُر کی تعمیر"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "خبردار"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1120,580 +2042,405 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "سافٹ ویُر کی تعمیر"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1720,277 +2467,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "سافٹ ویُر کی تعمیر"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1998,14 +2769,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2014,128 +2785,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "درست"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2146,68 +2937,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2215,945 +3101,1348 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "جاری رکھو _"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "درست"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "ٹیکسٹ مووڈ استمال کریں "
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "ڈواس RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_جمع"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "جاری رکھو _"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "جاری رکھو _"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "جاری رکھو _"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "منسلک"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "خبردار"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_جمع"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "درست"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_جمع"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "درست"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "ڈواس RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_جمع"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3161,643 +4450,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "کون سی زبان کا اپ استعمال کر نا چاہتے ہیں؟"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "جاری رکھو _"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "خالی"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "ڈواس RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_جمع"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "ڈواس RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "ڈواس RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "ڈواس RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "درست"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "درست"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "ڈواس RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "خالی"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "ڈواس RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "درست"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "درست"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "انسٹالیش کی پیش رفت"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Re_boot"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3811,40 +5463,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3853,60 +5506,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "نقص"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "!کمانڈ لاین موڈ میں سوال نھیں ھو سکتا"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "ڈواس RAID"
+
 #~ msgid "Completed"
 #~ msgstr "ختم ھوا"
 
@@ -3927,9 +5587,6 @@ msgstr ""
 #~ msgstr[0] "%s بائیٹ"
 #~ msgstr[1] "%s بائیٹ"
 
-#~ msgid "Re_boot"
-#~ msgstr "Re_boot"
-
 #~ msgid "_Retry"
 #~ msgstr "دوبارہ کوشش کریں _"
 
@@ -3949,28 +5606,6 @@ msgstr ""
 #~ msgstr ""
 #~ "آپ ایل ڈی ایل کی پارٹیشن جو کہ ڈی اے ایس ڈی فارمیٹیڈ ہے ختم نہیں کر سکتے"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "آپ نے روٹ پارٹیشن  (/) کی تعریف نہیں کی، جو کہ  تنصیب %s کے جاری رہنے کے "
-#~ "لیےُ  ضروری "
-#~ "ہے۔                                                                                                                                                       "
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "تنصیب کے لیےُ ناکافی ہے۔ %s آپ کی روٹ پارٹیشن 250 میگابایٹُز سے کم ہے جو کہ "
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "آپ نے سوُیپ پارٹیشن منتخب نہیں کی۔ یہ تمام حالتوں میں لازمی نہیں چاہیے، یہ "
-#~ "بیشتر تنصیبات کی کارکردگی بہتر بنا سکتی ہے۔"
-
 #~ msgid "Back"
 #~ msgstr "واپس"
 
diff --git a/anaconda/po/vi.po b/anaconda/po/vi.po
index 7fcb484..2141cc1 100644
--- a/anaconda/po/vi.po
+++ b/anaconda/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/fedora/"
@@ -20,208 +20,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "Khởi động VNC..."
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "Dùng chế độ văn bản"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "Đồng ý"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -230,85 +463,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -317,7 +842,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -332,8 +862,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Phục hồi"
 
@@ -371,28 +901,22 @@ msgstr "Hệ thống cần phục hồi"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "Đồng ý"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Thoát"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -405,7 +929,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -414,28 +938,204 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Chế độ phục hồi"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Hệ thống của bạn được gắn vào thư mục %s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "Partition gốc ít hơn 250 megabyte, thường là quá nhỏ để cài đặt %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Bạn chưa định nghĩa parition gốc (/), cần thiết để có thể tiếp tục cài đặt "
+"%s."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr "Partition gốc ít hơn 250 megabyte, thường là quá nhỏ để cài đặt %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Bạn chưa chọn partition swap. Mặc dù không bắt buộc phải có partition swap, "
+"nhưng partition swap sẽ cải thiện đáng kể tốc độ trong hầu hết các bản cài "
+"đặt."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -525,84 +1225,228 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "_Fedora"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Quá trình cài đặt"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Quá trình cài đặt"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Không thể đặt câu hỏi ở chế độ dòng lệnh!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Lỗi"
 
@@ -626,31 +1470,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -665,447 +1511,520 @@ msgstr ""
 "nối tới máy này từ một máy khác và tiến hành cài đặt trên giao diện đồ hoạ "
 "hay tiếp tục cài đặt ở chế độ văn bản?"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "Mật khẩu phải dài ít nhất 6 ký tự."
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "Mật khẩu phải dài ít nhất 6 ký tự."
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "Quá trình cài đặt"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "Khởi động VNC..."
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Quá trình cài đặt"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "Software Development"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Cảnh báo"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1120,579 +2039,402 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "Software Development"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1719,277 +2461,301 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "Software Development"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1997,14 +2763,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2013,127 +2779,147 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "Đồng ý"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2143,1013 +2929,1511 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Tiếp tục"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "Đồng ý"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "Dùng chế độ văn bản"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Thiết bị RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Thêm"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Tiếp tục"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Tiếp tục"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Tiếp tục"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Hoàn tất!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Cảnh báo"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Thêm"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "Đồng ý"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Thêm"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "Đồng ý"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Thiết bị RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Thêm"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3157,643 +4441,1006 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Bạn muốn dùng ngôn ngữ nào khi cài đặt?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Tiếp tục"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Trống"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Thiết bị RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Thêm"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Thiết bị RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Thiết bị RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Thiết bị RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "Đồng ý"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "Đồng ý"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Thiết bị RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Trống"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Thiết bị RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "Đồng ý"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "Đồng ý"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Quá trình cài đặt"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
-msgstr ""
+msgstr "Khởi động _lại"
 
 #: data/liveinst/liveinst.desktop.in.h:1
 msgid "Install to Hard Drive"
@@ -3807,40 +5454,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3849,60 +5497,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Lỗi"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Không thể đặt câu hỏi ở chế độ dòng lệnh!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Thiết bị RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Hoàn tất"
 
@@ -3922,9 +5577,6 @@ msgstr ""
 #~ msgid_plural "%s Bytes"
 #~ msgstr[0] "%s Byte"
 
-#~ msgid "Re_boot"
-#~ msgstr "Khởi động _lại"
-
 #~ msgid "_Retry"
 #~ msgstr "Thử _lại"
 
@@ -3943,26 +5595,5 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Không thể xoá partition kiểu LDL formatted DASD."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Bạn chưa định nghĩa parition gốc (/), cần thiết để có thể tiếp tục cài "
-#~ "đặt %s."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "Partition gốc ít hơn 250 megabyte, thường là quá nhỏ để cài đặt %s."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Bạn chưa chọn partition swap. Mặc dù không bắt buộc phải có partition "
-#~ "swap, nhưng partition swap sẽ cải thiện đáng kể tốc độ trong hầu hết các "
-#~ "bản cài đặt."
-
 #~ msgid "Back"
 #~ msgstr "Lùi"
diff --git a/anaconda/po/zh_CN.po b/anaconda/po/zh_CN.po
index 9d8b49a..b726fa6 100644
--- a/anaconda/po/zh_CN.po
+++ b/anaconda/po/zh_CN.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-05 11:23+0000\n"
 "Last-Translator: Tiansworld <tiansworld@fedoraproject.org>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
@@ -29,216 +29,483 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot 文件系统"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "含有 '%s' 的 RAID 集必须具有以下 RAID 级别之一：%s。"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr "含有 '%s' 的 RAID 集必须具有以下元数据版本之一：%s。"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "含有 '%s' 的 RAID 集必须具有以下设备类型之一：%s。"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s 必须拥有以下磁盘标签类型之一：%s。"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s 不能是 %s 类型。"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s 必须挂载到其中一个 %s 上。"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s 必须在 %d 到 %d MB 之间"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s 绝不能小于 %dMB。"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s 绝不能大于 %dMB。"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s 必须位于磁盘的前 %dMB。"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s 必须在主分区。"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s 不能位于加密的块设备上。"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s 不能是 %s 类型。"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "当在 %3s 上使用 %2s 文件系统时，%1s 没有足够的空间供 grub2 嵌入 core.img"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "启动 VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "使用文本模式"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "密码已设置"
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "两次输入的密码不匹配！"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "您刚输入了一个弱密码：%s。 再次单击完成按钮继续使用该密码。"
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "您刚输入了一个弱密码：%s。 再次单击完成按钮继续使用该密码。"
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "弱"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "适中"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "好"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "强"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "确定"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "是(_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "否(_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"设置安装库时出现如下错误：\n"
+"\n"
+"%(e)s\n"
+"\n"
+"安装无法继续。"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"设置安装库时出现如下错误：\n"
+"\n"
+"%(e)s\n"
+"\n"
+"安装无法继续。"
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"以下标记安装的软件发生错误。 这很可能是由于您的安装源发生错误。\n"
+"您可以尝试从安装配置中移除这些软件包，\n"
+"更换您的安装源，或退出安装程序。"
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"由于您的硬件可能存在问题导致安装停止。详细错误信息如下：\n"
+"\n"
+"%s。\n"
+"\n"
+"安装程序将停止。"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"由于您的硬件可能存在问题导致安装停止。详细错误信息如下：\n"
+"\n"
+"%s。\n"
+"\n"
+"安装程序将停止。"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "遇到硬件错误"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"由于您的硬件可能存在问题导致安装停止。详细错误信息如下：\n"
+"\n"
+"%s。\n"
+"\n"
+"安装程序将停止。"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "正在配置已安装系统"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "正写入网络配置"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "创建用户"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "正在配置已安装系统"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "运行安装前脚本"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "正在设置安装源..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "正在安装引导程序"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "正在执行安装后设置任务"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "正在安装引导程序"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "证书托管 %s 需要网络 。"
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -250,30 +517,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "%s 缺失。无法设置防火墙。"
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "%s 缺失。无法设置防火墙。"
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "该文件系统不支持标签。"
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "指定名称 %s 已被使用。"
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "卷组名 %s 已经在使用。未保存更改。"
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "运行安装前脚本"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "主机名不能为无或使用空白字符串。"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "主机名的长度必须小于 255 个字符。"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "主机名只能以“a-z”、“A-Z”或者“0-9”范围内的有效字符开头"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -282,55 +841,55 @@ msgstr ""
 "主机名只能包含 'a-z', 'A-Z', '0-9', '-'（英文减号）, 或者 '.'（英文点号），其"
 "中两个点号中不能为空且不能以'-'开头或结尾"
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "未知"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "正在断开连接..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "有线 (%s) 已连接"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "已无线连接至 %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "未连接"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "没有可用的网络设备。"
 
@@ -339,7 +898,12 @@ msgstr "没有可用的网络设备。"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s 安装"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "新 %s %s 安装"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "在您完成后运行 %s 命令来卸载文件系统。"
@@ -352,8 +916,8 @@ msgstr "结束后请退出 shell，您的系统将重新启动。"
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "未找到要运行的 /bin/sh ！没有启动 shell"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "救援"
 
@@ -398,21 +962,15 @@ msgstr "要援救的系统"
 msgid "Which device holds the root partition of your installation?"
 msgstr "哪个设备含有安装系统的根分区？"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "确定"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "退出"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "当您退出 shell 时，系统将自动重新引导。"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -421,7 +979,7 @@ msgstr ""
 "系统中存在未挂载的问题文件系统， 按回车键进入 shell，您便可以执行 fsck 命令并"
 "挂载分区。%s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -441,7 +999,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -454,28 +1012,226 @@ msgstr ""
 "\n"
 "请按 <回车> 键进入 shell。"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "您没有任何 Linux 分区。重启。\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "当您退出 shell 时，系统将自动重新引导。"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "救援模式"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "您的计算机没有任何 Linux 分区。按回车键可打开 shell。%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "您的系统被挂载在 %s 目录之下。"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "标准分区"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "磁盘"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+"您计算机中的交换分区是供\n"
+"操作系统在内存不足时使用的区域。"
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+"您计算机中的 boot 区域是保存启动\n"
+"操作系统所需文件的地方。"
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+"您计算机中的 root 区域是保存核心\n"
+"系统文件和应用程序的地方。"
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+"您计算机中的 home 区域是保存\n"
+"个人数据的地方。"
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr "要启用 BIOS 硬件的 GPT 分区引导，则需要磁盘中BIOS 引导分区。"
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr "有些 PPC 平台中的引导装载程序配置需要 PReP 引导分区。"
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "您的根分区小于 250 MB，这个空间通常太小，不足以安装 %s。"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "您还没有指定继续安装 %s 所必需的根分区 (/)。"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"该平台需要 /boot 位于独立的分区或逻辑卷上。如果您并不想要单独的 /boot 卷，那"
+"您就必须将 / 置于非 LVM 分区上。"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"您的 %(mount)s 分区小于 %(size)s MB，小于正常安装 %(productName)s 的建议值。"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"您的 %(mount)s 分区太小，%(format)s 无法格式化（允许大小为 %(minSize)d MB 到 "
+"%(maxSize)d MB）"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"您的 %(mount)s 分区太大，%(format)s 无法格式化（允许大小为 %(minSize)d MB 到 "
+"%(maxSize)d MB）"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "添加新设备设备。点击查看详情。"
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "您还没有创建可引导分区。"
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"您的计算机基于 BIOS，它需要专门的分区来引导 %s 的新磁盘标识格式 (GPT)。如要继"
+"续，请先创建一个大小为 1MB，类型为“BIOS 引导”的分区。"
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"您还没有指定 swap 分区。在没有 swap 分区时，安装需要 %(requiredMem)sMB 内存才"
+"能继续，但您的计算机当前只有 %(installedMem)sMB 内存。"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"您尚未指定一个交换分区。虽然并非在所有情况下都需要，但在大多数情况会显著提高"
+"系统性能。"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"您的 swap 设备中至少有一个没有 UUID，此问题常见于使用较早版本的 mkswap 创建"
+"的 swap 空间。这些设备将会在 /etc/fstab 中依据设备路径进行指定。由于设备路径"
+"可能会在不同环境下变化，因此这不是理想的做法。"
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "此挂载点无效。%s 目录必须在 / 文件系统中。"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "挂载点 %s 必须在 Linux 文件系统中。"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "口令："
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -587,87 +1343,238 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "提供的 VNC 密码不满足至少 6 个字符的长度要求。\n"
 "请输入一个新的。 如果无需密码请留空。"
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "Fedora (_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "红帽企业版 Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "设置安装源失败"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "下载软件包元数据出错......"
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "没有可用安装源"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "正在安装软件"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "启动软件包安装进程"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "以下文件系统需要更多空间：\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "准备从安装源传送"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "正在安装"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "正在下载软件包元数据......"
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "正在安装"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "准备安装"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "正在检查存储配置..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "默认标题"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "本地化"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "本地化"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "软件"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "系统"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "用户设置"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr "在文件系统没有足够的空间来满足当前软件选择。仍需要的额外空间为 %s 。"
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "安装中心"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "正在开始自动安装"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "命令行模式下不能有任何疑问或问题！"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "请从上方选择 [q 为停止 | c 为继续]："
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "继续前请完成所有会话"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "默认HUB 标题"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "继续前请完成所有会话"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "错误"
 
@@ -691,32 +1598,35 @@ msgstr "yes"
 msgid "no"
 msgstr "no"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "您确定要停止吗？"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "请从上方选择 [q 为停止 | c 为继续]："
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -730,297 +1640,358 @@ msgstr ""
 "X 无法在您的机器上运行。您打算从另一台计算机上运行 VNC 连接到此计算机以执行图"
 "形化安装，还是继续进行文本模式安装？"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC 密码"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "请提供 VNC 密码。您需要输入两次。\n"
 "无密码时请留空白"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "密码："
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "密码 (确认)："
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "两次输入的密码不匹配！"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "密码至少应包含六个字符。"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "密码至少应包含六个字符。"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "时区设置"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "未设置时区"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "可选地区"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "可选地区"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "正写入网络配置"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "有线 (%s) 已连接"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "有线 (%s) 已连接"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "主机名："
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "主机名"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "主机名"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "主机名无效：%s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "结束配置(_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "网关"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "文件系统配置缺少类型"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "正在配置已安装系统"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "root 密码："
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "密码已设置"
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "root 账户已禁用。"
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "密码尚未设置。"
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "请设置新 root 密码。您需要输入两次。"
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "密码："
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "使用全部空间"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "替换现有 Linux 系统"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "使用空闲空间"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "安装目标位置"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "没有选择磁盘"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "检查存储配置出错"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "检查存储配置出错"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "已选择自动分区"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "已选择自定义分区"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr "没有检测到磁盘。请关闭计算机并至少连接一块磁盘后，重新启动进行安装。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "没有选择磁盘，要安装系统请至少选择一个磁盘。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "正在探测存储......"
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "选择(_S)"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "正在生成更新后的存储配置"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "存储配置失败：%s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "正在检查存储配置..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "自动分区选项"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr "安装需要对您的硬盘进行分区。请选择要用于安装的磁盘空间。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "分区方案配置"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "分区方案配置"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "时区设置"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s 时区"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "未设置时区"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "%s 地区中的可选时区"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "可选地区"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1028,178 +1999,196 @@ msgstr ""
 "请选择时区。\n"
 "直接使用数字或输入名称 [b 为地区列表，q 为停止]："
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "启动 VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "安装过程"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "最近的镜像"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS 服务器 %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "设置软件源出错"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "未选择"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "正在连接..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD 驱动器"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO 文件(_I)："
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "网络时间"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "没有可用安装源"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "设置安装源失败"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "下载软件包元数据出错......"
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "没有可用安装源"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS 服务器 %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS 挂载选项："
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "设置安装源失败，请查看库 url。"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "设备包含 /boot 分区"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "设置安装源失败"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "修改软件选择(_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "检查软件选择出错"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "没有设置安装源"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "源已更改 - 请验证"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "已选择自定义软件"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "没有设置安装源"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "选择您的安装环境"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "使用认证(_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "您必须提供密码并确认。"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "警告"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1215,112 +2204,100 @@ msgstr "进行中"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\t安装完成。请按回车键退出"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "默认称谓"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "正在测试状态..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "新设备"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "密码 (确认)："
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "您刚输入了一个弱密码：%s。 再次单击完成按钮继续使用该密码。"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "您刚输入了一个弱密码：%s。 再次单击完成按钮继续使用该密码。"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "密码已设置"
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "退出安装程序(_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "帮助"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "否(_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "默认标题"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "本地化"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "本地化"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "软件"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "系统"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "用户设置"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "请先完成带有此图标标记的内容再进行下一步。"
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "完成！"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1329,163 +2306,63 @@ msgstr ""
 "已成功在您计算机上安装 %s 并等候您的使用！\n"
 "重启后即可开始！"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "完成！"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "新 %s %s 安装"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"已在您的系统中成功安装 %s，但仍需要执行一些配置。请完成它们，然后点击“结束配"
+"置”按钮。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"已成功在您计算机上安装 %s 并等候您的使用！\n"
+"重启后即可开始！"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "创建新卷组..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr "请为您的卷组起个名字，然后在下方至少选择一个磁盘。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "卷组："
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "栏"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr "由于不可恢复的错误而重新设置存储配置。点击查看详情。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr "设备重新配置失败。点击查看详情。"
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "请输入一个有效的挂载点。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "那个挂载点无效。要尝试其他挂载点吗？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "那个挂载点已在使用中。要尝试其他挂载点吗？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "您选择的 RAID 等级所需磁盘超过您目前选择的磁盘。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "请输入一个有效的挂载点。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "那个挂载点无效。要尝试其他挂载点吗？"
+"Storage configuration reset due to unrecoverable error. Click for details."
+msgstr "由于不可恢复的错误而重新设置存储配置。点击查看详情。"
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "标准分区"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "磁盘"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "无"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "同时删除位于 %s root 下的所有文件系统。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "您确定要删除 %s 中的所有数据吗？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "您确定要删除 %s 中的所有数据吗？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "手动分区"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "已选择 %d 存储设备"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
@@ -1494,402 +2371,258 @@ msgstr ""
 "当您为 %s %s 安装创建挂载点时，\n"
 "可在此查看其详情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-"您计算机中的交换分区是供\n"
-"操作系统在内存不足时使用的区域。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-"您计算机中的 boot 区域是保存启动\n"
-"操作系统所需文件的地方。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-"您计算机中的 root 区域是保存核心\n"
-"系统文件和应用程序的地方。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-"您计算机中的 home 区域是保存\n"
-"个人数据的地方。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr "要启用 BIOS 硬件的 GPT 分区引导，则需要磁盘中BIOS 引导分区。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr "有些 PPC 平台中的引导装载程序配置需要 PReP 引导分区。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi 必须位于 %s 类型的设备上"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s 必须位于 %s 类型的设备上"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s 无法加密"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "您必须在根设备上创建新文件系统。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "类型 %s 设备需要选择有效 RAID 等级。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "请求重新定义设备大小失败。点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "请求重新格式化设备失败。点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "指定名称 %s 已被使用。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "该文件系统不支持标签。"
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "没有选择磁盘"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "该文件系统可能无法重新定义大小。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "检查存储配置时出错。 点击查看详情。"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "检查存储配置时出错。 点击查看详情。"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "添加新 %s 至已有容器 %s。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "添加新设备设备。点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "无效分区大小。使用有效整数。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "删除设备请求失败。点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "卷组名 %s 已经在使用。未保存更改。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "可用空间"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr "此设备无法直接编辑。您可以将其移除或选择其它设备。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr "此设备无法直接编辑。您可以将其移除或选择其它设备。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "尚未选择任何磁盘。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "所选磁盘中没有足够剩余空间。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "自动分区失败。点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "修改软件选择(_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "解锁加密块设备时失败。点击查看详细信息"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"您选择为 %(productName)s 的安装进行手动文件系统设置。在开始之前，您应该花些时"
-"间了解一下关于设置方面的内容。因为这些内容有了很大变化。\n"
-"\n"
-"最重要的变化当属简化了新文件系统的创建过程。您不必再为创建像 LVM 逻辑卷那样的"
-"复杂设备而花上好多步骤了（创建物理卷，然后卷组，然后逻辑卷）-- 现在您只需创建"
-"逻辑卷，剩下的设置物理卷及包含它的卷组等费力工作均由我们为您完成。同时当您增"
-"加、删除及调整逻辑卷大小时我们也会为您相应的调整卷组，您不必担心这些细节。\n"
-"\n"
-"\n"
-"屏幕布局\n"
-"\n"
-"位于屏幕左手一侧显示了我们能在计算机上检测到的操作系统。而全新 "
-"%(productName)s 安装则位于此列表的顶部。通过点击这些系统的名称，您可以看到它"
-"们包含了什么文件系统。\n"
-"\n"
-"在左侧各个安装系统及挂载点下方，有按钮可用来添加新文件系统，删除或配置已选择"
-"的文件系统。\n"
-"\n"
-"屏幕右侧是您用来自定义当前所选挂载点的区域。\n"
-"\n"
-"左下角会显示您选择用于此次系统安装的磁盘摘要。通过点击蓝色文字可以看到有关已"
-"选磁盘的更详细信息。\n"
-"\n"
-"\n"
-"如何在新设备上创建新文件系统\n"
-"\n"
-"1. 点击“+”按钮\n"
-"2. 输入挂载点及大小。（提示：将鼠标指针放在任意一处文本上时会显示帮助。）\n"
-"3. 在屏幕左侧的“全新 %(productName)s 安装“下方选择新建挂载点然后对其进行调整"
-"以满足您的需要。\n"
-"\n"
-"\n"
-"如何重新格式化磁盘上已有的设备/文件系统\n"
-"\n"
-"1. 从屏幕左侧选择文件系统。\n"
-"2. 在屏幕右侧挂载点自定义区域点击“自定义”。\n"
-"3. 选中“重新格式化”多选框，选择文件系统类型，如果适用的话在“挂载点”输入框内输"
-"入挂载点。\n"
-"4. 点击“应用更改”\n"
-"\n"
-"\n"
-"如何为磁盘已有文件系统设置挂载点\n"
-"\n"
-"1. 从屏幕左侧选择文件系统。\n"
-"2. 在挂载点自定义区域内的“挂载点”输入框内输入挂载点。\n"
-"3. 点击“应用更改”\n"
-"\n"
-"\n"
-"如何删除磁盘中的已有文件系统\n"
-"\n"
-"1. 在屏幕左侧选择您要删除的文件系统。\n"
-"2. 点击“-”按钮\n"
-"\n"
-"提示：从“全新 %(productName)s 安装”下移除磁盘上已有的设备并不会把它从磁盘上删"
-"除。仅仅会把该设备重设到它的原始状态。要真正删除您磁盘上已有的设备，您必须在"
-"下方任何一个检测到的已有系统（或叫做“未知系统”）下选择该设备，然后点击“-”按"
-"钮。\n"
-"\n"
-"\n"
-"技巧和提示\n"
-"\n"
-"您可以为新文件系统输入一个大于总可用空闲空间的值。安装程序会尽可能接近您所要"
-"求的大小。\n"
-"\n"
-"默认情况下，新设备会使用您所选择磁盘的全部。\n"
-"\n"
-"在设备选中时，通过点击配置按钮（工具图标的那个），您可以更改要从中分配新设备"
-"的磁盘。\n"
-"\n"
-"在通过点击“+”按钮添加新挂载点时，不填写大小将会让新设备使用全部空闲空间。\n"
-"\n"
-"当您从诸如 LVM 卷组这样的容器型设备中移除掉最后一个设备后，我们会自动删除该容"
-"器设备以便为新设备留出空间。\n"
-"\n"
-"当删掉磁盘上的最后一个分区后，如果我们认为该磁盘有更合适的类型时，我们会用新"
-"分区表重新初始化该磁盘。\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "日期 & 时间"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "无效的时区"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "如果您要使用 NTP，需要首先设置网络。"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "您还没有配置有效的 NTP 服务器"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "安装目标位置"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "已选择 %d 存储设备"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s 用来切换布局。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "键盘"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "键盘配置测试不可用。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "正在测试状态..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "未配置布局切换。"
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "语言"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "状态不详 (缺失)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "状态不详"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "未管理"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "不可用"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "缺失固件"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "未插入线缆"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "不可用"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "已断开连接"
@@ -1914,295 +2647,324 @@ msgstr "正在断开连接"
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "被拔出"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "以太网"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "无线"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "被拔出"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "企业"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "无"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "需要认证"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "密码："
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "网络配置"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT 密码"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "密码已设置"
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "已经设置 root 密码"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "已经禁用 root 账户"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "Root 密码未设置"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "软件选择"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "检查软件依赖关系..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "检查软件依赖关系时出错"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "正在下载软件包元数据......"
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "正在下载组元数据......"
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "检查软件依赖关系..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "检查软件依赖关系时出错"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "检查软件依赖关系时出错。点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "以下标记安装的软件发生错误。 这很可能是由于您的安装源发生错误。\n"
 "您可以尝试从安装配置中移除这些软件包，\n"
 "更换您的安装源，或退出安装程序。"
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "取消 (_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "修改软件源(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "修改软件选择(_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "正在设置安装源..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "下载软件包元数据出错......"
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "需要认证"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "此介质正常，可用于安装。"
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "无法使用此介质安装。"
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "安装源"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "设置安装源失败，请查看库 url。"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "设置软件仓库时出错"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "设置软件源出错"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "设置安装源失败，请检查库 rul 和代理服务器设置。"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "设置软件仓库时出错"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "设置软件源出错"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "设备"
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS 服务器 %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "无效的时区"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "无效的时区"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "无效的时区"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "请稍等...仍在加载软件元数据。"
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "您选择的磁盘剩余空间如下："
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "请稍等...仍在加载软件元数据。"
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2212,7 +2974,7 @@ msgstr ""
 "<b>您没有足够的可用空间安装 %s</b>，但我们可以帮助您\n"
 "通过压缩或删除现有分区回收空间。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2222,7 +2984,7 @@ msgstr ""
 "即使使用所选磁盘中的所有可用剩余空间，\n"
 "您也没有足够的可用空间安装 <b>%s</b>。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2234,47 +2996,58 @@ msgstr ""
 "<b>您也没有足够的可用空间安装 %s</b>。您可以添加更多磁盘获得额外的空间，\n"
 "修改软件选择安装较小的 <b>%s</b> 版本，或者退出安装程序。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "安装目标位置"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "正在保存存储配置..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "保存存储配置失败......"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "正在格式化 DASD 设备"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "检查存储配置时出错。 点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "检查存储配置时出错。 点击查看详情。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "可用空间"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "已选择 %d 个磁盘；容量 %s；%s 空闲"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr "您已选择跳过引导程序安装。您的系统可能无法引导。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2283,11 +3056,19 @@ msgstr ""
 "在检测您存储配置时发生以下错误。 您可以修改您的存储布局\n"
 "或退出安装程序。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "修改存储布局(_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2297,76 +3078,80 @@ msgstr ""
 "在检测您存储配置时发生以下错误。 您可以修改您的存储布局\n"
 "或退出安装程序。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "确定"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "用户设置"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "无效的时区"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "欢迎使用 %s %s。"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "数据"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "您还没有为 %s %s 的安装创建任何挂载点："
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "点击此处自动创建。"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "或者使用 \"+\" 图标在下方创建新挂载点。"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2377,55 +3162,159 @@ msgid_plural ""
 msgstr[0] ""
 "<b>%d 个磁盘；容量 %s；空闲空间 %s</b> (包括未分区及文件系统内的部分)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "不安装引导程序(_D)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "设为可引导设备(_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "您选择的 RAID 等级所需磁盘超过您目前选择的磁盘。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr "请为您的卷组起个名字，然后在下方至少选择一个磁盘。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "卷组："
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "栏"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "挂载点 %s 必须在 Linux 文件系统中。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "那个挂载点已在使用中。要尝试其他挂载点吗？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "请输入一个有效的挂载点。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "那个挂载点无效。要尝试其他挂载点吗？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "同时删除位于 %s root 下的所有文件系统。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "您确定要删除 %s 中的所有数据吗？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "您确定要删除 %s 中的所有数据吗？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "无效的时区"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "您提供了一个弱密码：%s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "密码不匹配。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "保留"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "缩小"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "删除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "该设备包含安装源。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "正在 %(device)s 上创建文件系统 %(type)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "未准备好"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "使用空闲空间"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2437,367 +3326,776 @@ msgstr ""
 "您可以移除不使用的文件系统来释放空间以便进行安装。移除文件系统将会永久地删除"
 "其中包含的所有数据。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] "<b>%s 磁盘；有 %s 可回收空间</b>(在文件系统中)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "总共选择的要回收空间大小：<b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "删除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "保留"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "发行版安装"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "称谓"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "PRE-RELEASE / TESTING"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "新设备"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "新选择"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "继续 (_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "应用更改(_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "网络配置"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "组名称"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "取消 (_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "确定"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "日期 & 时间"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr "："
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "添加并标记为使用 NTP 服务器"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "网页服务器"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "可以工作"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "使用"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "配置(_C)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "日期 & 时间"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "区域："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "区域："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "城市："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "城市："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "网络名称(_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "网络名称"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr "："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24-小时制"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "安装目标位置"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "容量"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "未连接"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "所选设备"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "未选择"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>标签：</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "缺失固件"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "否(_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN 类型"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "所选设备"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "小结"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID 设备"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "添加 (_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "默认路由"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "子网掩码"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "速度"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "硬件地址"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "配置(_O)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "安全"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "网络名称(_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "网络名称"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "安全密钥"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "做为热点使用(_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "停止热点(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "配置(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "供应商"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "配置(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN 类型"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "网关"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "组名称"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "组密码"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "配置(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "方法(_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "配置 URL(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP 代理服务器(_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS 代理服务器(_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP 代理服务器(_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Socks 主机(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "正写入网络配置"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "解除锁定"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "飞行模式(_P)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "正写入网络配置"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "主机名："
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "网络配置"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2806,641 +4104,693 @@ msgstr ""
 "我们需要访问网络来获取有关您位置的信息，并为您\n"
 "提供软件更新。"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "默认路由"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "子网掩码"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "速度"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "硬件地址"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "配置(_O)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "安全"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "网络名称(_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "网络名称"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "安全密钥"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "做为热点使用(_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "停止热点(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "配置(_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "供应商"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN 类型"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "网关"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "组名称"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "组密码"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "用户名"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "方法(_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "配置 URL(_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP 代理服务器(_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS 代理服务器(_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP 代理服务器(_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Socks 主机(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "解除锁定"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "飞行模式(_P)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "主机名："
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "使用认证(_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "需要认证"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "已连接"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "软件选择"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "选择您的安装环境"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "栏"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "取消并添加更多磁盘(_A)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "安装选项"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>分区类型：</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "加密我的数据。我会稍后设置口令。"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "已选择自定义分区"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "回收空间(_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "安装选项"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "我们将在这里告诉您目前所选软件需要多少空间。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "可用磁盘"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "可供使用的空间。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "可用空间"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "可从现有分区中回收的空闲空间。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "我们将在这里为您解释选项的意思。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "使用空闲空间"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "退出安装程序(_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "设备描述"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "本地标准磁盘"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "结束分区(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "加密(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "已选择自动分区"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "结束分区(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "加密(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "加密我的数据。我会稍后设置口令。"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "自动分区选项"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "小结"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "完整的磁盘摘要及选项..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "添加键盘布局"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "您可从以下键盘布局中选择一个："
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "名称"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "键盘布局"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 "您想在本系统中使用哪个键盘布局？您可以将任意布局移动到顶部将其作为默认选项。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 "这里的更改只会应用到已安装的系统。使用桌面工具可配置安装过程中的键盘布局。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "名称"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "增加布局"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "删除布局"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "向上移动选中布局"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "增加布局"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "删除布局"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "向上移动选中布局"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "向下移动选中布局"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "预览布局"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "键盘配置测试不可用。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "按 Alt + Shift 切换键盘布局。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "添加 (_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "添加键盘布局"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "您可从以下键盘布局中选择一个："
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "名称"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "可选地区"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "增加布局"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "确定"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "布局切换选项"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "您更喜欢使用哪一种组合键进行键盘布局切换？"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "使用"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "描述"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS 挂载选项："
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "语言"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "原始名称"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "英文名称"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "未选择"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT 密码"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "root 密码："
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "确认："
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "设置 root 密码"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr "root 帐户用于管理系统。为 root 用户输入密码。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "完成(_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "介质效验"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "正在效验介质，请等待..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "添加 (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "确定"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "启用 HTTP 代理服务器(_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>代理服务器 URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>示例：</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "使用认证(_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>用户名</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "用户名"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>密码</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "密码："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "安装源"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "您要使用哪个安装源？"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "自动探测到的安装介质(_A)："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "设备"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>标签：</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "验证(_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO 文件(_I)："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "设备"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "选择 ISO 文件(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "在网络上(_N)："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "代理服务器设置(_P)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "该 URL 指向一个镜像列表(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS 挂载选项："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "该字段为可选项。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People 软件库"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "添加新挂载点。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "添加 (_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "移除已选挂载点。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "删除(_R)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "操作错误。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "设置 root 密码"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "该 URL 指向一个镜像列表(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "名称："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>代理服务器 URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "用户名"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "密码："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "那个挂载点无效。要尝试其他挂载点吗？"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "让我离开这里(_G)！"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "我认命了(_I)。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "这是一个不稳定的预发布软件。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3450,75 +4800,690 @@ msgstr ""
 "您猛然惊醒，却已身处某难以名状的未来操作系统安装程序中。这里有 Bug，随处可"
 "见，难以避免。这个来自未来的操作系统并不稳定。它只是用于测试。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "欢迎使用 %s %s。"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "您在安装过程中想使用哪种语言？"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "继续 (_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "用户名"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "组名称"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "密码："
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC 密码"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "添加新挂载点。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "添加 (_A)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "移除已选挂载点。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "删除(_R)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+#, fuzzy
+msgid "Reload storage configuration from disk."
+msgstr "存储配置失败：%s"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
+msgid "Selected Device"
+msgstr "所选设备"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
+msgid "Device description"
+msgstr "设备描述"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+#, fuzzy
+msgid "Mount _Point:"
+msgstr "<b>挂载点：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>所需容量：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
+msgstr "<b>标签：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "设备"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
+msgid "_Modify..."
+msgstr "修改..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+#, fuzzy
+msgid "_Name:"
+msgstr "名称："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>设备类型：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "加密(_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "文件系统"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "重格式化"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "卷组："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "修改..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID 设备"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
+msgid "_Update Settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:969
+msgid ""
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
+msgid ""
+"This device is encrypted and cannot be read without a valid passphrase. You "
+"may unlock it below."
+msgstr "此设备已加密，没有口令不能读取。您可在下方解开。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Passphrase:"
+msgstr "口令："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Unlock"
+msgstr "解锁(_U)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
+msgid ""
+"This device cannot be edited directly. You can remove it or select a "
+"different device."
+msgstr "此设备无法直接编辑。您可以将其移除或选择其它设备。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
+msgid "_Reset All"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
+msgid ""
+"Please select the network interface which is connected to your FCoE switch."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_NIC:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use _DCB"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use auto _vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Add FCoE Disk(s)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
+msgid ""
+"The following error occurred while attempting to add an FCoE SAN.  Please "
+"check your configuration and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "确定"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
+msgid "ADD iSCSI STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
+msgid ""
+"To use iSCSI disks, you must provide the address of your iSCSI target and "
+"the iSCSI initiator name you've configured for your host."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Target IP Address:"
+msgstr "IP 地址"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "iSCSI _Initiator Name:"
+msgstr "您必须提供一个 iSCSI 启动程序名称。"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
+msgid "No credentials (discovery authentication disabled)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
+msgid "CHAP pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
+msgid "CHAP pair and a reverse pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Discovery Authentication Type:"
+msgstr "使用认证(_U)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
+#, fuzzy
+msgid ""
+"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
+"a8675309</span>"
+msgstr "<span size=\"small\"><b>示例：</b> squid.mysite.org:3128</span>"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Username:"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP User_name:"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
+msgid "Discovering iSCSI targets.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
+msgid ""
+"The following error occurred discovering iSCSI targets.  Please double check "
+"your authorization information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Bind targets to network interfaces"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
+#, fuzzy
+msgid "Node Name"
+msgstr "网络名称"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
+msgid "Interface"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
+msgid "_Node login authentication type:"
+msgstr "使用认证(_U)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
+msgid "Use the credentials from discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "用户名"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC 密码"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
+msgid "_Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "连接失败"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
+msgid ""
+"The following error occurred logging into the selected iSCSI node.  Please "
+"double check your authorization information and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
+msgid "Retry _Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "确定"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "设备"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
+msgid "SELECTED DISKS"
+msgstr "所选磁盘"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
+msgid "Boot"
+msgstr "可引导"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
+msgid "Description"
+msgstr "描述"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "空闲"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
+msgid "Disk summary goes here"
+msgstr "磁盘概述请看这里"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "删除(_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "选择(_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "配置挂载点"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "选择此设备所驻留的一个或多个磁盘。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
 msgid "_Add mount point"
 msgstr "添加挂载点(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
 msgstr "<b>所需容量：</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
 msgstr "<b>挂载点：</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
 msgid "ADD A NEW MOUNT POINT"
 msgstr "添加新挂载点"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
 msgid ""
 "More customization options are available\n"
 "after creating the mount point below."
@@ -3526,7 +5491,7 @@ msgstr ""
 "在下方创建挂载点后\n"
 "有更多自定义选项可用。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
 msgid ""
 "That mount point is already in\n"
 "use.  Try something else?"
@@ -3534,428 +5499,152 @@ msgstr ""
 "挂载点已经\n"
 "使用。要尝试其它挂载点吗？"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
 msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
 msgstr "例如：\"20 GB\", \"500mb\" (去掉引号)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "删除(_D)"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
 #, fuzzy
 msgid "CONFIGURE CONTAINER"
 msgstr "配置挂载点"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
 #, fuzzy
 msgid ""
 "Please create a name for this container and select at least one disk below."
 msgstr "请为您的卷组起个名字，然后在下方至少选择一个磁盘。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "空闲"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "名称："
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
 #, fuzzy
 msgid "RAID Level:"
 msgstr "RAID 设备"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
 #, fuzzy
 msgid "Encrypt"
 msgstr "加密(_E)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "请输入一个有效的挂载点。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "Si_ze policy:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
 msgid "Automatic"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
 msgid "As large as possible"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
 msgid "Fixed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
-msgid "Selected Device"
-msgstr "所选设备"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
-msgid "Device description"
-msgstr "设备描述"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-#, fuzzy
-msgid "<b>_Label:</b>"
-msgstr "<b>标签：</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-#, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>设备类型：</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>文件系统：</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "加密(_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "重格式化"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "卷组："
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
-#, fuzzy
-msgid "_Modify..."
-msgstr "修改..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
-#, fuzzy
-msgid "R_AID Level:"
-msgstr "RAID 设备"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
-msgid "_Update Settings"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "确定"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "正在格式化 DASD 设备"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
 msgid ""
-"This device is encrypted and cannot be read without a valid passphrase. You "
-"may unlock it below."
-msgstr "此设备已加密，没有口令不能读取。您可在下方解开。"
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
-#, fuzzy
-msgid "_Passphrase:"
-msgstr "口令："
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
-msgid "_Unlock"
-msgstr "解锁(_U)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
 msgid ""
-"This device cannot be edited directly. You can remove it or select a "
-"different device."
-msgstr "此设备无法直接编辑。您可以将其移除或选择其它设备。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "添加新挂载点。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "移除已选挂载点。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "配置已选挂载点。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "配置(_C)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "存储配置失败：%s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "点击获得帮助"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "帮助"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">可用空间</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">总空间</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
-msgid "_Reset All"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "选择(_S)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "配置挂载点"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "选择此设备所驻留的一个或多个磁盘。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
 msgid ""
-"Please select the network interface which is connected to your FCoE switch."
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
-msgid "_NIC:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
-msgid "Use _DCB"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
-msgid "Use auto _vlan"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
-msgid "_Add FCoE Disk(s)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
-msgid ""
-"The following error occurred while attempting to add an FCoE SAN.  Please "
-"check your configuration and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
-msgid "ADD iSCSI STORAGE TARGET"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
-msgid ""
-"To use iSCSI disks, you must provide the address of your iSCSI target and "
-"the iSCSI initiator name you've configured for your host."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
-#, fuzzy
-msgid "_Target IP Address:"
-msgstr "IP 地址"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
-#, fuzzy
-msgid "iSCSI _Initiator Name:"
-msgstr "您必须提供一个 iSCSI 启动程序名称。"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
-msgid "No credentials (discovery authentication disabled)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
-msgid "CHAP pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
-msgid "CHAP pair and a reverse pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
-#, fuzzy
-msgid "_Discovery Authentication Type:"
-msgstr "使用认证(_U)"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
-#, fuzzy
-msgid ""
-"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
-"a8675309</span>"
-msgstr "<span size=\"small\"><b>示例：</b> squid.mysite.org:3128</span>"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
-#, fuzzy
-msgid "CHAP _Username:"
-msgstr "用户名"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
-#, fuzzy
-msgid "CHAP _Password:"
-msgstr "VNC 密码"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
-msgid "Reverse CHAP User_name:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
-msgid "Reverse CHAP Pass_word:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
-msgid "_Start Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
-msgid "Discovering iSCSI targets.  This may take a moment..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
-msgid ""
-"The following error occurred discovering iSCSI targets.  Please double check "
-"your authorization information and try again."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
-msgid "_Retry Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
-msgid "_Bind targets to network interfaces"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
-#, fuzzy
-msgid "Node Name"
-msgstr "网络名称"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
-msgid "Interface"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
-#, fuzzy
-msgid "_Node login authentication type:"
-msgstr "使用认证(_U)"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
-msgid "Use the credentials from discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
-msgid "_Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
-msgid ""
-"The following error occurred logging into the selected iSCSI node.  Please "
-"double check your authorization information and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
-msgid "Retry _Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
-msgid "SELECTED DISKS"
-msgstr "所选磁盘"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
-msgid "Boot"
-msgstr "可引导"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
-msgid "Description"
-msgstr "描述"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr "删除(_R)"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
-msgid "Disk summary goes here"
-msgstr "磁盘概述请看这里"
-
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "安装过程中发生未知错误。 详情如下。"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "磁盘加密口令"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "保存口令"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "磁盘加密口令"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3963,7 +5652,19 @@ msgid ""
 msgstr ""
 "您选择加密您的部分数据。您需要创建一个口令，用于在计算机启动后访问您的数据。"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "口令："
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "确认："
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3972,117 +5673,172 @@ msgstr ""
 "警告：您当前键盘布局为 <b>%s</b>。如果您更改了您的键盘布局，在安装后您可能无"
 "法解密您的磁盘。"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "回收磁盘空间"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "确定"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "取消 (_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "回收空间(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "回收磁盘空间"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "描述在此。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "可回收空间"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "操作"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "保留"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "删除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "缩小"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "已选择自定义分区"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "应用更改(_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "设备"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "添加挂载点(_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "退出安装程序(_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "否(_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
@@ -4090,50 +5846,50 @@ msgstr ""
 "您确定要退出\n"
 "安装程序吗？"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "安装信息摘要"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "开始安装(_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "配置"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "准备安装"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"已在您的系统中成功安装 %s，但仍需要执行一些配置。请完成它们，然后点击“结束配"
-"置”按钮。"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "结束配置(_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"已成功在您计算机上安装 %s 并等候您的使用！\n"
-"重启后即可开始！"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "重启(_R)"
 
@@ -4149,40 +5905,41 @@ msgstr "安装"
 msgid "Install the live CD to your hard disk"
 msgstr "将 Live 光盘安装到您的硬盘。"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "开始安装到硬盘"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "欢迎使用 Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr "%s 需要 %s MB 内存进行安装，但您的计算机内存只有 %s MB。\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr "%s 图形安装程序需要 %s MB 内存，但您的计算机内存只有 %s MB。"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "内存不足"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4196,24 +5953,24 @@ msgstr ""
 "\n"
 "尝试文本模式安装。"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr "正在启动文本模式。"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "错误"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "未设定 DISPLAY 变量。正在启动文本模式。"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "无法使用图形化安装。正在启动文本模式。"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4223,20 +5980,20 @@ msgstr ""
 "文本模式的安装选项有限。您无法自定义分区布局或者选择软件包。您要使用 VNC 模式"
 "代替吗？"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "请运行 ssh install@%s 开始安装。"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "请运行 ssh install@<host> 继续安装。"
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "试用 Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4246,16 +6003,277 @@ msgstr ""
 "您现在就可以安装 Fedora，也可以在稍后通过选择活动概览中的 “安装到硬盘” 来进行"
 "安装。"
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr "您可以在稍后任何时候通过选择活动概览中的 “安装到硬盘” 来进行安装。"
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "关闭"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "主机名只能以“a-z”、“A-Z”或者“0-9”范围内的有效字符开头"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "以下文件系统需要更多空间：\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "命令行模式下不能有任何疑问或问题！"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "那个挂载点无效。要尝试其他挂载点吗？"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "您选择为 %(productName)s 的安装进行手动文件系统设置。在开始之前，您应该花"
+#~ "些时间了解一下关于设置方面的内容。因为这些内容有了很大变化。\n"
+#~ "\n"
+#~ "最重要的变化当属简化了新文件系统的创建过程。您不必再为创建像 LVM 逻辑卷那"
+#~ "样的复杂设备而花上好多步骤了（创建物理卷，然后卷组，然后逻辑卷）-- 现在您"
+#~ "只需创建逻辑卷，剩下的设置物理卷及包含它的卷组等费力工作均由我们为您完成。"
+#~ "同时当您增加、删除及调整逻辑卷大小时我们也会为您相应的调整卷组，您不必担心"
+#~ "这些细节。\n"
+#~ "\n"
+#~ "\n"
+#~ "屏幕布局\n"
+#~ "\n"
+#~ "位于屏幕左手一侧显示了我们能在计算机上检测到的操作系统。而全新 "
+#~ "%(productName)s 安装则位于此列表的顶部。通过点击这些系统的名称，您可以看到"
+#~ "它们包含了什么文件系统。\n"
+#~ "\n"
+#~ "在左侧各个安装系统及挂载点下方，有按钮可用来添加新文件系统，删除或配置已选"
+#~ "择的文件系统。\n"
+#~ "\n"
+#~ "屏幕右侧是您用来自定义当前所选挂载点的区域。\n"
+#~ "\n"
+#~ "左下角会显示您选择用于此次系统安装的磁盘摘要。通过点击蓝色文字可以看到有关"
+#~ "已选磁盘的更详细信息。\n"
+#~ "\n"
+#~ "\n"
+#~ "如何在新设备上创建新文件系统\n"
+#~ "\n"
+#~ "1. 点击“+”按钮\n"
+#~ "2. 输入挂载点及大小。（提示：将鼠标指针放在任意一处文本上时会显示帮"
+#~ "助。）\n"
+#~ "3. 在屏幕左侧的“全新 %(productName)s 安装“下方选择新建挂载点然后对其进行调"
+#~ "整以满足您的需要。\n"
+#~ "\n"
+#~ "\n"
+#~ "如何重新格式化磁盘上已有的设备/文件系统\n"
+#~ "\n"
+#~ "1. 从屏幕左侧选择文件系统。\n"
+#~ "2. 在屏幕右侧挂载点自定义区域点击“自定义”。\n"
+#~ "3. 选中“重新格式化”多选框，选择文件系统类型，如果适用的话在“挂载点”输入框"
+#~ "内输入挂载点。\n"
+#~ "4. 点击“应用更改”\n"
+#~ "\n"
+#~ "\n"
+#~ "如何为磁盘已有文件系统设置挂载点\n"
+#~ "\n"
+#~ "1. 从屏幕左侧选择文件系统。\n"
+#~ "2. 在挂载点自定义区域内的“挂载点”输入框内输入挂载点。\n"
+#~ "3. 点击“应用更改”\n"
+#~ "\n"
+#~ "\n"
+#~ "如何删除磁盘中的已有文件系统\n"
+#~ "\n"
+#~ "1. 在屏幕左侧选择您要删除的文件系统。\n"
+#~ "2. 点击“-”按钮\n"
+#~ "\n"
+#~ "提示：从“全新 %(productName)s 安装”下移除磁盘上已有的设备并不会把它从磁盘"
+#~ "上删除。仅仅会把该设备重设到它的原始状态。要真正删除您磁盘上已有的设备，您"
+#~ "必须在下方任何一个检测到的已有系统（或叫做“未知系统”）下选择该设备，然后点"
+#~ "击“-”按钮。\n"
+#~ "\n"
+#~ "\n"
+#~ "技巧和提示\n"
+#~ "\n"
+#~ "您可以为新文件系统输入一个大于总可用空闲空间的值。安装程序会尽可能接近您所"
+#~ "要求的大小。\n"
+#~ "\n"
+#~ "默认情况下，新设备会使用您所选择磁盘的全部。\n"
+#~ "\n"
+#~ "在设备选中时，通过点击配置按钮（工具图标的那个），您可以更改要从中分配新设"
+#~ "备的磁盘。\n"
+#~ "\n"
+#~ "在通过点击“+”按钮添加新挂载点时，不填写大小将会让新设备使用全部空闲空"
+#~ "间。\n"
+#~ "\n"
+#~ "当您从诸如 LVM 卷组这样的容器型设备中移除掉最后一个设备后，我们会自动删除"
+#~ "该容器设备以便为新设备留出空间。\n"
+#~ "\n"
+#~ "当删掉磁盘上的最后一个分区后，如果我们认为该磁盘有更合适的类型时，我们会用"
+#~ "新分区表重新初始化该磁盘。\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "网络配置"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "下载软件包元数据出错......"
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "未选择"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "缺失固件"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "需要认证"
+
+#~ msgid "column"
+#~ msgstr "栏"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>分区类型：</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>代理服务器 URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>用户名</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>密码</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "那个挂载点无效。要尝试其他挂载点吗？"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>标签：</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>文件系统：</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID 设备"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "配置已选挂载点。"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "点击获得帮助"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">可用空间</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">总空间</span>"
+
 #~ msgid "Completed"
 #~ msgstr "已完成"
 
@@ -4305,40 +6323,9 @@ msgstr "关闭"
 #~ msgid "Install on System"
 #~ msgstr "在计算机上安装"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "设置安装库时出现如下错误：\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "安装无法继续。"
-
 #~ msgid "Exit installer"
 #~ msgstr "退出安装程序"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "由于您的硬件可能存在问题导致安装停止。详细错误信息如下：\n"
-#~ "\n"
-#~ "%s。\n"
-#~ "\n"
-#~ "安装程序将停止。"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "遇到硬件错误"
-
 #~ msgid "_Exit installer"
 #~ msgstr "退出安装程序 (_E)"
 
@@ -4616,9 +6603,6 @@ msgstr "关闭"
 #~ msgid "Software Development"
 #~ msgstr "软件开发"
 
-#~ msgid "Web Server"
-#~ msgstr "网页服务器"
-
 #~ msgid "Minimal"
 #~ msgstr "最小化"
 
@@ -4660,45 +6644,6 @@ msgstr "关闭"
 #~ "\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr "您还没有指定继续安装 %s 所必需的根分区 (/)。"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "您的根分区小于 250 MB，这个空间通常太小，不足以安装 %s。"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "该平台需要 /boot 位于独立的分区或逻辑卷上。如果您并不想要单独的 /boot 卷，"
-#~ "那您就必须将 / 置于非 LVM 分区上。"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "您的 %(mount)s 分区小于 %(size)s MB，小于正常安装 %(productName)s 的建议"
-#~ "值。"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "您的 %(mount)s 分区太小，%(format)s 无法格式化（允许大小为 %(minSize)d MB "
-#~ "到 %(maxSize)d MB）"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "您的 %(mount)s 分区太大，%(format)s 无法格式化（允许大小为 %(minSize)d MB "
-#~ "到 %(maxSize)d MB）"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "正在一个 USB 设备上安装。无法保证安装后的系统的正常运行。"
@@ -4711,51 +6656,6 @@ msgstr "关闭"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "您没有创建引导程序第一阶段目标设备"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "您还没有创建可引导分区。"
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "您的计算机基于 BIOS，它需要专门的分区来引导 %s 的新磁盘标识格式 (GPT)。如"
-#~ "要继续，请先创建一个大小为 1MB，类型为“BIOS 引导”的分区。"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "您还没有指定 swap 分区。在没有 swap 分区时，安装需要 %(requiredMem)sMB 内"
-#~ "存才能继续，但您的计算机当前只有 %(installedMem)sMB 内存。"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "您尚未指定一个交换分区。虽然并非在所有情况下都需要，但在大多数情况会显著提"
-#~ "高系统性能。"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "您的 swap 设备中至少有一个没有 UUID，此问题常见于使用较早版本的 mkswap 创"
-#~ "建的 swap 空间。这些设备将会在 /etc/fstab 中依据设备路径进行指定。由于设备"
-#~ "路径可能会在不同环境下变化，因此这不是理想的做法。"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "此挂载点无效。%s 目录必须在 / 文件系统中。"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "挂载点 %s 必须在 Linux 文件系统中。"
-
 #~ msgid "Linux on %s"
 #~ msgstr "位于 %s 上的 Linux 系统"
 
@@ -4765,10 +6665,6 @@ msgstr "关闭"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "面向 %(arch)s 的 %(product)s Linux %(version)s "
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "正在格式化 DASD 设备"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "正在为 Linux 系统准备 %d DASD 设备…"
@@ -5019,9 +6915,6 @@ msgstr "关闭"
 #~ msgid "Error setting root password"
 #~ msgstr "设置 root 密码错误"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "您必须提供密码并确认。"
-
 #~ msgid "_Remove Packages"
 #~ msgstr "删除软件包(_R)"
 
@@ -5053,24 +6946,12 @@ msgstr "关闭"
 #~ msgid "%s of %s"
 #~ msgstr "%s/%s"
 
-#~ msgid "Region:"
-#~ msgstr "区域："
-
-#~ msgid "City:"
-#~ msgstr "城市："
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24-小时制"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "选择您的附加组件"
 
@@ -5149,9 +7030,6 @@ msgstr "关闭"
 #~ msgid "configureButton"
 #~ msgstr "配置按钮"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "结束分区(_F)"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "配置卷组"
 
diff --git a/anaconda/po/zh_TW.po b/anaconda/po/zh_TW.po
index 1c3c8e1..53296df 100644
--- a/anaconda/po/zh_TW.po
+++ b/anaconda/po/zh_TW.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
@@ -29,216 +29,483 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr "/boot 檔案系統"
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr "包含「%s」的 RAID 設定必須擁有下列 RAID 等級之一：%s。"
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr "包含「%s」的 RAID 設定必須擁有下列中介資料版本之一：%s。"
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, fuzzy, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr "包含「%s」的 RAID 設定必須擁有下列裝置類型之一：%s。"
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, fuzzy, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr "%s 必須有下列磁碟標籤類型之一：%s。"
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr "%s 無法為類型 %s。"
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, fuzzy, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr "%s 必須掛載在其中一個 %s 上。"
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, fuzzy, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr "%s 的大小必須介於 %d 與 %d MB"
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, fuzzy, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr "%s 必須不小於 %dMB。"
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, fuzzy, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr "%s 必須大於 %dMB。"
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, fuzzy, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr "%s 必須在磁碟的前 %dMB 內。"
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr "%s 必須位於主要分割區上。"
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr "%s 無法位於加密的區塊裝置上。"
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, fuzzy, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr "%s 無法為類型 %s"
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, fuzzy, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 "當 %s 檔案系統用於 %s 上時，%s 可能沒有足夠的空間給 grub2 嵌入 core.img"
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr "啟動 VNC"
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr "使用文字模式安裝"
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 #, fuzzy
 msgid "The password is empty."
 msgstr "密碼已設定。"
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 #, fuzzy
 msgid "The passwords do not match."
 msgstr "密碼不相符！"
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 #, fuzzy
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr "您提供的密碼相當脆弱：%s。如果無論如何都要使用，請再次按下「完成」鈕。"
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, fuzzy, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr "您提供的密碼相當脆弱：%s。如果無論如何都要使用，請再次按下「完成」鈕。"
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr "脆弱"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr "一般"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr "良好"
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr "強固"
 
-#: pyanaconda/install.py:65
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "確定"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+#, fuzzy
+msgid "Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/constants_text.py:48
+#, fuzzy
+msgid "Yes"
+msgstr "是(_Y)"
+
+#: pyanaconda/constants_text.py:52
+#, fuzzy
+msgid "No"
+msgstr "否(_N)"
+
+#: pyanaconda/errors.py:104
+#, fuzzy, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+"當設置安裝軟體庫時遭遇到下列錯誤：\n"
+"\n"
+"%(e)s\n"
+"\n"
+"無法繼續安裝。"
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+#, fuzzy
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+"當設置安裝軟體庫時遭遇到下列錯誤：\n"
+"\n"
+"%(e)s\n"
+"\n"
+"無法繼續安裝。"
+
+#: pyanaconda/errors.py:240
+#, fuzzy
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+"下列被標記要安裝的軟體含有錯誤。 這項錯誤可能是因為您的\n"
+"安裝來源所造成的。 您可以嘗試移除這些套件。\n"
+"請更換您的安裝來源，或是退出安裝程式。"
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, fuzzy, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"安裝程序已停止，因為您的硬體看來有問題。實際的錯誤訊息為：\n"
+"\n"
+"%s。\n"
+"\n"
+"安裝程式將終止。"
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+"安裝程序已停止，因為您的硬體看來有問題。實際的錯誤訊息為：\n"
+"\n"
+"%s。\n"
+"\n"
+"安裝程式將終止。"
+
+#: pyanaconda/exception.py:100
+#, fuzzy
+msgid "Hardware error occured"
+msgstr "遭遇硬體錯誤"
+
+#: pyanaconda/exception.py:134
+#, fuzzy, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+"安裝程序已停止，因為您的硬體看來有問題。實際的錯誤訊息為：\n"
+"\n"
+"%s。\n"
+"\n"
+"安裝程式將終止。"
+
+#: pyanaconda/install.py:77
 msgid "Configuring installed system"
 msgstr "正在設定已安裝的系統"
 
-#: pyanaconda/install.py:77
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr "正在寫入網路組態"
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr "正在建立使用者"
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 #, fuzzy
 msgid "Configuring addons"
 msgstr "正在設定已安裝的系統"
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 #, fuzzy
 msgid "Running post-installation scripts"
 msgstr "正在執行安裝前的指令稿"
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 #, fuzzy
 msgid "Setting up the installation environment"
 msgstr "正在設置安裝來源..."
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
+#: pyanaconda/install.py:254
+msgid "Installing bootloader"
+msgstr "正在安裝開機載入器"
+
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
 #, fuzzy
 msgid "Performing post-installation setup tasks"
 msgstr "正在執行安裝後的設定工作"
 
-#: pyanaconda/install.py:172
-msgid "Installing bootloader"
-msgstr "正在安裝開機載入器"
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr "Escrow 憑證 %s 需要網路。"
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -250,30 +517,322 @@ msgstr ""
 "\n"
 "%s"
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, fuzzy, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr "遺失 %s。無法設置防火牆。"
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr "遺失 %s。無法設置防火牆。"
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, fuzzy, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr "此檔案系統不支援標籤。"
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, fuzzy, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr "指定的名稱 %s 正被使用中。"
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, fuzzy, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr "儲區群組名稱 %s 正被使用中。不會儲存做的更動。"
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr "正在執行安裝前的指令稿"
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr "主機名稱無法為 None 或是空字串。"
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "主機名稱長度必須為 255 個或更少個字元。"
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr "主機名稱必須以「a-z」、「A-Z」或「0-9」等有效字元作為起始"
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
@@ -282,55 +841,55 @@ msgstr ""
 "主機名稱僅可以包含 'a-z'、'A-Z'、'0-9'、'-' 或 '.' 字元，兩個半形句點之間必須"
 "包含一些字元，但不能以 '-' 作為開頭或結尾。"
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr "未知"
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr "正在連接..."
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr "正在中斷連線..."
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr "已連上有線網路 (%s)"
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, fuzzy, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr "無線網路已連至 %s"
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr "未連線"
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr "沒有可用的網路裝置"
 
@@ -339,7 +898,12 @@ msgstr "沒有可用的網路裝置"
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "%(productName)s %(productVersion)s 安裝"
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, fuzzy, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr "新的 %s %s 安裝"
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr "當您完成後，請執行 %s 以卸載系統。"
@@ -352,8 +916,8 @@ msgstr "完成後請退出 shell，您的系統將會重新啟動。"
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "找不到可執行的 /bin/sh！Shell 沒有啟動"
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "救援模式"
 
@@ -398,21 +962,15 @@ msgstr "要救援的系統"
 msgid "Which device holds the root partition of your installation?"
 msgstr "哪個裝置持有您的 root 分割區呢？"
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "確定"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "離開"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr "系統在您離開 shell 後將自動重新開機。"
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
@@ -421,7 +979,7 @@ msgstr ""
 "您選擇不要掛載的檔案系統有紊亂情形。請按下 Enter 以取得您可以執行 fsck 與掛載"
 "分割區取的 shell。%s"
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -441,7 +999,7 @@ msgstr ""
 "\n"
 "%(msg)s"
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -453,28 +1011,223 @@ msgstr ""
 "\n"
 "請按下 <Enter> 鍵以取得 shell。"
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr "您沒有任何 Linux 分割區。系統即將重新啟動。\n"
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr "當您從 shell 離開後系統將自動重新開機。"
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "救援模式"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr "您尚未有任何的 Linux 分割區。請按下 Enter 以取得 shell。%s"
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "您的系統被掛載在 %s 目錄下。"
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr "LVM"
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr "RAID"
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr "標準分割區"
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr "BTRFS"
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr "磁碟"
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr "當記憶體不足時，作業系統會使用您電腦上的「swap」區域。"
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr "啟動作業系統所需的檔案，儲存於您電腦上的「boot」區域中。"
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr "核心系統檔案與應用程式儲存在您電腦上的「root」區域中。"
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr "您所有的個人資料皆儲存在您電腦上的「home」區域中。"
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+"需要 BIOS boot 分割區，好從 BIOS  硬體上的 GPT 分割區\n"
+"啟動開機程序。"
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+"在一些 PPC 平台上，需要 PReP boot 分割區作為\n"
+"bootloader 的部分組態。"
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr "您的 root 分割區小於 250 MB，空間太小不足以安裝 %s。"
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr "您還沒指定 root 分割區 (/)，為了讓 %s 安裝程式繼續，您必須先指定。"
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+"此平臺需要 /boot 有它自己獨立的分割區或邏輯儲區。若您不想要有 /boot 儲區，您"
+"必須把 / 放到獨立的非 LVM 分割區上。"
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"您的 %(mount)s 分割區小於 %(size)s MB，這是低於正常 %(productName)s 安裝的建"
+"議值。"
+
+#: pyanaconda/storage_utils.py:219
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"您的 %(mount)s 分割區太小以致於無法執行 %(format)s 格式化 (允許的大小為 "
+"%(minSize)d MB 至 %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:225
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+"您的 %(mount)s 分割區太大以致於無法執行 %(format)s 格式化 (允許的大小為 "
+"%(minSize)d MB 至 %(maxSize)d MB)"
+
+#: pyanaconda/storage_utils.py:234
+#, fuzzy
+msgid "No valid bootloader target device found. See below for details."
+msgstr "新增裝置失敗。請點選以得知詳情。"
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr "您還未建立一個可用來開機的分割區。"
+
+#: pyanaconda/storage_utils.py:268
+#, fuzzy
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+"您基於 BIOS 的系統需要一個特殊的分割區，才能以 %s 的新式磁碟標籤格式 (GPT) 啟"
+"動。若要繼續，請建立一個 1MB 的「BIOS Boot」類型分割區。"
+
+#: pyanaconda/storage_utils.py:279
+#, fuzzy, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+"您尚未指定 swap 分割區。需要 %(requiredMem)s MB 的記憶體才能在沒有 swap 分割"
+"區的情況下繼續安裝，但是您僅有 %(installedMem)s MB。"
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"您尚未指定 swap 分割區。雖然並沒有強制規定一定要有，但有的話對安裝效率會有很"
+"大的改善。"
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+"您的 swap 裝置沒有 UUID，它對於使用舊版 mkswap 建立的置換空間來說很常見。這些"
+"裝置會透過 /etc/fstab 內的裝置路徑做參照，但由於裝置路徑在許多情況下都可能會"
+"變動，因而不是理想作法。"
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "此掛載點無效。%s 目錄必須位於 / 檔案系統上。"
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr "掛載點「%s」必須位於一個 Linux 檔案系統上。"
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+#, fuzzy
+msgid "Passphrase"
+msgstr "密語："
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -584,87 +1337,238 @@ msgstr ""
 "\n"
 
 #: pyanaconda/vnc.py:269
+#, fuzzy
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 "提供的 VNC 密碼並非至少 6 個字元長。\n"
 "請輸入新的密碼。留空則為不設密碼。"
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr "Fedora(_F)"
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+#, fuzzy
+msgid "Failed to set up installation source"
+msgstr "設定安裝來源失敗"
+
+#: pyanaconda/packaging/__init__.py:1131
+#, fuzzy
+msgid "Error downloading package metadata"
+msgstr "下載套件中介資料時發生錯誤..."
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr "沒有可用的安裝來源"
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr "安裝軟體"
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr "正開始套件安裝程序"
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr "以下檔案系統需要更多空間：\n"
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr "正從安裝來源準備處理事項"
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr "安裝"
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+#, fuzzy
+msgid "Downloading packages"
+msgstr "正在下載套件中介資料..."
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "安裝"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, fuzzy, python-format
+msgid "Preparing deployment of %s"
+msgstr "正準備安裝"
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr "正在檢查儲存組態..."
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr "預設標題"
+
+#: pyanaconda/ui/categories/customization.py:32
+#, fuzzy
+msgid "CUSTOMIZATION"
+msgstr "在地設定"
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr "在地設定"
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr "軟體"
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr "系統"
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr "用戶設定"
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr "檔案系統中空間不足以供目前的軟體選擇項目使用。需要額外的 %s。"
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "安裝 Hub"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr "正在啟動自動化安裝"
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "在指令列模式中不能輸入問題！"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+#, fuzzy
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr "  請從上述做出選擇 ['q' 退出 | 'c' 繼續]： "
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr "請在繼續之前完成所有 spoke"
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr "c"
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr "預設 HUB 標題"
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr "c"
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr "請在繼續之前完成所有 spoke"
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "錯誤"
 
@@ -688,32 +1592,35 @@ msgstr "是"
 msgid "no"
 msgstr "否"
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr "您是否確定要退出？"
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+#, fuzzy
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr "q"
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 #, fuzzy
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr "  請從上述做出選擇 ['q' 退出 | 'c' 繼續]： "
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr "VNC"
 
@@ -727,297 +1634,358 @@ msgstr ""
 "X 無法在您的機器上執行。您要啟動 VNC 使其他電腦可以連進來執行圖形模式安裝或是"
 "使用文字模式繼續安裝？"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr "q"
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr "VNC 密碼"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
+#, fuzzy
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 "請提供 VNC 密碼。您需要輸入密碼兩次。\n"
 "留空則為不設密碼"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr "密碼："
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr "密碼 (確認)："
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr "密碼不相符！"
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr "密碼長度不得少於六個字元。"
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+#, fuzzy
+msgid "The password cannot be more than eight characters long."
+msgstr "密碼長度不得少於六個字元。"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+#, fuzzy
+msgid "Language settings"
+msgstr "時區設定"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+#, fuzzy
+msgid "Language is not set."
+msgstr "尚未設定時區。"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+#, fuzzy
+msgid "Available locales"
+msgstr "可用區域"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+#, fuzzy
+msgid "Available languages"
+msgstr "可用區域"
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 #, fuzzy
 msgid "Network configuration"
 msgstr "正在寫入網路組態"
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr "已連上有線網路 (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, fuzzy, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr "已連上有線網路 (%s)"
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, fuzzy, python-format
 msgid "Hostname: %s\n"
 msgstr "主機名稱："
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 #, fuzzy
 msgid "Set hostname"
 msgstr "主機名稱"
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr "主機名稱"
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr "主機名稱無效：%s"
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 #, fuzzy
 msgid "Device configuration"
 msgstr "完成設定(_F)"
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 #, fuzzy
 msgid "IPv4 gateway"
 msgstr "閘道"
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 #, fuzzy
 msgid "Apply configuration in installer"
 msgstr "檔案系統設定缺少類型"
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, fuzzy, python-format
 msgid "Configuring device %s."
 msgstr "正在設定已安裝的系統"
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 #, fuzzy
 msgid "Root password"
 msgstr "Root 密碼："
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr "密碼已設定。"
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr "root 帳號已停用。"
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr "密碼尚未設定。"
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr "請選擇新的 root 密碼。您需要輸入密碼兩次。"
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 #, fuzzy
 msgid "Password"
 msgstr "密碼："
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr "使用所有空間"
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr "取代既有的 Linux 系統"
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr "使用可用的空間"
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 #, fuzzy
 msgid "Installation Destination"
 msgstr "安裝目的地"
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr "尚未選取磁碟"
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr "檢查儲存組態時發生錯誤"
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 #, fuzzy
 msgid "Warning checking storage configuration"
 msgstr "檢查儲存組態時發生錯誤"
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr "已選擇自動磁碟分割"
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr "已選擇自訂磁碟分割"
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr "未偵測到磁碟。請關閉電腦，接上至少一顆硬碟，並重新啟動完成安裝。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr "尚未選取磁碟；請選擇至少一個磁碟以便安裝。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr "正在探測儲存裝置..."
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+#, fuzzy
+msgid "Select all"
+msgstr "選擇(_S)"
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr "正在產生更新的儲存組態"
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr "儲存裝置設定失敗：%s"
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr "正在檢查儲存組態..."
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr "自動分割選項"
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 #, fuzzy
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr "若要安裝，您需要分割您的硬碟機。 請選擇安裝目標所要使用的空間為何。"
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 #, fuzzy
 msgid "Partition Scheme Options"
 msgstr "分割區規劃組態"
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 #, fuzzy
 msgid "Select a partition scheme configuration."
 msgstr "分割區規劃組態"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr "時區設定"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr "%s 時區"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr "尚未設定時區。"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr "%s 地區中可用的時區"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr "可用區域"
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
@@ -1025,178 +1993,196 @@ msgstr ""
 "請選擇時區。\n"
 "請使用數字或直接輸入名稱 [b 區域清單，q 退出]： "
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+#, fuzzy
+msgid "Start shell"
+msgstr "啟動 VNC"
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "安裝進度"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr "最近的鏡像站"
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr "NFS 伺服器 %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr "設定軟體來源時發生錯誤"
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr "未選取任何項目"
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 #, fuzzy
 msgid "Processing..."
 msgstr "正在連接..."
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "CD/DVD"
 msgstr "CD/DVD 光碟機"
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "local ISO file"
 msgstr "ISO 檔案(_I)："
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 #, fuzzy
 msgid "Network"
 msgstr "網路時間"
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 #, fuzzy
 msgid "Choose an installation source type."
 msgstr "沒有可用的安裝來源"
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-#, fuzzy
-msgid "Failed to set up installation source"
-msgstr "設定安裝來源失敗"
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-#, fuzzy
-msgid "Error downloading package metadata"
-msgstr "下載套件中介資料時發生錯誤..."
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr "沒有可用的安裝來源"
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
+#: pyanaconda/ui/tui/spokes/source.py:283
 #, fuzzy
-msgid "NFS <server>:/<path>"
+msgid "<server>:/<path>"
 msgstr "NFS 伺服器 %s"
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 #, fuzzy
 msgid "NFS mount options"
 msgstr "NFS 掛載選項："
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 #, fuzzy
 msgid "Failed to set up installation source. Check the source address."
 msgstr "設定安裝來源失敗，請檢查軟體庫的 URL"
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 #, fuzzy
 msgid "Select device containing the ISO file"
 msgstr "該裝置包含 /boot"
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 #, fuzzy
 msgid "Select an ISO to use as install source"
 msgstr "設定安裝來源失敗"
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 #, fuzzy
 msgid "Software selection"
 msgstr "修改軟體選項(_M)"
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr "檢查軟體選項時發生錯誤"
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr "安裝來源尚未設定"
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr "來源已變更 - 請驗證"
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr "已選擇自訂軟體"
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 #, fuzzy
 msgid "Installation source needs to be set up first."
 msgstr "安裝來源尚未設定"
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 #, fuzzy
 msgid "Base environment"
 msgstr "選擇您的環境"
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+#, fuzzy
+msgid "User creation"
+msgstr "使用認證(_U)"
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+#, fuzzy
+msgid "You must set a password"
+msgstr "您必須提供密碼並確認。"
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "警告"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1212,112 +2198,100 @@ msgstr "正在進行中"
 msgid "\tInstallation complete.  Press return to quit"
 msgstr "\t安裝已完成。 請按下 Enter 退出"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr "預設欲言標題"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr "測試狀態..."
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 #, fuzzy
 msgid "New value"
 msgstr "新裝置"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, fuzzy, python-format
 msgid "%s (confirm): "
 msgstr "密碼 (確認)："
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, fuzzy, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr "您提供的密碼相當脆弱：%s。如果無論如何都要使用，請再次按下「完成」鈕。"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 #, fuzzy
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr "您提供的密碼相當脆弱：%s。如果無論如何都要使用，請再次按下「完成」鈕。"
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 #, fuzzy
 msgid "Password set."
 msgstr "密碼已設定。"
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
-msgstr "離開安裝程式(_E)"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+#, fuzzy
+msgid "Help!"
+msgstr "求助"
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr "否(_N)"
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr "預設標題"
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-#, fuzzy
-msgid "CUSTOMIZATION"
-msgstr "在地設定"
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr "在地設定"
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr "軟體"
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr "系統"
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr "用戶設定"
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr "在繼續下個步驟之前，請先完成有標記此圖示的項目。"
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr "已完成！"
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, fuzzy, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
@@ -1326,284 +2300,172 @@ msgstr ""
 "%s 現在已成功安裝在您的系統上，並準備好供您使用！\n"
 "就請重新啟動並開始使用吧！"
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
-msgstr "已完成！"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+#, fuzzy
+msgctxt "GUI|Progress"
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, fuzzy, python-format
-msgid "New %(name)s %(version)s Installation"
-msgstr "新的 %s %s 安裝"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
+msgstr ""
+"%s 已成功安裝至系統，但還需要進一步配置。\n"
+"請在完成後按下「完成設定」按鈕。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, fuzzy, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+"%s 現在已成功安裝在您的系統上，並準備好供您使用！\n"
+"就請重新啟動並開始使用吧！"
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, fuzzy, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr "建立新的儲區群組..."
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, fuzzy, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr "請為您的儲區群組建立名稱，並在下方選取至少一個磁碟。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-#, fuzzy
-msgid "Volume Group"
-msgstr "儲區群組："
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-#, fuzzy
-msgid "Volume"
-msgstr "欄"
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr "因為無法復原的錯誤，儲存組態已重設。請點選以得知詳情。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr "重新設定裝置失敗。請點選以得知詳情。"
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr "請輸入有效的掛載點。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr "掛載點無效。嘗試其它掛載點？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr "該掛載點現正使用中。是否嘗試其它掛載點？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, fuzzy, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr "您所選擇的 RAID 等級所需之裝置數量多於您所擁有的數量。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-#, fuzzy
-msgid "Please enter a valid name."
-msgstr "請輸入有效的掛載點。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-#, fuzzy
-msgid "That name is invalid. Try something else?"
-msgstr "掛載點無效。嘗試其它掛載點？"
+"Storage configuration reset due to unrecoverable error. Click for details."
+msgstr "因為無法復原的錯誤，儲存組態已重設。請點選以得知詳情。"
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr "LVM"
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr "RAID"
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr "標準分割區"
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr "BTRFS"
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr "磁碟"
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr "無"
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, fuzzy, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr "也刪除 %s 根中的所有其他檔案系統。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr "您確定要刪除 %s 上的所有資料？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, fuzzy, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr "您確定要刪除 %s 上的所有資料？"
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr "手動處理分割"
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] "已選擇 %d 個儲存裝置"
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, fuzzy, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr "當您為您的 %s %s 建立掛載點時，您將能夠在此檢視其詳細資料。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
+#: pyanaconda/ui/gui/spokes/custom.py:628
+#, fuzzy, python-format
 msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr "當記憶體不足時，作業系統會使用您電腦上的「swap」區域。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr "啟動作業系統所需的檔案，儲存於您電腦上的「boot」區域中。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr "核心系統檔案與應用程式儲存在您電腦上的「root」區域中。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr "您所有的個人資料皆儲存在您電腦上的「home」區域中。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-"需要 BIOS boot 分割區，好從 BIOS  硬體上的 GPT 分割區\n"
-"啟動開機程序。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-"在一些 PPC 平台上，需要 PReP boot 分割區作為\n"
-"bootloader 的部分組態。"
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
-#, python-format
-msgid "/boot/efi must be on a device of type %s"
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr "/boot/efi 必須位於類型為 %s 的裝置上"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, fuzzy, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr "%s 必須位於類型為 %s 的裝置上"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr "%s 無法加密"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr "您必須在根裝置上建立新的檔案系統。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
-#, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+#: pyanaconda/ui/gui/spokes/custom.py:644
+#, fuzzy, python-format
+msgid "Device does not support RAID level selection %s."
 msgstr "類型 %s 的裝置需要選擇正確的 RAID 等級。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr "重新設置裝置大小失敗。請點選以得知詳情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr "重新格式化裝置失敗。請點選以得知詳情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr "指定的名稱 %s 正被使用中。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
-msgstr "此檔案系統不支援標籤。"
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+#, fuzzy
+msgid "No disks assigned"
+msgstr "尚未選取磁碟"
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr "此檔案系統不可重設大小。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+#, fuzzy
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr "檢查儲存組態時發生錯誤。 請點選以查看細節。"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+#, fuzzy
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr "檢查儲存組態時發生錯誤。 請點選以查看細節。"
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, fuzzy, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr "已將 %s 新增至既有的容器 %s 中。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr "新增裝置失敗。請點選以得知詳情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr "無效的分割區大小。請使用有效的整數。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr "移除裝置失敗。請點選以得知詳情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr "儲區群組名稱 %s 正被使用中。不會儲存做的更動。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, fuzzy, python-format
+msgid "(%s free)"
+msgstr "fs 可用"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, fuzzy, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
@@ -1612,7 +2474,7 @@ msgstr ""
 "此軟體 RAID 陣列遺失 %d  (總共 %d) 個成員分割區。您可以移除這裝置，或選擇另一"
 "個裝置。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, fuzzy, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
@@ -1621,272 +2483,142 @@ msgstr ""
 "此 LVM 儲區群組遺失 %d  (總共 %d) 個實體儲區。您可以移除這裝置，或選擇另一個"
 "裝置。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr "尚未選取磁碟。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr "所選磁碟上的可用空間不足。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr "自動建立分割區失敗。請點選以得知詳情。"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+#, fuzzy
+msgid "_Reset selections"
+msgstr "修改軟體選項(_M)"
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr "無法為加密的區塊裝置解鎖。請點按以瞭解細節"
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-"您已手動選擇為您的新 %(productName)s 安裝設置檔案系統。在您開始之前，您可能想"
-"花幾分鐘瞭解一下新環境。您將見到的景物已有所不同。\n"
-"\n"
-"最重大的更動處是新的檔案系統建立流程變得更有效率。比如 LVM 邏輯儲區，您已不再"
-"需要分階段 (先實體儲區，再儲區群組，後邏輯儲區) 建置出複雜裝置 -- 現在只要建"
-"立邏輯儲區即可，其他雜事像是設置包含它的實體儲區與儲區群組等，我們都會幫你一"
-"一打點好。我們也會在您加入、移除儲區，或是調整儲區大小時處理該調整的地方，您"
-"就別費心在這些小事情上。\n"
-"\n"
-"\n"
-"畫面配置\n"
-"\n"
-"畫面左手邊為我們在這部電腦上找到的作業系統安裝項目。新的 %(productName)s 則會"
-"放在列表的頂端。您可以點按各作業系統的安裝名稱來查看它們包含哪些檔案系統。\n"
-"\n"
-"在左手邊各個作業系統與掛載點下方的是添加新檔案系統用的按鈕、移除所選檔案系統"
-"的按鈕、以及調整所選檔案系統組態的按鈕。\n"
-"\n"
-"畫面的右手邊是您自訂目前所選掛載點的地方。\n"
-"\n"
-"\n"
-"左下方您可以看到您選擇要在作業系統安裝中使用的各磁碟摘要。您可以按一下藍色文"
-"字來查看您所選磁碟的詳細資訊。\n"
-"\n"
-"\n"
-"如何在新裝置上建立新的檔案系統\n"
-"\n"
-"1. 點擊 + 鈕。\n"
-"2. 輸入掛載點與大小。(提示：將滑鼠指標停駐在文字輸入區域上可查看說明。)\n"
-"3. 在畫面左手邊的「新的 %(productName)s 安裝」下方選取新的掛載點，並將它自訂"
-"成符合您需求的狀態。\n"
-"\n"
-"\n"
-"如何對裝置或已經存在於磁碟上的檔案系統行重新格式化\n"
-"\n"
-"1. 從畫面的左手邊選取檔案系統。\n"
-"2. 點擊畫面右手邊掛載點自訂區域中的「自訂」擴展連結。\n"
-"3. 勾選「重新格式化」核選按鈕，選取檔案系統類型，如果要應用的話，並在「掛載"
-"點」文字輸入區域中輸入掛載點。\n"
-"4. 點擊「套用變更」。\n"
-"\n"
-"\n"
-"如何為磁碟上既有的檔案系統設定掛載點\n"
-"\n"
-"1. 自畫面左手邊選取檔案系統。\n"
-"2. 在掛載點自訂區域中的「掛載點」文字輸入區域中輸入掛載點。\n"
-"3. 點擊「套用變更」。\n"
-"\n"
-"\n"
-"如何移除磁碟上既有的檔案系統\n"
-"\n"
-"1. 在畫面左手邊選取您想移除的檔案系統。\n"
-"2. 點擊 - 鈕。\n"
-"\n"
-"提示：從「新的 %(productName)s 安裝」中移除磁上已經存在的裝置並不會讓它從磁碟"
-"中移除，這個動作只會將該裝置重設回其原初狀態而已。若真要從磁碟中移除已存在的"
-"裝置，您必須同時在任何其他偵測到的作業系統安裝 (包括「未知」) 之下，都選取它"
-"並按下 - 鈕。\n"
-"\n"
-"\n"
-"秘訣與提示\n"
-"\n"
-"您為新的檔案系統輸入大小時，可輸入一個大於總共可用空間的大小，安裝程式最為您"
-"改成最接近您要求的大小。\n"
-"\n"
-"預設情況下，新的裝置會使用任何或所有您選取的磁碟。\n"
-"\n"
-"您可以在選取裝置之後，按下調整組態按鈕 (就是有工具圖案的按鈕) 來改變新裝置的"
-"磁碟分配。\n"
-"\n"
-"當按下 + 鈕添加新掛載點時，若在大小輸入區中留下空白會讓新裝置使用所有可用的空"
-"間。\n"
-"\n"
-"當您從容器裝置 (例如 LVM 儲區群組) 移除最後一個裝置時，我們會自動移除該容器裝"
-"置來為新裝置挪出空間。\n"
-"\n"
-"當移除磁碟上的最後一個分割區時，若我們認為該磁碟有更適合的類型，會讓該磁碟重"
-"新回到新分割表的初始狀態。\n"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr "日期與時間"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr "無效的時區"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr "PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr "若您希望使用 NTP 您需要先設定網路"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr "您尚未設定可運作的 NTP 伺服器"
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr "安裝目的地"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, fuzzy, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] "已選擇 %d 個儲存裝置"
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr "%s 以切換配置。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr "鍵盤"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr "無法使用測試用配置組態。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+#, fuzzy
+msgid "Getting list of layouts..."
+msgstr "測試狀態..."
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr "尚未設定配置切換。"
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr "語言"
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr "狀態不明 (遺失)"
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr "狀態不明"
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr "未管理"
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr "無法使用"
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr "韌體遺失"
 
-#: pyanaconda/ui/gui/spokes/network.py:99
+#: pyanaconda/ui/gui/spokes/network.py:101
 msgid "Cable unplugged"
 msgstr "纜線已拔除"
 
-#: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
-msgstr "無法使用"
-
 #: pyanaconda/ui/gui/spokes/network.py:103
 msgid "Disconnected"
 msgstr "已離線"
@@ -1911,295 +2643,324 @@ msgstr "斷線中"
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr "已拔除"
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr "乙太網路"
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr "無線網路"
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr "已拔除"
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr "WEP"
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr "WPA"
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr "WPA2"
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr "企業"
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr "無"
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 #, fuzzy
 msgid "Authentication required by wireless network"
 msgstr "需經過認證"
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
 #, fuzzy
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr "密碼："
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-#, fuzzy
-msgid "_NETWORK CONFIGURATION"
-msgstr "網路組態"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr "ROOT 密碼"
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 #, fuzzy
 msgid "The password is set."
 msgstr "密碼已設定。"
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr "Root 密碼已設定"
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr "Root 帳號已停用"
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr "尚未設定 root 密碼"
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr "軟體選擇"
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr "正在檢查軟體相依性..."
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr "檢查軟體相依性時發生錯誤"
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr "正在下載套件中介資料..."
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr "正在下載群組中介資料..."
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr "正在檢查軟體相依性..."
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr "檢查軟體相依性時發生錯誤"
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr "檢查軟體相依性時發生錯誤。請查看詳細資料。"
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 #, fuzzy
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 "下列被標記要安裝的軟體含有錯誤。 這項錯誤可能是因為您的\n"
 "安裝來源所造成的。 您可以嘗試移除這些套件。\n"
 "請更換您的安裝來源，或是退出安裝程式。"
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: pyanaconda/ui/gui/spokes/software.py:465
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr "修改軟體來源(_M)"
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+#, fuzzy
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr "修改軟體選項(_M)"
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr "正在設置安裝來源..."
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
-msgstr "下載套件中介資料時發生錯誤..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+#, fuzzy
+msgid "Proxy authentication data duplicated"
+msgstr "需經過認證"
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr "此媒體可用來安裝。"
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr "此媒體不適合用來安裝。"
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr "安裝來源"
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 #, fuzzy
 msgid "Failed to set up installation source; check the repo url"
 msgstr "設定安裝來源失敗，請檢查軟體庫的 URL"
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+#, fuzzy
+msgid "Error setting up base repository"
+msgstr "設定軟體庫時發生錯誤"
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+#, fuzzy
+msgid "Error setting up ISO file"
+msgstr "設定軟體來源時發生錯誤"
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 #, fuzzy
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr "設定安裝來源失敗，請檢查軟體庫的 URL 和代理伺服器設定"
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-#, fuzzy
-msgid "Error setting up base repository"
-msgstr "設定軟體庫時發生錯誤"
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-#, fuzzy
-msgid "Error setting up ISO file"
-msgstr "設定軟體來源時發生錯誤"
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, fuzzy, python-format
 msgid "Device: %s"
 msgstr "裝置："
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+#, fuzzy
+msgid "NFS server is empty"
+msgstr "NFS 伺服器 %s"
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+#, fuzzy
+msgid "Invalid host name"
+msgstr "無效的時區"
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1069
+#: pyanaconda/ui/gui/spokes/source.py:950
 #, fuzzy
-msgid "Invalid repository name."
+msgid "Empty repository name"
 msgstr "無效的時區"
 
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:953
+#, fuzzy
+msgid "Invalid repository name"
+msgstr "無效的時區"
+
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr "請稍候... 軟體中介資料尚在載入中。"
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, fuzzy, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 "%s\n"
 "您所選取的磁碟擁有以下數量的可用空間："
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr "請稍候... 軟體中介資料尚在載入中。"
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -2209,7 +2970,7 @@ msgstr ""
 "<b>您沒有足夠的空間安裝 %s</b>，不過我們可協助您藉由縮減或移除既有分割區，以"
 "取得可用空間。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, fuzzy, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
@@ -2218,7 +2979,7 @@ msgstr ""
 "%s\n"
 "即使您使用所選磁碟上的所有可用空間，您依然沒有足夠的空間可安裝 <b>%s</b>。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, fuzzy, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2230,47 +2991,58 @@ msgstr ""
 "可以增加更多磁碟、修改您的軟體選項，以及精小版的 <b>%s</b>，或者是退出安裝程"
 "式。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr "安裝目的地"
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr "正在儲存儲藏裝置組態..."
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr "寫入儲存組態失敗……"
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+#, fuzzy
+msgid "Formatting DASDs"
+msgstr "正在格式化 DASD 裝置"
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr "檢查儲存組態時發生錯誤。 請點選以查看細節。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 #, fuzzy
 msgid "Warning checking storage configuration.  Click for details."
 msgstr "檢查儲存組態時發生錯誤。 請點選以查看細節。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, fuzzy, python-format
 msgid "%s free"
 msgstr "fs 可用"
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, fuzzy, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] "已選取 %d 顆磁碟；%s 容量；%s 可用"
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr "您已選擇略過安裝開機載入器。  您的系統可能無法開機。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 #, fuzzy
 msgid ""
 "The following errors were encountered when checking your storage "
@@ -2278,11 +3050,19 @@ msgid ""
 msgstr ""
 "檢查您的儲存組態時遭遇以下錯誤。您可以修改您的儲存組態，或者退出安裝程式。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+#, fuzzy
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr "修改儲存配置(_M)"
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 #, fuzzy
 msgid ""
 "The following warnings were encountered when checking your storage "
@@ -2291,76 +3071,80 @@ msgid ""
 msgstr ""
 "檢查您的儲存組態時遭遇以下錯誤。您可以修改您的儲存組態，或者退出安裝程式。"
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "確定"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
 #, fuzzy
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr "用戶設定"
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 #, fuzzy
 msgid "Invalid username"
 msgstr "無效的時區"
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, fuzzy, python-format
+msgid "WELCOME TO %(name)s %(version)s."
+msgstr "歡迎使用 %s %s。"
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr "資料"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, fuzzy, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr "您尚未為您的 %s %s 建立任何掛載點："
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 #, fuzzy
 msgid "_Click here to create them automatically."
 msgstr "請點按這裡讓系統自動建立。"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 #, fuzzy
 msgid "Create new mount points by clicking the '+' button."
 msgstr "或是，請在「+」下方建立新的掛載點。"
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, fuzzy, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2370,55 +3154,159 @@ msgid_plural ""
 "(unpartitioned and in filesystems)"
 msgstr[0] "<b>%d 顆磁碟；%s 容量；%s 可用空間</b> (尚未分割處與檔案系統中)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr "不要安裝開機載入器(_D)"
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr "設為開機裝置(_S)"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, fuzzy, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr "您所選擇的 RAID 等級所需之裝置數量多於您所擁有的數量。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, fuzzy, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr "請為您的儲區群組建立名稱，並在下方選取至少一個磁碟。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+#, fuzzy
+msgid "Volume Group"
+msgstr "儲區群組："
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+#, fuzzy
+msgid "Volume"
+msgstr "欄"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+#, fuzzy
+msgid "Can not set label on filesystem."
+msgstr "掛載點「%s」必須位於一個 Linux 檔案系統上。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr "該掛載點現正使用中。是否嘗試其它掛載點？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr "請輸入有效的掛載點。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr "掛載點無效。嘗試其它掛載點？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, fuzzy, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr "也刪除 %s 根中的所有其他檔案系統。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr "您確定要刪除 %s 上的所有資料？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr "您確定要刪除 %s 上的所有資料？"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+#, fuzzy
+msgid "Invalid container name"
+msgstr "無效的時區"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+#, fuzzy
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr "您提供的密語相當脆弱：%s"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr "密語不相符。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr "保留"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr "縮小"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr "刪除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr "這個裝置內含安裝來源。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, fuzzy, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr "正在於 %(device)s 上建立 %(type)s"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 #, fuzzy
 msgid "Not resizeable"
 msgstr "尚未準備就緒"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+#, fuzzy
+msgid "Free space"
+msgstr "使用可用的空間"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 #, fuzzy
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
@@ -2430,367 +3318,776 @@ msgstr ""
 "您可以移除不再需要的既有檔案系統以清出空間供安裝使用。移除檔案系統將永遠刪除"
 "其中的所有資料。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, fuzzy, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
 "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)"
 msgstr[0] "<b>%s 顆磁碟；%s 可取回的空間</b> (檔案系統中)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr "總計要取回的所選空間：<b>%s</b>"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr "刪除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr "保留"
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr "散布版安裝"
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr "欲言名稱"
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr "預先發行/測試"
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr "新裝置"
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr "0 MB"
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr "0 GB"
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr "新的選擇器"
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "繼續(_C)"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
 #, fuzzy
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+#, fuzzy
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr "套用變更(_A)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 #, fuzzy
 msgid "ADVANCED USER CONFIGURATION"
 msgstr "網路組態"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 #, fuzzy
 msgid "Group Membership"
 msgstr "群組名稱"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "確定"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr "日期與時間"
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ":"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr "PM"
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr "新增及標記 NTP 伺服器的使用"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+#, fuzzy
+msgid "New NTP Server"
+msgstr "網頁伺服器"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr "運作中"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr "使用"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+#, fuzzy
+msgid "Configure NTP"
+msgstr "設定(_C)..."
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr "日期與時間"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr "區域："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+#, fuzzy
+msgid "Region"
+msgstr "區域："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr "城市："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+#, fuzzy
+msgid "City"
+msgstr "城市："
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr "網路名稱(_N)"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+#, fuzzy
+msgid "Use Network Time"
+msgstr "網路名稱"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ":"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+#, fuzzy
+msgid "AM/PM Up"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+#, fuzzy
+msgid "AM/PM Down"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr "24 小時"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+#, fuzzy
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr "AM/PM"
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr "安裝目的地"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr "容量"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 #, fuzzy
 msgid "Interconnect"
 msgstr "未連線"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr "ID"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+#, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
+msgstr "選取的裝置"
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
 #, fuzzy
-msgid "Nothing here yet."
-msgstr "未選取任何項目"
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
+msgstr "<b>標籤：</b>"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-#, fuzzy
-msgid "Firmware _RAID"
-msgstr "韌體遺失"
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr "否(_N)"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 #, fuzzy
 msgid "Type"
 msgstr "VPN 類型"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
 #, fuzzy
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr "選取的裝置"
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
-msgstr "摘要"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "RAID 裝置"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "新增(_A)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr "DNS"
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr "預設路由"
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr "子網路遮罩"
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr "速度"
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr "硬體位址"
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+#, fuzzy
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr "設定(_o)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr "安全性"
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr "網路名稱(_N)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr "網路名稱"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr "安全金鑰"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr "作為熱點使用(_U)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr "停用熱點(_S)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "設定(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr "IMEI"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr "供應商"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "設定(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr "VPN 類型"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr "閘道"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr "群組名稱"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr "群組密碼"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "設定(_C)..."
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr "方法(_M)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr "組態 URL(_C)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr "HTTP 代理伺服器(_H)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr "HTTPS 代理伺服器(_T)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr "FTP 代理伺服器(_F)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+#, fuzzy
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr "Socks 主機(_S)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+#, fuzzy
+msgid "Network Config Box"
+msgstr "正在寫入網路組態"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr "解除鎖定"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr "飛安模式(_p)"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+#, fuzzy
+msgid "More Network Config Box"
+msgstr "正在寫入網路組態"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+#, fuzzy
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr "主機名稱："
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr "網路組態"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
@@ -2798,282 +4095,204 @@ msgid ""
 msgstr ""
 "我們需要存取網路以取得有關於您位置的相關資訊，並且提供您可用的軟體更新。"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr "DNS"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr "預設路由"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr "子網路遮罩"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr "速度"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr "硬體位址"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr "設定(_o)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr "安全性"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr "網路名稱(_N)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr "網路名稱"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr "安全金鑰"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr "作為熱點使用(_U)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr "停用熱點(_S)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr "設定(_C)..."
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr "IMEI"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr "供應商"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr "VPN 類型"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr "閘道"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr "群組名稱"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr "群組密碼"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr "使用者名稱"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr "方法(_M)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr "組態 URL(_C)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-#, fuzzy
-msgid "HTTP _Proxy"
-msgstr "HTTP 代理伺服器(_H)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr "HTTPS 代理伺服器(_T)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr "FTP 代理伺服器(_F)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr "Socks 主機(_S)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-#, fuzzy
-msgid "Unloc_k"
-msgstr "解除鎖定"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-#, fuzzy
-msgid "_Airplane Mode"
-msgstr "飛安模式(_p)"
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-#, fuzzy
-msgid "_Hostname:"
-msgstr "主機名稱："
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 #, fuzzy
 msgid "Authentication"
 msgstr "使用認證(_U)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
+#: pyanaconda/ui/gui/spokes/network.glade:2368
 #, fuzzy
-msgid "<b>Authentication required by wireless network</b>"
-msgstr "需經過認證"
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "已連線"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr "軟體選擇"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 #, fuzzy
 msgid "Base Environment"
 msgstr "選擇您的環境"
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr "欄"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+#, fuzzy
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr "刪除與新增更多磁碟(_A)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr "安裝選項"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
+#: pyanaconda/ui/gui/spokes/storage.glade:43
 #, fuzzy
-msgid "<b>Partition scheme:</b>"
-msgstr "<b>分割區類型：</b>"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-#, fuzzy
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr "加密我的資料。我稍候會設定密語。"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-#, fuzzy
-msgid "_Custom partitioning"
-msgstr "已選擇自訂磁碟分割"
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr "取回空間(_R)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr "安裝選項"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr "在此，我們將描述目前選擇的軟體所需的空間為何。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr "磁碟可用"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr "可供使用的空間。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr "fs 可用"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr "無法使用但可從既有分割區取回的空間。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr "我們將在此描述您可使用的選項。"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+#, fuzzy
+msgid "Need Space"
+msgstr "使用可用的空間"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr "退出安裝程式(_Q)"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+#, fuzzy
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+#, fuzzy
+msgid "Device Selection"
+msgstr "裝置描述"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr "本機標準磁碟"
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
 #, fuzzy
+msgid "Partitioning"
+msgstr "完成分割(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+#, fuzzy
+msgid "Encryption"
+msgstr "加密(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+#, fuzzy
+msgid "A_utomatically configure partitioning."
+msgstr "已選擇自動磁碟分割"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+#, fuzzy
+msgid "_I will configure partitioning."
+msgstr "完成分割(_F)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+#, fuzzy
+msgid "_Encrypt my data."
+msgstr "加密(_E)"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+#, fuzzy
+msgid "You'll set a passphrase next."
+msgstr "加密我的資料。我稍候會設定密語。"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+#, fuzzy
+msgid "Storage Options"
+msgstr "自動分割選項"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr "摘要"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+#, fuzzy
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr "完整磁碟摘要與選項..."
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr "新增鍵盤配置規格"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr "您可從下方選擇鍵盤格式來新增："
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr "名稱"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr "鍵盤配置"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
@@ -3081,7 +4300,7 @@ msgstr ""
 "您想要讓此系統採用何種鍵盤配置？您可以將鍵盤配置移動至清單的頂端來將它選為預"
 "設值。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
@@ -3089,352 +4308,482 @@ msgstr ""
 "這裡所做的更動只會套用至安裝的系統上。請使用桌面工具來調整安裝程序設定的鍵盤"
 "配置。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr "名稱"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
-msgstr "加入鍵盤配置"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
-msgstr "移除鍵盤配置"
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+#, fuzzy
+msgid "Selected Layouts"
 msgstr "將配置往上移"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
+msgstr "加入鍵盤配置"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
+msgstr "移除鍵盤配置"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
+msgstr "將配置往上移"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr "將配置往下移"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
 msgstr "預覽配置"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
 #, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr "無法使用測試用配置組態。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr "按下 Alt + Shift 以切換鍵盤配置。"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+#, fuzzy
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "新增(_A)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr "新增鍵盤配置規格"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr "您可從下方選擇鍵盤格式來新增："
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr "名稱"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+#, fuzzy
+msgid "Available Layouts"
+msgstr "可用區域"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+#, fuzzy
+msgid "Add Layout"
+msgstr "加入鍵盤配置"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "確定"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr "配置切換選項"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr "您偏好採用何種組合鍵來切換鍵配置？"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr "使用"
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr "描述"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+#, fuzzy
+msgid "Layout Options"
+msgstr "NFS 掛載選項："
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 #, fuzzy
 msgid "LANGUAGE SUPPORT"
 msgstr "語言"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr "nativeName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr "englishName"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 #, fuzzy
 msgid "selected"
 msgstr "未選取任何項目"
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr "ROOT 密碼"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr "Root 密碼："
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
 #, fuzzy
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr "確認："
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+#, fuzzy
+msgid "Confirm Password"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 #, fuzzy
 msgid "empty password"
 msgstr "設定 root 密碼"
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr "root 是用來管理系統的帳號。請為 root 使用者訂立密碼。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+#, fuzzy
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+#, fuzzy
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr "完成(_D)"
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr "媒體驗證"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr "正在驗證媒體，請稍等..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "新增(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "確定"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr "啟用 HTTP 代理伺服器(_E)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
+#: pyanaconda/ui/gui/spokes/source.glade:300
 #, fuzzy
-msgid "<b>_Proxy URL</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr "<b>代理伺服器 URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr "<span size=\"small\"><b>範例：</b> squid.mysite.org:3128</span>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr "使用認證(_U)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
+#: pyanaconda/ui/gui/spokes/source.glade:376
 #, fuzzy
-msgid "<b>User_name</b>"
-msgstr "<b>使用者名稱</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
+msgstr "使用者名稱"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
+#: pyanaconda/ui/gui/spokes/source.glade:393
 #, fuzzy
-msgid "<b>Pass_word</b>"
-msgstr "<b>密碼</b>"
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
+msgstr "密碼："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr "安裝來源"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr "您想使用哪個安裝來源？"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr "自動偵測到的安裝媒體："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr "裝置："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 #, fuzzy
 msgid "Label:"
 msgstr "<b>標籤：</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr "驗證(_V)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr "ISO 檔案(_I)："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "裝置："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr "選擇 ISO(_C)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr "網路上(_N)："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr "代理伺服器設置(_P)..."
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+#, fuzzy
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr "這個 URL 指向一份鏡像清單(_M)。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr "NFS 掛載選項："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr "此欄位為選填。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 #, fuzzy
 msgid "Additional repositories"
 msgstr "Fedora People 軟體庫"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 #, fuzzy
 msgid "Add a new repository."
 msgstr "新增掛載點。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "新增(_A)"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 #, fuzzy
 msgid "Remove the selected repository."
 msgstr "移除所選取的掛載點。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
+#: pyanaconda/ui/gui/spokes/source.glade:1044
 #, fuzzy
-msgid "Remove"
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr "移除(_R)"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 #, fuzzy
 msgid "Optional proxy username."
 msgstr "操作上的錯誤。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 #, fuzzy
 msgid "Optional proxy password."
 msgstr "設定 root 密碼"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
+#: pyanaconda/ui/gui/spokes/source.glade:1146
 #, fuzzy
-msgid "This URL refers to a mirror list."
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr "這個 URL 指向一份鏡像清單(_M)。"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr "名稱："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
+#: pyanaconda/ui/gui/spokes/source.glade:1204
 #, fuzzy
-msgid "P_roxy URL:"
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr "<b>代理伺服器 URL</b>"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr "使用者名稱"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr "密碼："
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-#, fuzzy
-msgid "Invalid repository name. Try something else?"
-msgstr "掛載點無效。嘗試其它掛載點？"
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr "帶我離開這裡(_G)！"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+#, fuzzy
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr "我接受我的命運(_I)。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr "此乃不穩定、預先發行的軟體。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3447,75 +4796,690 @@ msgstr ""
 "套未來作業系統尚未穩定，您還不能信賴它； 它僅供測試\n"
 "用途使用。"
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, fuzzy, python-format
-msgid "WELCOME TO %(name)s %(version)s."
-msgstr "歡迎使用 %s %s。"
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "您想使用哪種語言安裝？"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "繼續(_C)"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr "使用者名稱"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
 #, fuzzy
+msgid "Full Name"
+msgstr "群組名稱"
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+#, fuzzy
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr "密碼："
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
 #, fuzzy
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr "VNC 密碼"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+#, fuzzy
+msgid "Add a new mount point."
+msgstr "新增掛載點。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:185
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "新增(_A)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+#, fuzzy
+msgid "Remove the selected mount point(s)."
+msgstr "移除所選取的掛載點。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+#, fuzzy
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
+msgstr "移除(_R)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+#, fuzzy
+msgid "Reload storage configuration from disk."
+msgstr "儲存裝置設定失敗：%s"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
+msgid "Selected Device"
+msgstr "選取的裝置"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
+msgid "Device description"
+msgstr "裝置描述"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+#, fuzzy
+msgid "Mount _Point:"
+msgstr "<b>掛載點：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+#, fuzzy
+msgid "_Desired Capacity:"
+msgstr "<b>欲使用容量：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+#, fuzzy
+msgid "_Label:"
+msgstr "<b>標籤：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "裝置："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
+msgid "_Modify..."
+msgstr "修改..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+#, fuzzy
+msgid "_Name:"
+msgstr "名稱："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
+msgstr "<b>裝置類型：</b>"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr "加密(_E)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr "檔案系統"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr "重新格式化"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr "儲區群組："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr "修改..."
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "RAID 裝置"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
+msgid "_Update Settings"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:969
+msgid ""
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
+msgid ""
+"This device is encrypted and cannot be read without a valid passphrase. You "
+"may unlock it below."
+msgstr "此裝置已加密，若無有效密語則無法讀取。您或許可在下方解鎖。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Passphrase:"
+msgstr "密語："
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Encrypted"
+msgid "_Unlock"
+msgstr "解鎖(_U)"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
+msgid ""
+"This device cannot be edited directly. You can remove it or select a "
+"different device."
+msgstr "此裝置無法直接編輯。您可以移除這裝置，或選擇另一個裝置。"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
+msgid "_Reset All"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+#, fuzzy
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
+msgid ""
+"Please select the network interface which is connected to your FCoE switch."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_NIC:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use _DCB"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "Use auto _vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Add FCoE Disk(s)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
+msgid ""
+"The following error occurred while attempting to add an FCoE SAN.  Please "
+"check your configuration and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "確定"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
+msgid "ADD iSCSI STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
+msgid ""
+"To use iSCSI disks, you must provide the address of your iSCSI target and "
+"the iSCSI initiator name you've configured for your host."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Target IP Address:"
+msgstr "IP 位址"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "iSCSI _Initiator Name:"
+msgstr "必須提供 iSCSI 初始器名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
+msgid "No credentials (discovery authentication disabled)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
+msgid "CHAP pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
+msgid "CHAP pair and a reverse pair"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Discovery Authentication Type:"
+msgstr "使用認證(_U)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
+#, fuzzy
+msgid ""
+"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
+"a8675309</span>"
+msgstr "<span size=\"small\"><b>範例：</b> squid.mysite.org:3128</span>"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Username:"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP User_name:"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
+msgid "Discovering iSCSI targets.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
+msgid ""
+"The following error occurred discovering iSCSI targets.  Please double check "
+"your authorization information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Bind targets to network interfaces"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
+#, fuzzy
+msgid "Node Name"
+msgstr "網路名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
+msgid "Interface"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
+msgid "_Node login authentication type:"
+msgstr "使用認證(_U)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
+msgid "Use the credentials from discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "_Reverse CHAP Username:"
+msgstr "使用者名稱"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr "VNC 密碼"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
+msgid "_Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+#, fuzzy
+msgid "Node login failed."
+msgstr "連線失敗"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
+msgid ""
+"The following error occurred logging into the selected iSCSI node.  Please "
+"double check your authorization information and try again"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
+msgid "Retry _Log In"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "確定"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "裝置："
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
+msgid "SELECTED DISKS"
+msgstr "選取的磁碟"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
+msgid "Boot"
+msgstr "開機"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
+msgid "Description"
+msgstr "細節"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "剩餘空間"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+#, fuzzy
+msgctxt "GUI|Selected Disks Dialog"
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
+msgid "Disk summary goes here"
+msgstr "磁碟摘要會在這裡"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr "刪除它(_D)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr "選擇(_S)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr "設定掛載點"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr "選取此裝置可駐在的一顆或多顆磁碟。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Add Dialog"
 msgid "_Add mount point"
 msgstr "新增掛載點(_A)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
 #, fuzzy
-msgid "<b>_Desired Capacity:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
 msgstr "<b>欲使用容量：</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
 #, fuzzy
-msgid "<b>Mount _Point:</b>"
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
 msgstr "<b>掛載點：</b>"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
 msgid "ADD A NEW MOUNT POINT"
 msgstr "加入新的掛載點"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
 msgid ""
 "More customization options are available\n"
 "after creating the mount point below."
@@ -3523,7 +5487,7 @@ msgstr ""
 "在建立下列掛載點之後，\n"
 "將有更多自訂選項可供使用。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
 msgid ""
 "That mount point is already in\n"
 "use.  Try something else?"
@@ -3531,428 +5495,152 @@ msgstr ""
 "該掛載點現正使用中。\n"
 "是否嘗試其它掛載點？"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
 msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
 msgstr "例如：「20GB」、「500MB」(不包含引號)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
-msgstr "刪除它(_D)"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
 #, fuzzy
 msgid "CONFIGURE CONTAINER"
 msgstr "設定掛載點"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
 #, fuzzy
 msgid ""
 "Please create a name for this container and select at least one disk below."
 msgstr "請為您的儲區群組建立名稱，並在下方選取至少一個磁碟。"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "剩餘空間"
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr "名稱："
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
 #, fuzzy
 msgid "RAID Level:"
 msgstr "RAID 裝置"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
 #, fuzzy
 msgid "Encrypt"
 msgstr "加密(_E)"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "請輸入有效的掛載點。"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
 msgid "Si_ze policy:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
 msgid "Automatic"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
 msgid "As large as possible"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
 msgid "Fixed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
-msgid "Selected Device"
-msgstr "選取的裝置"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
-msgid "Device description"
-msgstr "裝置描述"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-#, fuzzy
-msgid "<b>_Label:</b>"
-msgstr "<b>標籤：</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-#, fuzzy
-msgid "<b>Device _Type:</b>"
-msgstr "<b>裝置類型：</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-#, fuzzy
-msgid "<b>File _System:</b>"
-msgstr "<b>檔案系統：</b>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr "加密(_E)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-#, fuzzy
-msgid "Re_format"
-msgstr "重新格式化"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-#, fuzzy
-msgid "_Volume Group:"
-msgstr "儲區群組："
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
-#, fuzzy
-msgid "_Modify..."
-msgstr "修改..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
-#, fuzzy
-msgid "R_AID Level:"
-msgstr "RAID 裝置"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
-msgid "_Update Settings"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "確定"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+#, fuzzy
+msgid "Unformatted DASDs Detected"
+msgstr "正在格式化 DASD 裝置"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
 msgid ""
-"This device is encrypted and cannot be read without a valid passphrase. You "
-"may unlock it below."
-msgstr "此裝置已加密，若無有效密語則無法讀取。您或許可在下方解鎖。"
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
-#, fuzzy
-msgid "_Passphrase:"
-msgstr "密語："
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
-msgid "_Unlock"
-msgstr "解鎖(_U)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
 msgid ""
-"This device cannot be edited directly. You can remove it or select a "
-"different device."
-msgstr "此裝置無法直接編輯。您可以移除這裝置，或選擇另一個裝置。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
-msgstr "新增掛載點。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-#, fuzzy
-msgid "Remove the selected mountpoint(s)."
-msgstr "移除所選取的掛載點。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr "設定所選擇的掛載點"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-#, fuzzy
-msgid "Configure"
-msgstr "設定(_C)..."
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-#, fuzzy
-msgid "Reload storage configuration from disk."
-msgstr "儲存裝置設定失敗：%s"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-#, fuzzy
-msgid "Click for help."
-msgstr "點擊可尋求幫助"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr "求助"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">可用空間</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr "<span size=\"small\" foreground=\"white\">總計空間</span>"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
-msgid "_Reset All"
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
-msgstr "選擇(_S)"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr "設定掛載點"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr "選取此裝置可駐在的一顆或多顆磁碟。"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
 msgid ""
-"Please select the network interface which is connected to your FCoE switch."
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
-msgid "_NIC:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
-msgid "Use _DCB"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
-msgid "Use auto _vlan"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
-msgid "_Add FCoE Disk(s)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
-msgid ""
-"The following error occurred while attempting to add an FCoE SAN.  Please "
-"check your configuration and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
-msgid "ADD iSCSI STORAGE TARGET"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
-msgid ""
-"To use iSCSI disks, you must provide the address of your iSCSI target and "
-"the iSCSI initiator name you've configured for your host."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
-#, fuzzy
-msgid "_Target IP Address:"
-msgstr "IP 位址"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
-#, fuzzy
-msgid "iSCSI _Initiator Name:"
-msgstr "必須提供 iSCSI 初始器名稱"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
-msgid "No credentials (discovery authentication disabled)"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
-msgid "CHAP pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
-msgid "CHAP pair and a reverse pair"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
-#, fuzzy
-msgid "_Discovery Authentication Type:"
-msgstr "使用認證(_U)"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
-#, fuzzy
-msgid ""
-"<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
-"a8675309</span>"
-msgstr "<span size=\"small\"><b>範例：</b> squid.mysite.org:3128</span>"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
-#, fuzzy
-msgid "CHAP _Username:"
-msgstr "使用者名稱"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
-#, fuzzy
-msgid "CHAP _Password:"
-msgstr "VNC 密碼"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
-msgid "Reverse CHAP User_name:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
-msgid "Reverse CHAP Pass_word:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
-msgid "_Start Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
-msgid "Discovering iSCSI targets.  This may take a moment..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
-msgid ""
-"The following error occurred discovering iSCSI targets.  Please double check "
-"your authorization information and try again."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
-msgid "_Retry Discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
-msgid "_Bind targets to network interfaces"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
-#, fuzzy
-msgid "Node Name"
-msgstr "網路名稱"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
-msgid "Interface"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
-#, fuzzy
-msgid "_Node login authentication type:"
-msgstr "使用認證(_U)"
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
-msgid "Use the credentials from discovery"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
-msgid "_Reverse CHAP Username:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
-msgid "_Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
-msgid ""
-"The following error occurred logging into the selected iSCSI node.  Please "
-"double check your authorization information and try again"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
-msgid "Retry _Log In"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
-msgid "SELECTED DISKS"
-msgstr "選取的磁碟"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
-msgid "Boot"
-msgstr "開機"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
-msgid "Description"
-msgstr "細節"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
-msgid "Disk summary goes here"
-msgstr "磁碟摘要會在這裡"
-
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr "安裝時遭遇不明的錯誤。 細節如下。"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
-msgstr "磁碟加密密語"
-
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
 #, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr "儲存密語"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr "磁碟加密密語"
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
@@ -3961,7 +5649,19 @@ msgstr ""
 "您已選擇加密您的部份資料。您需要創建一道密語，當您啟動電腦時需要這道密語才能"
 "存取您的資料。"
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr "密語："
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+#, fuzzy
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr "確認："
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 #, fuzzy
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
@@ -3970,166 +5670,221 @@ msgstr ""
 "警告：您目前的鍵盤配置為 <b>%s</b>。若您變更您的鍵盤配置，在安裝完成後您可能"
 "無法解密您的磁碟。"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 #, fuzzy
 msgid "RESCAN DISKS"
 msgstr "取回磁碟空間"
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "確定"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
-msgstr ""
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+#, fuzzy
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr "取回空間(_R)"
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr "取回磁碟空間"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr "描述會在這裡出現。"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr "檔案系統"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr "可取回的空間"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr "動作"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr "保留"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr "刪除"
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
 #, fuzzy
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr "縮小"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
-msgid "_Cancel & Return to Custom Partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
 #, fuzzy
+msgctxt "GUI|Summary Dialog"
+msgid "_Cancel & Return to Custom Partitioning"
+msgstr "已選擇自訂磁碟分割"
+
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+#, fuzzy
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr "套用變更(_A)"
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 #, fuzzy
 msgid "Device Name"
 msgstr "裝置："
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 #, fuzzy
 msgid "Mountpoint"
 msgstr "新增掛載點(_A)"
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr "離開安裝程式(_E)"
+
+#: pyanaconda/ui/gui/main.glade:94
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr "否(_N)"
+
+#: pyanaconda/ui/gui/main.glade:108
+#, fuzzy
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr "您確定要退出安裝程序？"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+#, fuzzy
+msgid "Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr "安裝摘要"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+#, fuzzy
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
 msgstr "開始安裝(_B)"
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr "組態"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr "正準備安裝"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-"%s 已成功安裝至系統，但還需要進一步配置。\n"
-"請在完成後按下「完成設定」按鈕。"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr "完成設定(_F)"
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, fuzzy, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-"%s 現在已成功安裝在您的系統上，並準備好供您使用！\n"
-"就請重新啟動並開始使用吧！"
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+#, fuzzy
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr "重新開機(_R)"
 
@@ -4145,40 +5900,41 @@ msgstr "安裝"
 msgid "Install the live CD to your hard disk"
 msgstr "將即時 CD 安裝至您的硬碟上"
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr "開始安裝到硬碟"
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr "歡迎使用 Fedora"
 
-#: anaconda:372
+#: anaconda:594
 #, fuzzy, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr "%s 需要 %s MB 的記憶體才能安裝，但是您這臺機器上只有 %s MB。\n"
 
-#: anaconda:374
+#: anaconda:596
 #, fuzzy, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr " %s 圖形化安裝程式需要 %s MB 的記憶體，但您只有 %s MB。"
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr "記憶體不足"
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -4192,24 +5948,24 @@ msgstr ""
 "\n"
 " 於 root 身分登入的終端機。"
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr " 正在啟動文字模式。"
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "錯誤"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr "DISPLAY 變數尚未設定。即將啟動文字模式。"
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr "無法使用圖形模式安裝。即將啟動文字模式。"
 
-#: anaconda:541
+#: anaconda:783
 #, fuzzy
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
@@ -4219,20 +5975,20 @@ msgstr ""
 "文字模式提供有限的安裝選項組合。它不允許您指定您自己的分割配置或套件選擇。您"
 "想要改換成 VNC 模式嗎？"
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr "請 ssh install@%s 以開始安裝。"
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr "請 ssh install@<host> 以繼續安裝。"
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr "試用 Fedora"
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
@@ -4241,16 +5997,277 @@ msgstr ""
 "您目前正從 live 媒體執行 Fedora。您現在可以安裝 Fedora，或稍後的任何時刻從活"
 "動「總覽」中，選擇「安裝至硬碟」。"
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr "您可在稍後的任何時候從活動「概覽」中選擇「安裝至硬碟」。"
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr "關閉"
 
+#~ msgid ""
+#~ "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
+#~ "'0-9'"
+#~ msgstr "主機名稱必須以「a-z」、「A-Z」或「0-9」等有效字元作為起始"
+
+#~ msgid "You need more space on the following file systems:\n"
+#~ msgstr "以下檔案系統需要更多空間：\n"
+
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "在指令列模式中不能輸入問題！"
+
+#, fuzzy
+#~ msgid "That name is invalid. Try something else?"
+#~ msgstr "掛載點無效。嘗試其它掛載點？"
+
+#~ msgid ""
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Screen Layout\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "The right-hand side of the screen is where you can customize the "
+#~ "currently-selected mountpoint.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to create a new filesystem on a new device\n"
+#~ "\n"
+#~ "1. Click on the + button.\n"
+#~ "2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over "
+#~ "either of the text entry areas for help.)\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "How to reformat a device/filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Click on the \"Customize\" expander in the mountpoint customization "
+#~ "area on the right-hand side of the screen.\n"
+#~ "3. Activate the \"Reformat\" checkbutton, select a filesystem type and, "
+#~ "if applicable, enter a mountpoint above in the \"Mountpoint\" text entry "
+#~ "area.\n"
+#~ "4. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to set a mountpoint for a filesystem that already exists on your "
+#~ "disk\n"
+#~ "\n"
+#~ "1. Select the filesystem from the left-hand side of the screen.\n"
+#~ "2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
+#~ "mountpoint customization area.\n"
+#~ "3. Click on \"Apply changes\"\n"
+#~ "\n"
+#~ "\n"
+#~ "How to remove a filesystem that already exists on your disk\n"
+#~ "\n"
+#~ "1. Select the filesystem you wish to remove on the left-hand side of the "
+#~ "screen.\n"
+#~ "2. Click the - button.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tips and hints\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "By default, new devices use any/all of your selected disks.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When adding a new mountpoint by clicking the + button, leave the size "
+#~ "entry blank to make the new device use all available free space.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "When the last partition is removed from a disk, that disk may be "
+#~ "reinitialized with a new partition table if we think there is a more "
+#~ "appropriate type for that disk.\n"
+#~ msgstr ""
+#~ "您已手動選擇為您的新 %(productName)s 安裝設置檔案系統。在您開始之前，您可"
+#~ "能想花幾分鐘瞭解一下新環境。您將見到的景物已有所不同。\n"
+#~ "\n"
+#~ "最重大的更動處是新的檔案系統建立流程變得更有效率。比如 LVM 邏輯儲區，您已"
+#~ "不再需要分階段 (先實體儲區，再儲區群組，後邏輯儲區) 建置出複雜裝置 -- 現在"
+#~ "只要建立邏輯儲區即可，其他雜事像是設置包含它的實體儲區與儲區群組等，我們都"
+#~ "會幫你一一打點好。我們也會在您加入、移除儲區，或是調整儲區大小時處理該調整"
+#~ "的地方，您就別費心在這些小事情上。\n"
+#~ "\n"
+#~ "\n"
+#~ "畫面配置\n"
+#~ "\n"
+#~ "畫面左手邊為我們在這部電腦上找到的作業系統安裝項目。新的 %(productName)s "
+#~ "則會放在列表的頂端。您可以點按各作業系統的安裝名稱來查看它們包含哪些檔案系"
+#~ "統。\n"
+#~ "\n"
+#~ "在左手邊各個作業系統與掛載點下方的是添加新檔案系統用的按鈕、移除所選檔案系"
+#~ "統的按鈕、以及調整所選檔案系統組態的按鈕。\n"
+#~ "\n"
+#~ "畫面的右手邊是您自訂目前所選掛載點的地方。\n"
+#~ "\n"
+#~ "\n"
+#~ "左下方您可以看到您選擇要在作業系統安裝中使用的各磁碟摘要。您可以按一下藍色"
+#~ "文字來查看您所選磁碟的詳細資訊。\n"
+#~ "\n"
+#~ "\n"
+#~ "如何在新裝置上建立新的檔案系統\n"
+#~ "\n"
+#~ "1. 點擊 + 鈕。\n"
+#~ "2. 輸入掛載點與大小。(提示：將滑鼠指標停駐在文字輸入區域上可查看說明。)\n"
+#~ "3. 在畫面左手邊的「新的 %(productName)s 安裝」下方選取新的掛載點，並將它自"
+#~ "訂成符合您需求的狀態。\n"
+#~ "\n"
+#~ "\n"
+#~ "如何對裝置或已經存在於磁碟上的檔案系統行重新格式化\n"
+#~ "\n"
+#~ "1. 從畫面的左手邊選取檔案系統。\n"
+#~ "2. 點擊畫面右手邊掛載點自訂區域中的「自訂」擴展連結。\n"
+#~ "3. 勾選「重新格式化」核選按鈕，選取檔案系統類型，如果要應用的話，並在「掛"
+#~ "載點」文字輸入區域中輸入掛載點。\n"
+#~ "4. 點擊「套用變更」。\n"
+#~ "\n"
+#~ "\n"
+#~ "如何為磁碟上既有的檔案系統設定掛載點\n"
+#~ "\n"
+#~ "1. 自畫面左手邊選取檔案系統。\n"
+#~ "2. 在掛載點自訂區域中的「掛載點」文字輸入區域中輸入掛載點。\n"
+#~ "3. 點擊「套用變更」。\n"
+#~ "\n"
+#~ "\n"
+#~ "如何移除磁碟上既有的檔案系統\n"
+#~ "\n"
+#~ "1. 在畫面左手邊選取您想移除的檔案系統。\n"
+#~ "2. 點擊 - 鈕。\n"
+#~ "\n"
+#~ "提示：從「新的 %(productName)s 安裝」中移除磁上已經存在的裝置並不會讓它從"
+#~ "磁碟中移除，這個動作只會將該裝置重設回其原初狀態而已。若真要從磁碟中移除已"
+#~ "存在的裝置，您必須同時在任何其他偵測到的作業系統安裝 (包括「未知」) 之下，"
+#~ "都選取它並按下 - 鈕。\n"
+#~ "\n"
+#~ "\n"
+#~ "秘訣與提示\n"
+#~ "\n"
+#~ "您為新的檔案系統輸入大小時，可輸入一個大於總共可用空間的大小，安裝程式最為"
+#~ "您改成最接近您要求的大小。\n"
+#~ "\n"
+#~ "預設情況下，新的裝置會使用任何或所有您選取的磁碟。\n"
+#~ "\n"
+#~ "您可以在選取裝置之後，按下調整組態按鈕 (就是有工具圖案的按鈕) 來改變新裝置"
+#~ "的磁碟分配。\n"
+#~ "\n"
+#~ "當按下 + 鈕添加新掛載點時，若在大小輸入區中留下空白會讓新裝置使用所有可用"
+#~ "的空間。\n"
+#~ "\n"
+#~ "當您從容器裝置 (例如 LVM 儲區群組) 移除最後一個裝置時，我們會自動移除該容"
+#~ "器裝置來為新裝置挪出空間。\n"
+#~ "\n"
+#~ "當移除磁碟上的最後一個分割區時，若我們認為該磁碟有更適合的類型，會讓該磁碟"
+#~ "重新回到新分割表的初始狀態。\n"
+
+#, fuzzy
+#~ msgid "_NETWORK CONFIGURATION"
+#~ msgstr "網路組態"
+
+#~ msgid "Error downloading package metadata..."
+#~ msgstr "下載套件中介資料時發生錯誤..."
+
+#, fuzzy
+#~ msgid "Nothing here yet."
+#~ msgstr "未選取任何項目"
+
+#, fuzzy
+#~ msgid "Firmware _RAID"
+#~ msgstr "韌體遺失"
+
+#, fuzzy
+#~ msgid "<b>Authentication required by wireless network</b>"
+#~ msgstr "需經過認證"
+
+#~ msgid "column"
+#~ msgstr "欄"
+
+#, fuzzy
+#~ msgid "<b>Partition scheme:</b>"
+#~ msgstr "<b>分割區類型：</b>"
+
+#, fuzzy
+#~ msgid "<b>_Proxy URL</b>"
+#~ msgstr "<b>代理伺服器 URL</b>"
+
+#, fuzzy
+#~ msgid "<b>User_name</b>"
+#~ msgstr "<b>使用者名稱</b>"
+
+#, fuzzy
+#~ msgid "<b>Pass_word</b>"
+#~ msgstr "<b>密碼</b>"
+
+#, fuzzy
+#~ msgid "Invalid repository name. Try something else?"
+#~ msgstr "掛載點無效。嘗試其它掛載點？"
+
+#, fuzzy
+#~ msgid "<b>_Label:</b>"
+#~ msgstr "<b>標籤：</b>"
+
+#, fuzzy
+#~ msgid "<b>File _System:</b>"
+#~ msgstr "<b>檔案系統：</b>"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "RAID 裝置"
+
+#~ msgid "Configure selected mountpoint."
+#~ msgstr "設定所選擇的掛載點"
+
+#, fuzzy
+#~ msgid "Click for help."
+#~ msgstr "點擊可尋求幫助"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">可用空間</span>"
+
+#~ msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
+#~ msgstr "<span size=\"small\" foreground=\"white\">總計空間</span>"
+
 #~ msgid "Completed"
 #~ msgstr "已完成"
 
@@ -4301,40 +6318,9 @@ msgstr "關閉"
 #~ msgid "Install on System"
 #~ msgstr "安裝到系統"
 
-#~ msgid ""
-#~ "The following error occurred while setting up the installation "
-#~ "repository:\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "Installation can not continue."
-#~ msgstr ""
-#~ "當設置安裝軟體庫時遭遇到下列錯誤：\n"
-#~ "\n"
-#~ "%(e)s\n"
-#~ "\n"
-#~ "無法繼續安裝。"
-
 #~ msgid "Exit installer"
 #~ msgstr "離開安裝程式"
 
-#~ msgid ""
-#~ "The installation was stopped due to what seems to be a problem with your "
-#~ "hardware. The exact error message is:\n"
-#~ "\n"
-#~ "%s.\n"
-#~ "\n"
-#~ " The installer will now terminate."
-#~ msgstr ""
-#~ "安裝程序已停止，因為您的硬體看來有問題。實際的錯誤訊息為：\n"
-#~ "\n"
-#~ "%s。\n"
-#~ "\n"
-#~ "安裝程式將終止。"
-
-#~ msgid "Hardware Error Encountered"
-#~ msgstr "遭遇硬體錯誤"
-
 #~ msgid "_Exit installer"
 #~ msgstr "退出安裝程式(_E)"
 
@@ -4614,9 +6600,6 @@ msgstr "關閉"
 #~ msgid "Software Development"
 #~ msgstr "軟體開發"
 
-#~ msgid "Web Server"
-#~ msgstr "網頁伺服器"
-
 #~ msgid "Minimal"
 #~ msgstr "最少"
 
@@ -4657,45 +6640,6 @@ msgstr "關閉"
 #~ "此裝置是個延伸的分割區，它包含無法刪除的邏輯分割區：\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr "您還沒指定 root 分割區 (/)，為了讓 %s 安裝程式繼續，您必須先指定。"
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr "您的 root 分割區小於 250 MB，空間太小不足以安裝 %s。"
-
-#~ msgid ""
-#~ "This platform requires /boot on a dedicated partition or logical volume.  "
-#~ "If you do not want a /boot volume, you must place / on a dedicated non-"
-#~ "LVM partition."
-#~ msgstr ""
-#~ "此平臺需要 /boot 有它自己獨立的分割區或邏輯儲區。若您不想要有 /boot 儲區，"
-#~ "您必須把 / 放到獨立的非 LVM 分割區上。"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is less than %(size)s megabytes which is lower "
-#~ "than recommended for a normal %(productName)s install."
-#~ msgstr ""
-#~ "您的 %(mount)s 分割區小於 %(size)s MB，這是低於正常 %(productName)s 安裝的"
-#~ "建議值。"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too small for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "您的 %(mount)s 分割區太小以致於無法執行 %(format)s 格式化 (允許的大小為 "
-#~ "%(minSize)d MB 至 %(maxSize)d MB)"
-
-#~ msgid ""
-#~ "Your %(mount)s partition is too large for %(format)s formatting "
-#~ "(allowable size is %(minSize)d MB to %(maxSize)d MB)"
-#~ msgstr ""
-#~ "您的 %(mount)s 分割區太大以致於無法執行 %(format)s 格式化 (允許的大小為 "
-#~ "%(minSize)d MB 至 %(maxSize)d MB)"
-
 #~ msgid ""
 #~ "Installing on a USB device.  This may or may not produce a working system."
 #~ msgstr "安裝至 USB 裝置上。安裝後的系統可能會、也可能不會正常運作。"
@@ -4709,51 +6653,6 @@ msgstr "關閉"
 #~ msgid "you have not created a bootloader stage1 target device"
 #~ msgstr "您尚未建立開機載入器 stage 1 目標裝置"
 
-#~ msgid "You have not created a bootable partition."
-#~ msgstr "您還未建立一個可用來開機的分割區。"
-
-#~ msgid ""
-#~ "Your BIOS-based system needs a special partition to boot with %s's new "
-#~ "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' "
-#~ "type partition."
-#~ msgstr ""
-#~ "您基於 BIOS 的系統需要一個特殊的分割區，才能以 %s 的新式磁碟標籤格式 "
-#~ "(GPT) 啟動。若要繼續，請建立一個 1MB 的「BIOS Boot」類型分割區。"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  %(requiredMem)s MB of memory is "
-#~ "required to continue installation without a swap partition, but you only "
-#~ "have %(installedMem)s MB."
-#~ msgstr ""
-#~ "您尚未指定 swap 分割區。需要 %(requiredMem)s MB 的記憶體才能在沒有 swap 分"
-#~ "割區的情況下繼續安裝，但是您僅有 %(installedMem)s MB。"
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "您尚未指定 swap 分割區。雖然並沒有強制規定一定要有，但有的話對安裝效率會有"
-#~ "很大的改善。"
-
-#~ msgid ""
-#~ "At least one of your swap devices does not have a UUID, which is common "
-#~ "in swap space created using older versions of mkswap. These devices will "
-#~ "be referred to by device path in /etc/fstab, which is not ideal since "
-#~ "device paths can change under a variety of circumstances. "
-#~ msgstr ""
-#~ "您的 swap 裝置沒有 UUID，它對於使用舊版 mkswap 建立的置換空間來說很常見。"
-#~ "這些裝置會透過 /etc/fstab 內的裝置路徑做參照，但由於裝置路徑在許多情況下都"
-#~ "可能會變動，因而不是理想作法。"
-
-#~ msgid ""
-#~ "This mount point is invalid.  The %s directory must be on the / file "
-#~ "system."
-#~ msgstr "此掛載點無效。%s 目錄必須位於 / 檔案系統上。"
-
-#~ msgid "The mount point %s must be on a linux file system."
-#~ msgstr "掛載點「%s」必須位於一個 Linux 檔案系統上。"
-
 #~ msgid "Linux on %s"
 #~ msgstr "位於 %s 上的 Linux"
 
@@ -4763,10 +6662,6 @@ msgstr "關閉"
 #~ msgid "%(product)s Linux %(version)s for %(arch)s"
 #~ msgstr "%(product)s Linux %(version)s %(arch)s"
 
-#~ msgid "Formatting DASD Device"
-#~ msgid_plural "Formatting DASD Devices"
-#~ msgstr[0] "正在格式化 DASD 裝置"
-
 #~ msgid "Preparing %d DASD device for use with Linux..."
 #~ msgid_plural "Preparing %d DASD devices for use with Linux..."
 #~ msgstr[0] "正在準備 %d 個 DASD 裝置以用於 Linux…"
@@ -5024,9 +6919,6 @@ msgstr "關閉"
 #~ msgid "Error setting root password"
 #~ msgstr "設定 root 密碼時發生錯誤"
 
-#~ msgid "You must provide and confirm a password."
-#~ msgstr "您必須提供密碼並確認。"
-
 #~ msgid "_Remove Packages"
 #~ msgstr "移除套件(_R)"
 
@@ -5058,24 +6950,12 @@ msgstr "關閉"
 #~ msgid "%s of %s"
 #~ msgstr "%s / %s"
 
-#~ msgid "Region:"
-#~ msgstr "區域："
-
-#~ msgid "City:"
-#~ msgstr "城市："
-
 #~ msgid "00"
 #~ msgstr "00"
 
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "24-hour"
-#~ msgstr "24 小時"
-
-#~ msgid "AM/PM"
-#~ msgstr "AM/PM"
-
 #~ msgid "Choose your add-ons"
 #~ msgstr "選擇您的附加元件"
 
@@ -5160,9 +7040,6 @@ msgstr "關閉"
 #~ msgid "configureButton"
 #~ msgstr "configureButton"
 
-#~ msgid "_Finish Partitioning"
-#~ msgstr "完成分割(_F)"
-
 #~ msgid "CONFIGURE VOLUME GROUP"
 #~ msgstr "設定儲區群組"
 
diff --git a/anaconda/po/zu.po b/anaconda/po/zu.po
index 0a4e160..94f1a22 100644
--- a/anaconda/po/zu.po
+++ b/anaconda/po/zu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anaconda\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-15 10:24-0800\n"
+"POT-Creation-Date: 2014-12-02 09:06+0100\n"
 "PO-Revision-Date: 2013-01-04 23:55+0000\n"
 "Last-Translator: Brian Lane <bcl@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,208 +21,441 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pyanaconda/bootloader.py:238
+#: pyanaconda/bootloader.py:247
 msgid "/boot filesystem"
 msgstr ""
 
-#: pyanaconda/bootloader.py:398
+#: pyanaconda/bootloader.py:404
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following raid "
 "levels: %(raid_level)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:406
+#: pyanaconda/bootloader.py:412
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following metadata "
 "versions: %(metadata_versions)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:414
+#: pyanaconda/bootloader.py:420
 #, python-format
 msgid ""
 "RAID sets that contain '%(desc)s' must have one of the following device "
 "types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:430
+#: pyanaconda/bootloader.py:436
 #, python-format
 msgid "%(name)s must have one of the following disklabel types: %(types)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:442
+#: pyanaconda/bootloader.py:448
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:448
+#: pyanaconda/bootloader.py:454
 #, python-format
 msgid "%(desc)s must be mounted on one of %(mountpoints)s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:460
+#: pyanaconda/bootloader.py:466
 #, python-format
 msgid "%(desc)s must be between %(min)d and %(max)d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:466
+#: pyanaconda/bootloader.py:472
 #, python-format
 msgid "%(desc)s must not be smaller than %(min)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:475
+#: pyanaconda/bootloader.py:481
 #, python-format
 msgid "%(desc)s must not be larger than %(max)dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:493
+#: pyanaconda/bootloader.py:499
 #, python-format
-msgid "%(desc)s must be within the first %(max_mb)dMB of the disk."
+msgid "%(desc)s must be within the first %(max_end)s of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:503
+#: pyanaconda/bootloader.py:509
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:635 pyanaconda/bootloader.py:731
+#: pyanaconda/bootloader.py:645 pyanaconda/bootloader.py:745
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:690
+#: pyanaconda/bootloader.py:700
+#, python-format
+msgid "%s cannot be on an iSCSI disk on s390(x)"
+msgstr ""
+
+#: pyanaconda/bootloader.py:704
 #, python-format
 msgid "%(desc)s cannot be of type %(type)s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1600
+#: pyanaconda/bootloader.py:1348
+#, python-format
+msgid ""
+"bootloader stage2 device %(stage2dev)s is on a multi-disk array, but "
+"bootloader stage1 device %(stage1dev)s is not. A drive failure in "
+"%(stage2dev)s could render the system unbootable."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1354
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/bootloader.py:1645
 #, python-format
 msgid ""
 "%(deviceName)s may not have enough space for grub2 to embed core.img when "
-"using the %(fsType)s filesystem on %(deviceType)s"
+"using the %(fsType)s file system on %(deviceType)s"
 msgstr ""
 
-#: pyanaconda/constants.py:73
+#: pyanaconda/constants.py:72
 msgid "Start VNC"
 msgstr ""
 
-#: pyanaconda/constants.py:74
+#: pyanaconda/constants.py:73
 msgid "Use text mode"
 msgstr ""
 
-#: pyanaconda/constants.py:136
+#: pyanaconda/constants.py:137
 msgid "The password is empty."
 msgstr ""
 
-#: pyanaconda/constants.py:137
+#: pyanaconda/constants.py:138
 msgid "The passwords do not match."
 msgstr ""
 
-#: pyanaconda/constants.py:138
+#: pyanaconda/constants.py:139
 msgid "The passwords you entered were different.  Please try again."
 msgstr ""
 
-#: pyanaconda/constants.py:139
+#: pyanaconda/constants.py:140
 msgid ""
 "The password you have provided is weak. You will have to press Done twice to "
 "confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:140
+#: pyanaconda/constants.py:141
 #, python-format
 msgid ""
 "The password you have provided is weak: %s. You will have to press Done "
 "twice to confirm it."
 msgstr ""
 
-#: pyanaconda/constants.py:141
+#: pyanaconda/constants.py:142
 msgid "You have provided a weak password. Press Done again to use anyway."
 msgstr ""
 
-#: pyanaconda/constants.py:142
+#: pyanaconda/constants.py:143
 #, python-format
 msgid "You have provided a weak password: %s. Press Done again to use anyway."
 msgstr ""
 
 #: pyanaconda/constants.py:144
+msgid ""
+"The password you have provided contains non-ASCII characters. You may not be "
+"able to switch between keyboard layouts to login. Press Done to continue."
+msgstr ""
+
+#: pyanaconda/constants.py:146
 msgid "Empty"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:114
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:6
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:118
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:177
 msgid "Weak"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:117
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:121
 msgid "Fair"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:120
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:124
 msgid "Good"
 msgstr ""
 
-#: pyanaconda/constants.py:144 pyanaconda/ui/gui/spokes/lib/passphrase.py:123
+#: pyanaconda/constants.py:146 pyanaconda/ui/gui/spokes/lib/passphrase.py:127
 msgid "Strong"
 msgstr ""
 
-#: pyanaconda/install.py:65
-msgid "Configuring installed system"
+#: pyanaconda/constants_text.py:40 pyanaconda/rescue.py:333
+#: pyanaconda/rescue.py:365 pyanaconda/rescue.py:378 pyanaconda/rescue.py:446
+#: pyanaconda/rescue.py:462 pyanaconda/rescue.py:473 anaconda:644
+msgid "OK"
+msgstr "KULUNGILE"
+
+#: pyanaconda/constants_text.py:44 pyanaconda/text.py:52 pyanaconda/text.py:53
+msgid "Cancel"
+msgstr ""
+
+#: pyanaconda/constants_text.py:48
+msgid "Yes"
+msgstr ""
+
+#: pyanaconda/constants_text.py:52
+msgid "No"
+msgstr ""
+
+#: pyanaconda/errors.py:104
+#, python-format
+msgid ""
+"The following errors occurred with your partitioning:\n"
+"\n"
+"%(errortxt)s\n"
+"\n"
+"The installation will now terminate."
+msgstr ""
+
+#: pyanaconda/errors.py:110
+#, python-format
+msgid "An error occurred while resizing the device %s."
+msgstr ""
+
+#: pyanaconda/errors.py:119
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems.  Please check your hardware for the cause of this problem."
+msgstr ""
+
+#: pyanaconda/errors.py:126
+#, python-format
+msgid ""
+"The following file systems for your Linux system were not unmounted "
+"cleanly.  Would you like to mount them anyway?\n"
+"%s"
+msgstr ""
+
+#: pyanaconda/errors.py:137
+msgid ""
+"There is an entry in your /etc/fstab file that contains an invalid or "
+"incorrect filesystem type:\n"
+"\n"
+msgstr ""
+
+#: pyanaconda/errors.py:143
+#, python-format
+msgid ""
+"The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
+"mean it was corrupted on transfer to this computer.\n"
+"\n"
+"It is recommended that you exit and abort your installation, but you can "
+"choose to continue if you think this is in error. Would you like to continue "
+"using this image?"
+msgstr ""
+
+#: pyanaconda/errors.py:157
+msgid ""
+"The installer has tried to mount the installation image, but cannot find it "
+"on the hard drive.\n"
+"\n"
+"Should I try again to locate the image?"
+msgstr ""
+
+#: pyanaconda/errors.py:167
+#, python-format
+msgid "An error occurred mounting the source device %s. Retry?"
+msgstr ""
+
+#: pyanaconda/errors.py:175
+#, python-format
+msgid ""
+"An error occurred unmounting the disc.  Please make sure you're not "
+"accessing %s from the shell on tty2 and then click OK to retry."
+msgstr ""
+
+#: pyanaconda/errors.py:183
+#, python-format
+msgid ""
+"The group '%s' is required for this installation. This group does not exist. "
+"This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:189
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be installed.  This group does "
+"not exist.  Would you like to ignore this group and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:194
+#, python-format
+msgid ""
+"You have specified that the group '%s' should be excluded from "
+"installation.  This group does not exist.  Would you like to ignore this "
+"group and continue with installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:206
+#, python-format
+msgid ""
+"The package '%s' is required for this installation. This package does not "
+"exist. This is a fatal error and installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:213
+#, python-format
+msgid ""
+"You have specified that the package '%s' should be installed.  This package "
+"does not exist.  Would you like to ignore this package and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:224
+#, python-format
+msgid ""
+"There was an error running the kickstart script at line %(lineno)s.  This is "
+"a fatal error and installation will be aborted.  The details of this error "
+"are:\n"
+"\n"
+"%(details)s"
+msgstr ""
+
+#: pyanaconda/errors.py:232
+msgid ""
+"The following error occurred while installing.  This is a fatal error and "
+"installation will be aborted."
+msgstr ""
+
+#: pyanaconda/errors.py:240
+msgid ""
+"The following software marked for installation has errors.  This is likely "
+"caused by an error with\n"
+"your installation source."
+msgstr ""
+
+#: pyanaconda/errors.py:248
+msgid ""
+"The following error occurred while installing the bootloader. The system "
+"will not be bootable. Would you like to ignore this and continue with "
+"installation?"
+msgstr ""
+
+#: pyanaconda/errors.py:261
+#, python-format
+msgid ""
+"Installation was stopped due to an error installing the boot loader. The "
+"exact error message is:\n"
+"\n"
+"%s\n"
+"\n"
+"The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:96
+#, python-format
+msgid ""
+"The installation was stopped due to what seems to be a problem with your "
+"hardware. The exact error message is:\n"
+"\n"
+"%s.\n"
+"\n"
+" The installer will now terminate."
+msgstr ""
+
+#: pyanaconda/exception.py:100
+msgid "Hardware error occured"
+msgstr ""
+
+#: pyanaconda/exception.py:134
+#, python-format
+msgid ""
+"\n"
+"The 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, edit your kickstart file and retry installation.\n"
+"The exact error message is: \n"
+"\n"
+"%s.\n"
+"\n"
+"The installer will now terminate."
 msgstr ""
 
 #: pyanaconda/install.py:77
+msgid "Configuring installed system"
+msgstr ""
+
+#: pyanaconda/install.py:90
 msgid "Writing network configuration"
 msgstr ""
 
-#: pyanaconda/install.py:81
+#: pyanaconda/install.py:94
 msgid "Creating users"
 msgstr ""
 
-#: pyanaconda/install.py:88
+#: pyanaconda/install.py:101
 msgid "Configuring addons"
 msgstr ""
 
-#: pyanaconda/install.py:92
+#: pyanaconda/install.py:104
 msgid "Generating initramfs"
 msgstr ""
 
-#: pyanaconda/install.py:96
+#: pyanaconda/install.py:108
 #, python-format
 msgid "Joining realm: %s"
 msgstr ""
 
-#: pyanaconda/install.py:99
+#: pyanaconda/install.py:111
 msgid "Running post-installation scripts"
 msgstr ""
 
-#: pyanaconda/install.py:129
+#: pyanaconda/install.py:165
 #, python-format
 msgid "Waiting for %s threads to finish"
 msgstr ""
 
-#: pyanaconda/install.py:133
+#: pyanaconda/install.py:171
 msgid "Setting up the installation environment"
 msgstr ""
 
-#: pyanaconda/install.py:151
+#: pyanaconda/install.py:203
 msgid "Discovering realm to join"
 msgstr ""
 
-#: pyanaconda/install.py:167 pyanaconda/packaging/livepayload.py:147
-#: pyanaconda/packaging/yumpayload.py:1425
-msgid "Performing post-installation setup tasks"
-msgstr ""
-
-#: pyanaconda/install.py:172
+#: pyanaconda/install.py:254
 msgid "Installing bootloader"
 msgstr ""
 
-#: pyanaconda/kickstart.py:152
+#: pyanaconda/install.py:257 pyanaconda/packaging/livepayload.py:170
+#: pyanaconda/packaging/yumpayload.py:1390
+#: pyanaconda/packaging/dnfpayload.py:539
+msgid "Performing post-installation setup tasks"
+msgstr ""
+
+#: pyanaconda/iutil.py:541
+msgid "No host url"
+msgstr ""
+
+#: pyanaconda/iutil.py:562
+msgid "malformed URL, cannot parse it."
+msgstr ""
+
+#: pyanaconda/iutil.py:578
+msgid "URL has no host component"
+msgstr ""
+
+#: pyanaconda/kickstart.py:157
 #, python-format
 msgid "Escrow certificate %s requires the network."
 msgstr ""
 
-#: pyanaconda/kickstart.py:160
+#: pyanaconda/kickstart.py:165
 #, python-format
 msgid ""
 "The following error was encountered while downloading the escrow "
@@ -231,85 +464,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pyanaconda/kickstart.py:560
+#: pyanaconda/kickstart.py:274
+#, python-format
+msgid "%s is missing. Cannot setup authentication."
+msgstr ""
+
+#: pyanaconda/kickstart.py:299
+#, python-format
+msgid "autopart fstype of %s is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:316
+#, python-format
+msgid "Settings default fstype to %s failed."
+msgstr ""
+
+#: pyanaconda/kickstart.py:347
+msgid "GRUB2 does not support installation to a partition."
+msgstr ""
+
+#: pyanaconda/kickstart.py:402
+#, python-format
+msgid "More than one match found for given boot drive \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:405
+#, python-format
+msgid "Requested boot drive \"%s\" doesn't exist or cannot be used."
+msgstr ""
+
+#: pyanaconda/kickstart.py:447
+#, python-format
+msgid ""
+"BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"btrfs\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:452
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in BTRFS volume specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:465
+msgid ""
+"BTRFS volume defined without any member devices.  Either specify member "
+"devices or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:474 pyanaconda/kickstart.py:852
+#: pyanaconda/kickstart.py:1393
+#, python-format
+msgid "The mount point \"%s\" is not valid.  It must start with a /."
+msgstr ""
+
+#: pyanaconda/kickstart.py:489
+#, python-format
+msgid "BTRFS volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:585
+#, python-format
+msgid ""
+"Disklabel \"%s\" given in clearpart command is not supported on this "
+"platform."
+msgstr ""
+
+#: pyanaconda/kickstart.py:597
+#, python-format
+msgid "Disk \"%s\" given in clearpart command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:610
+#, python-format
+msgid "Device \"%s\" given in clearpart device list does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:637
+#, python-format
+msgid "NIC \"%s\" given in fcoe command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:688
 #, python-format
 msgid "%s is missing. Cannot setup firewall."
 msgstr ""
 
-#: pyanaconda/kickstart.py:1727
+#: pyanaconda/kickstart.py:736 pyanaconda/kickstart.py:747
+#, python-format
+msgid "Disk \"%s\" given in ignoredisk command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:760
+#, python-format
+msgid ""
+"Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target "
+"is not up."
+msgstr ""
+
+#: pyanaconda/kickstart.py:770
+msgid ""
+"iscsi --iface must be specified (binding used) either for all targets or for "
+"none"
+msgstr ""
+
+#: pyanaconda/kickstart.py:858
+#, python-format
+msgid ""
+"No volume group exists with the name \"%s\".  Specify volume groups before "
+"logical volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:865
+#, python-format
+msgid ""
+"No thin pool exists with the name \"%s\". Specify thin pools before thin "
+"volumes."
+msgstr ""
+
+#: pyanaconda/kickstart.py:873
+msgid "logvol --noformat must also use the --name= option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:878 pyanaconda/kickstart.py:946
+#, python-format
+msgid "Logical volume \"%s\" given in logvol command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:889 pyanaconda/kickstart.py:898
+#: pyanaconda/kickstart.py:956 pyanaconda/kickstart.py:1196
+#: pyanaconda/kickstart.py:1205 pyanaconda/kickstart.py:1286
+#, python-format
+msgid "Target size \"%(size)s\" for device \"%(device)s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:912
+#, python-format
+msgid ""
+"Logical volume name \"%(logvol)s\" is already in use in volume group "
+"\"%(volgroup)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:919
+#, python-format
+msgid ""
+"No size given for logical volume \"%s\".  Use one of --useexisting, --size, "
+"or --percent."
+msgstr ""
+
+#: pyanaconda/kickstart.py:922
+#, python-format
+msgid ""
+"Logical volume size \"%(logvolSize)s\" must be larger than the volume group "
+"extent size of \"%(extentSize)s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:926
+msgid "Percentage must be between 0 and 100."
+msgstr ""
+
+#: pyanaconda/kickstart.py:936 pyanaconda/kickstart.py:1223
+#: pyanaconda/kickstart.py:1443
+#, python-format
+msgid "The \"%s\" filesystem type is not supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1064 pyanaconda/kickstart.py:1068
+#, python-format
+msgid "The %s kickstart command is not currently supported."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1093
+#, python-format
+msgid "No disk found for specified BIOS disk \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1128
+#, python-format
+msgid "RAID partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1139 pyanaconda/kickstart.py:1368
+#, python-format
+msgid "PV partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1150 pyanaconda/kickstart.py:1378
+#, python-format
+msgid "BTRFS partition \"%s\" is defined multiple times."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1173
+#, python-format
+msgid "The size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1180
+msgid "part --noformat must also use the --onpart option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1185 pyanaconda/kickstart.py:1277
+#, python-format
+msgid "Partition \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1238 pyanaconda/kickstart.py:1252
+#, python-format
+msgid "Disk \"%s\" given in part command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1241
+#, python-format
+msgid "Cannot install to unpartitionable device \"%s\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1248
+#, python-format
+msgid "Disk \"%s\" in part command is not partitioned."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1261
+#, python-format
+msgid "The maximum size \"%s\" is invalid."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1400
+msgid "raid --noformat must also use the --device option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1405
+#, python-format
+msgid "RAID device  \"%s\" given in raid command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1426
+#, python-format
+msgid ""
+"RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a "
+"format of \"mdmember\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1431
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in RAID specification."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1459
+#, python-format
+msgid "RAID volume \"%s\" specified with --useexisting does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1466
+#, python-format
+msgid "The RAID volume name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1676
+#, python-format
+msgid ""
+"Physical volume \"%(device)s\" has a format of \"%(format)s\", but should "
+"have a format of \"lvmpv\"."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1681
+#, python-format
+msgid "Tried to use undefined partition \"%s\" in Volume Group specification"
+msgstr ""
+
+#: pyanaconda/kickstart.py:1687
+#, python-format
+msgid ""
+"Volume group \"%s\" defined without any physical volumes.  Either specify "
+"physical volumes or use --useexisting."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1697
+#, python-format
+msgid ""
+"Volume group given physical extent size of \"%(extentSize)s\", but must be "
+"one of:\n"
+"%(validExtentSizes)s."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1704
+msgid ""
+"volgroup --noformat and volgroup --useexisting must also use the --name= "
+"option."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1709
+#, python-format
+msgid "Volume group \"%s\" given in volgroup command does not exist."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1712
+#, python-format
+msgid "The volume group name \"%s\" is already in use."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1765
+msgid ""
+"The upgrade kickstart command is no longer supported. Upgrade functionality "
+"is provided through fedup."
+msgstr ""
+
+#: pyanaconda/kickstart.py:1980
 msgid "Running pre-installation scripts"
 msgstr ""
 
-#: pyanaconda/network.py:107
+#: pyanaconda/network.py:103
 msgid "Hostname cannot be None or an empty string."
 msgstr ""
 
-#: pyanaconda/network.py:110
+#: pyanaconda/network.py:106
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr ""
 
-#: pyanaconda/network.py:115
-msgid ""
-"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or "
-"'0-9'"
-msgstr ""
-
-#: pyanaconda/network.py:123
+#: pyanaconda/network.py:109
 msgid ""
 "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.', "
 "parts between periods must contain something and cannot start or end with "
 "'-'."
 msgstr ""
 
-#: pyanaconda/network.py:1299 pyanaconda/ui/gui/spokes/custom.py:1014
-#: pyanaconda/ui/gui/spokes/network.py:601
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:59
+#: pyanaconda/network.py:1265 pyanaconda/ui/gui/spokes/custom.py:518
+#: pyanaconda/ui/gui/spokes/network.py:297
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:61
 msgid "Unknown"
 msgstr ""
 
-#: pyanaconda/network.py:1303
+#: pyanaconda/network.py:1269
 msgid "Connecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1305
+#: pyanaconda/network.py:1271
 msgid "Disconnecting..."
 msgstr ""
 
-#: pyanaconda/network.py:1325
+#: pyanaconda/network.py:1291
 #, python-format
 msgid "Wired (%(interface_name)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1328
+#: pyanaconda/network.py:1294
 #, python-format
 msgid "Wireless connected to %(access_point)s"
 msgstr ""
 
-#: pyanaconda/network.py:1331
+#: pyanaconda/network.py:1297
 #, python-format
 msgid "Bond %(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1335
+#: pyanaconda/network.py:1301
 #, python-format
 msgid "Team%(interface_name)s (%(list_of_slaves)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1341
+#: pyanaconda/network.py:1307
 #, python-format
 msgid "Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected"
 msgstr ""
 
-#: pyanaconda/network.py:1356
+#: pyanaconda/network.py:1322
 #, python-format
 msgid "Connected: %(list_of_interface_names)s"
 msgstr ""
 
-#: pyanaconda/network.py:1359
+#: pyanaconda/network.py:1325
 msgid "Not connected"
 msgstr ""
 
-#: pyanaconda/network.py:1362 pyanaconda/ui/gui/spokes/network.glade.h:45
+#: pyanaconda/network.py:1328 pyanaconda/ui/gui/spokes/network.glade:2099
 msgid "No network devices available"
 msgstr ""
 
@@ -318,7 +843,12 @@ msgstr ""
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr ""
 
-#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:355 pyanaconda/rescue.py:440
+#: pyanaconda/product.py:57
+#, python-format
+msgid "New %(name)s %(version)s Installation"
+msgstr ""
+
+#: pyanaconda/rescue.py:183 pyanaconda/rescue.py:350 pyanaconda/rescue.py:439
 #, python-format
 msgid "Run %s to unmount the system when you are finished."
 msgstr ""
@@ -332,8 +862,8 @@ msgstr ""
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr ""
 
-#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:362 pyanaconda/rescue.py:372
-#: pyanaconda/rescue.py:443 pyanaconda/rescue.py:474
+#: pyanaconda/rescue.py:288 pyanaconda/rescue.py:361 pyanaconda/rescue.py:371
+#: pyanaconda/rescue.py:442 pyanaconda/rescue.py:473
 msgid "Rescue"
 msgstr "Hlenga"
 
@@ -371,28 +901,22 @@ msgstr "Isistimu Yokuhlenga"
 msgid "Which device holds the root partition of your installation?"
 msgstr ""
 
-#: pyanaconda/rescue.py:333 pyanaconda/rescue.py:366 pyanaconda/rescue.py:379
-#: pyanaconda/rescue.py:447 pyanaconda/rescue.py:463 pyanaconda/rescue.py:474
-#: anaconda:416
-msgid "OK"
-msgstr "KULUNGILE"
-
 #: pyanaconda/rescue.py:333 pyanaconda/rescue.py:337
 msgid "Exit"
 msgstr "Phuma"
 
-#: pyanaconda/rescue.py:352 pyanaconda/rescue.py:437
+#: pyanaconda/rescue.py:347 pyanaconda/rescue.py:436
 msgid "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:363
+#: pyanaconda/rescue.py:362
 #, python-format
 msgid ""
 "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. %s"
 msgstr ""
 
-#: pyanaconda/rescue.py:373
+#: pyanaconda/rescue.py:372
 #, python-format
 msgid ""
 "Your system has been mounted under %(rootPath)s.\n"
@@ -405,7 +929,7 @@ msgid ""
 "%(msg)s"
 msgstr ""
 
-#: pyanaconda/rescue.py:444
+#: pyanaconda/rescue.py:443
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -414,28 +938,207 @@ msgid ""
 "Press <return> to get a shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:452
+#: pyanaconda/rescue.py:451
 msgid "You don't have any Linux partitions.  Rebooting.\n"
 msgstr ""
 
-#: pyanaconda/rescue.py:456
+#: pyanaconda/rescue.py:455
 msgid " The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: pyanaconda/rescue.py:460
+#: pyanaconda/rescue.py:459
 msgid "Rescue Mode"
 msgstr "Indlela Yokuhlenga"
 
-#: pyanaconda/rescue.py:461
+#: pyanaconda/rescue.py:460
 #, python-format
 msgid "You don't have any Linux partitions. Press return to get a shell.%s"
 msgstr ""
 
-#: pyanaconda/rescue.py:473
+#: pyanaconda/rescue.py:472
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "Isistimu yakho ikhushulelwe ngaphansi kohlu lwamafayela e-%s."
 
+#: pyanaconda/storage_utils.py:50 pyanaconda/storage_utils.py:82
+#: pyanaconda/ui/gui/spokes/custom.glade:31
+msgid "LVM"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:51 pyanaconda/storage_utils.py:83
+#: pyanaconda/ui/gui/spokes/custom.glade:39
+msgid "LVM Thin Provisioning"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:52 pyanaconda/ui/gui/spokes/custom.glade:35
+msgid "RAID"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:53 pyanaconda/storage_utils.py:80
+#: pyanaconda/ui/gui/spokes/custom.glade:23
+msgid "Standard Partition"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:54 pyanaconda/storage_utils.py:81
+msgid "BTRFS"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:55
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:222
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:715
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:152
+msgid "Disk"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:66
+msgid ""
+"The 'swap' area on your computer is used by the operating\n"
+"system when running low on memory."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:68
+msgid ""
+"The 'boot' area on your computer is where files needed\n"
+"to start the operating system are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:70
+msgid ""
+"The 'root' area on your computer is where core system\n"
+"files and applications are stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:72
+msgid ""
+"The 'home' area on your computer is where all your personal\n"
+"data is stored."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:74
+msgid ""
+"The BIOS boot partition is required to enable booting\n"
+"from GPT-partitioned disks on BIOS hardware."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:76
+msgid ""
+"The PReP boot partition is required as part of the\n"
+"bootloader configuration on some PPC platforms."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:180
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
+msgstr ""
+"Isahlulo sakho sempande singaphansi kwama-byte angu-250 ongokwejwayelekile "
+"incane kakhulu ukuthi ingafakwa %s."
+
+#: pyanaconda/storage_utils.py:185
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
+msgstr ""
+"Awuzange uchaze ukwahlula kwempande (/), okudingekayo ukze ukufakwa kwe-%s "
+"kuqhubeke."
+
+#: pyanaconda/storage_utils.py:199
+msgid ""
+"This platform requires /boot on a dedicated partition or logical volume.  If "
+"you do not want a /boot volume, you must place / on a dedicated non-LVM "
+"partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:209
+#, fuzzy, python-format
+msgid ""
+"Your %(mount)s partition is less than %(size)s which is lower than "
+"recommended for a normal %(productName)s install."
+msgstr ""
+"Isahlulo sakho sempande singaphansi kwama-byte angu-250 ongokwejwayelekile "
+"incane kakhulu ukuthi ingafakwa %s."
+
+#: pyanaconda/storage_utils.py:219
+#, python-format
+msgid ""
+"Your %(mount)s partition is too small for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:225
+#, python-format
+msgid ""
+"Your %(mount)s partition is too large for %(format)s formatting (allowable "
+"size is %(minSize)s to %(maxSize)s)"
+msgstr ""
+
+#: pyanaconda/storage_utils.py:234
+msgid "No valid bootloader target device found. See below for details."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:246
+msgid "You have not created a bootable partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:268
+msgid ""
+"Your BIOS-based system needs a special partition to boot from a GPT disk "
+"label. To continue, please create a 1MiB 'biosboot' type partition."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:279
+#, python-format
+msgid ""
+"You have not specified a swap partition.  %(requiredMem)s of memory is "
+"required to continue installation without a swap partition, but you only "
+"have %(installedMem)s."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:286
+msgid ""
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
+msgstr ""
+"Awuzange ucacise isahlulo sokushintsha. Yize kungadingakali kuzozonke "
+"izinto, kungathuthukusa ukusebenza kokufakiwe."
+
+#: pyanaconda/storage_utils.py:293
+msgid ""
+"At least one of your swap devices does not have a UUID, which is common in "
+"swap space created using older versions of mkswap. These devices will be "
+"referred to by device path in /etc/fstab, which is not ideal since device "
+"paths can change under a variety of circumstances. "
+msgstr ""
+
+#: pyanaconda/storage_utils.py:304
+#, python-format
+msgid ""
+"This mount point is invalid.  The %s directory must be on the / file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:309
+#, python-format
+msgid "The mount point %s must be on a linux file system."
+msgstr ""
+
+#: pyanaconda/storage_utils.py:337
+#, python-format
+msgid "LUKS device %s has no encryption key"
+msgstr ""
+
+#: pyanaconda/text.py:99
+#, python-format
+msgid ""
+"Device %s is encrypted. In order to access the device's contents during "
+"installation you must enter the device's passphrase below."
+msgstr ""
+
+#: pyanaconda/text.py:106
+msgid "Passphrase"
+msgstr ""
+
 #: pyanaconda/vnc.py:75
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
@@ -526,84 +1229,229 @@ msgstr ""
 
 #: pyanaconda/vnc.py:269
 msgid ""
-"VNC password provided was not at least 6 characters long.\n"
-"Please enter a new one.  Leave blank for no password."
+"VNC password must be six to eight characters long.\n"
+"Please enter a new one, or leave blank for no password."
 msgstr ""
 
-#: pyanaconda/installclasses/fedora.py:30
+#: pyanaconda/installclasses/fedora.py:29
 msgid "_Fedora"
 msgstr ""
 
-#: pyanaconda/installclasses/rhel.py:27
+#: pyanaconda/installclasses/rhel.py:29
 msgid "Red Hat Enterprise Linux"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:83
-#: pyanaconda/packaging/livepayload.py:106
+#: pyanaconda/packaging/__init__.py:1130
+msgid "Failed to set up installation source"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1131
+msgid "Error downloading package metadata"
+msgstr ""
+
+#: pyanaconda/packaging/__init__.py:1132
+msgid "No installation source available"
+msgstr ""
+
+#: pyanaconda/packaging/livepayload.py:98
+#: pyanaconda/packaging/livepayload.py:119
 msgid "Installing software"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:204
-#: pyanaconda/packaging/livepayload.py:213
+#: pyanaconda/packaging/livepayload.py:220
+#: pyanaconda/packaging/livepayload.py:229
 #, python-format
 msgid "Downloading %(url)s (%(pct)d%%)"
 msgstr ""
 
-#: pyanaconda/packaging/livepayload.py:301
+#: pyanaconda/packaging/livepayload.py:358
 msgid "Checking image checksum"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1341
+#: pyanaconda/packaging/yumpayload.py:1207
+#, python-format
+msgid "CmdlineError: Missing package: %s"
+msgstr ""
+
+#: pyanaconda/packaging/yumpayload.py:1352
+#: pyanaconda/packaging/dnfpayload.py:493
 msgid "Starting package installation process"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1405
-msgid "You need more space on the following file systems:\n"
-msgstr ""
-
-#: pyanaconda/packaging/yumpayload.py:1423
+#: pyanaconda/packaging/yumpayload.py:1388
+#: pyanaconda/packaging/dnfpayload.py:522
 msgid "Preparing transaction from installation source"
 msgstr ""
 
-#: pyanaconda/packaging/yumpayload.py:1424
+#: pyanaconda/packaging/yumpayload.py:1389
 msgid "Installing"
 msgstr ""
 
-#: pyanaconda/ui/lib/space.py:36
+#: pyanaconda/packaging/dnfpayload.py:146
+#, python-format
+msgid ""
+"Downloading %(total_files)s RPMs, %(downloaded)s / %(total_size)s "
+"(%(percent)d%%) done."
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:510
+msgid "Downloading packages"
+msgstr ""
+
+#: pyanaconda/packaging/dnfpayload.py:532
+#, fuzzy, python-format
+msgid "Installing %s"
+msgstr "Faka Kwisistimu"
+
+#: pyanaconda/packaging/rpmostreepayload.py:115
+#, python-format
+msgid "Starting pull of %(branchName)s from %(source)s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:122
+#, python-format
+msgid "Preparing deployment of %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:134
+#, python-format
+msgid "Deployment starting: %s"
+msgstr ""
+
+#: pyanaconda/packaging/rpmostreepayload.py:137
+#, python-format
+msgid "Deployment complete: %s"
+msgstr ""
+
+#: pyanaconda/ui/helpers.py:94 pyanaconda/ui/tui/spokes/storage.py:387
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/categories/__init__.py:49
+msgid "DEFAULT TITLE"
+msgstr ""
+
+#: pyanaconda/ui/categories/customization.py:32
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/localization.py:31
+msgid "LOCALIZATION"
+msgstr ""
+
+#: pyanaconda/ui/categories/software.py:31
+msgid "SOFTWARE"
+msgstr ""
+
+#: pyanaconda/ui/categories/system.py:32
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:166
+msgid "SYSTEM"
+msgstr ""
+
+#: pyanaconda/ui/categories/user_settings.py:32
+msgid "USER SETTINGS"
+msgstr ""
+
+#: pyanaconda/ui/lib/space.py:37
 #, python-format
 msgid ""
 "Not enough space in filesystems for the current software selection. An "
 "additional %s is needed."
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:30
+#: pyanaconda/ui/lib/entropy.py:58
+msgid "The system needs more random data entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:67
+msgid "Entropy can be increased by typing randomly on keyboard"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:68
+#, python-format
+msgid ""
+"After %d minutes, the installation will continue regardless of the amount of "
+"available entropy"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:92
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] "
+"(%(rem)d %(min)s remaining)"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:95
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.py:88
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/lib/entropy.py:102
+#, python-format
+msgid ""
+"Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]"
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:107
+msgid "Enough entropy gathered, please stop typing."
+msgstr ""
+
+#: pyanaconda/ui/lib/entropy.py:110
+#, python-format
+msgid "Giving up, time (%d minutes) ran out."
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:35
 #, fuzzy
 msgid "Installation"
 msgstr "Faka Kwisistimu"
 
-#: pyanaconda/ui/tui/hubs/summary.py:40
+#: pyanaconda/ui/tui/hubs/summary.py:51
 msgid "Starting automated install"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/summary.py:63
-msgid "Can't have a question in command line mode!"
-msgstr "Angeke ube nombuzo endleleni yolayini womyaleli!"
+#: pyanaconda/ui/tui/hubs/summary.py:82
+msgid "The following mandatory spokes are not completed:"
+msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:42
+#: pyanaconda/ui/tui/hubs/summary.py:90
+msgid ""
+"  Please make your choice from above ['q' to quit | 'b' to begin "
+"installation |\n"
+"  'r' to refresh]: "
+msgstr ""
+
+#. TRANSLATORS: 'b' to begin installation
+#. TRANSLATORS: 'b' to go back
+#: pyanaconda/ui/tui/hubs/summary.py:104
+#: pyanaconda/ui/tui/spokes/langsupport.py:117
+msgid "b"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:107
+#: pyanaconda/ui/tui/hubs/__init__.py:114
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#. TRANSLATORS: 'c' to continue
+#: pyanaconda/ui/tui/hubs/summary.py:118
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:41
 msgid "Default HUB title"
 msgstr ""
 
 #. TRANSLATORS: 'c' to continue
-#: pyanaconda/ui/tui/hubs/__init__.py:112
-#: pyanaconda/ui/tui/simpleline/base.py:457
+#: pyanaconda/ui/tui/hubs/__init__.py:111
+#: pyanaconda/ui/tui/simpleline/base.py:456
+msgctxt "TUI|Spoke Navigation"
 msgid "c"
 msgstr ""
 
-#: pyanaconda/ui/tui/hubs/__init__.py:115
-msgid "Please complete all spokes before continuing"
-msgstr ""
-
-#: pyanaconda/ui/tui/tuiobject.py:30
+#: pyanaconda/ui/tui/tuiobject.py:30 pyanaconda/ui/gui/main.glade:72
 msgid "Error"
 msgstr "Iphutha"
 
@@ -627,31 +1475,33 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:86
+#: pyanaconda/ui/tui/simpleline/base.py:87
 msgid "Do you really want to quit?"
 msgstr ""
 
 #. TRANSLATORS: 'r' to refresh
-#: pyanaconda/ui/tui/simpleline/base.py:451
+#: pyanaconda/ui/tui/simpleline/base.py:450
+msgctxt "TUI|Spoke Navigation"
 msgid "r"
 msgstr ""
 
 #. TRANSLATORS: 'q' to quit
-#: pyanaconda/ui/tui/simpleline/base.py:463
+#: pyanaconda/ui/tui/simpleline/base.py:462
+msgctxt "TUI|Spoke Navigation"
 msgid "q"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:575
+#: pyanaconda/ui/tui/simpleline/base.py:569
 msgid "Press ENTER to continue"
 msgstr ""
 
-#: pyanaconda/ui/tui/simpleline/base.py:624
+#: pyanaconda/ui/tui/simpleline/base.py:619
 msgid ""
 "  Please make your choice from above ['q' to quit | 'c' to continue |\n"
 "  'r' to refresh]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:38
+#: pyanaconda/ui/tui/spokes/askvnc.py:39
 msgid "VNC"
 msgstr ""
 
@@ -662,445 +1512,516 @@ msgid ""
 "installation or continue with a text mode installation?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:111
+#: pyanaconda/ui/tui/spokes/askvnc.py:103
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/askvnc.py:115
 msgid "VNC Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:120
+#: pyanaconda/ui/tui/spokes/askvnc.py:123
 msgid ""
-"Please provide VNC password. You will have to type it twice. \n"
-"Leave blank for no password"
+"Please provide VNC password (must be six to eight characters long).\n"
+"You will have to type it twice. Leave blank for no password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:139
+#: pyanaconda/ui/tui/spokes/askvnc.py:142
 msgid "Password: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:140
+#: pyanaconda/ui/tui/spokes/askvnc.py:143
 msgid "Password (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:143
+#: pyanaconda/ui/tui/spokes/askvnc.py:146
 msgid "Passwords do not match!"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/askvnc.py:146
+#: pyanaconda/ui/tui/spokes/askvnc.py:149
 msgid "The password must be at least six characters long."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:42
+#: pyanaconda/ui/tui/spokes/askvnc.py:153
+msgid "The password cannot be more than eight characters long."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:40
+msgid "Language settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:70
+msgid "Language is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:80
+msgid "Available locales"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:83
+msgid "Available languages"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/langsupport.py:125
+msgid ""
+"Please select language support to install.\n"
+"[b to language list, c to continue, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/network.py:43
 msgid "Network configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:82
+#: pyanaconda/ui/tui/spokes/network.py:94
 #, python-format
 msgid "Wired (%(interface_name)s) disconnected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:87
+#: pyanaconda/ui/tui/spokes/network.py:99
 #, python-format
 msgid "Wired (%(interface_name)s) connected\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:99
+#: pyanaconda/ui/tui/spokes/network.py:111
 #, python-format
 msgid " IPv4 Address: %(addr)s Netmask: %(netmask)s Gateway: %(gateway)s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:101
+#: pyanaconda/ui/tui/spokes/network.py:113
 #, python-format
 msgid " DNS: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:108
+#: pyanaconda/ui/tui/spokes/network.py:120
 #, python-format
 msgid " IPv6 Address: %(addr)s/%(prefix)d\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:128
+#: pyanaconda/ui/tui/spokes/network.py:140
 #, python-format
 msgid "Hostname: %s\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:140
+#: pyanaconda/ui/tui/spokes/network.py:152
 msgid "Set hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:142
+#: pyanaconda/ui/tui/spokes/network.py:154
 #, python-format
 msgid "Configure device %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:161
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:11
+#: pyanaconda/ui/tui/spokes/network.py:173
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:225
+#: pyanaconda/ui/gui/spokes/network.glade:2236
 msgid "Hostname"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:179
+#: pyanaconda/ui/tui/spokes/network.py:191
 msgid ""
 "Configuration not saved: gateway or netmask missing in static configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:195
+#: pyanaconda/ui/tui/spokes/network.py:207
 msgid "Can't apply configuration, device activation failed."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:222
-#: pyanaconda/ui/gui/spokes/network.py:1263
-#: pyanaconda/ui/gui/spokes/network.py:1336
+#: pyanaconda/ui/tui/spokes/network.py:234
+#: pyanaconda/ui/gui/spokes/network.py:1378
+#: pyanaconda/ui/gui/spokes/network.py:1448
 #, python-format
 msgid "Hostname is not valid: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:246
+#: pyanaconda/ui/tui/spokes/network.py:258
 msgid "Device configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:250
+#: pyanaconda/ui/tui/spokes/network.py:262
 #, python-format
 msgid "IPv4 address or %s for DHCP"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:252
+#: pyanaconda/ui/tui/spokes/network.py:264
 msgid "IPv4 netmask"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:253
+#: pyanaconda/ui/tui/spokes/network.py:265
 msgid "IPv4 gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:254
+#: pyanaconda/ui/tui/spokes/network.py:266
 #, python-format
 msgid ""
 "IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to "
 "turn off"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:257
+#: pyanaconda/ui/tui/spokes/network.py:269
 msgid "IPv6 default gateway"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:258
+#: pyanaconda/ui/tui/spokes/network.py:270
 msgid "Nameservers (comma separated)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:259
+#: pyanaconda/ui/tui/spokes/network.py:271
 msgid "Connect automatically after reboot"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:260
+#: pyanaconda/ui/tui/spokes/network.py:272
 msgid "Apply configuration in installer"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/network.py:275
+#: pyanaconda/ui/tui/spokes/network.py:287
 #, python-format
 msgid "Configuring device %s."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:29
+#: pyanaconda/ui/tui/spokes/password.py:32
 msgid "Root password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:48
+#: pyanaconda/ui/tui/spokes/password.py:55
 msgid "Password is set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:50
+#: pyanaconda/ui/tui/spokes/password.py:57
 msgid "Root account is disabled."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:52
+#: pyanaconda/ui/tui/spokes/password.py:59
 msgid "Password is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:57
+#: pyanaconda/ui/tui/spokes/password.py:64
 msgid "Please select new root password. You will have to type it twice."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/password.py:63
+#: pyanaconda/ui/tui/spokes/password.py:70
+#: pyanaconda/ui/gui/spokes/password.glade:86
+#: pyanaconda/ui/gui/spokes/user.glade:172
 msgid "Password"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:50
+#: pyanaconda/ui/tui/spokes/storage.py:55
 msgid "Use All Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:51
+#: pyanaconda/ui/tui/spokes/storage.py:56
 msgid "Replace Existing Linux system(s)"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:52
+#: pyanaconda/ui/tui/spokes/storage.py:57
 msgid "Use Free Space"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:62
+#: pyanaconda/ui/tui/spokes/storage.py:67
 msgid "Installation Destination"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:108
-#: pyanaconda/ui/gui/spokes/storage.py:478
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:360
 msgid "No disks selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:118
-#: pyanaconda/ui/gui/spokes/storage.py:488
+#: pyanaconda/ui/tui/spokes/storage.py:131
+#: pyanaconda/ui/gui/spokes/storage.py:372
 msgid "Error checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:120
-#: pyanaconda/ui/gui/spokes/storage.py:490
+#: pyanaconda/ui/tui/spokes/storage.py:133
+#: pyanaconda/ui/gui/spokes/storage.py:374
 msgid "Warning checking storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:123
-#: pyanaconda/ui/gui/spokes/storage.py:492
+#: pyanaconda/ui/tui/spokes/storage.py:136
+#: pyanaconda/ui/gui/spokes/storage.py:376
 msgid "Automatic partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:125
-#: pyanaconda/ui/gui/spokes/storage.py:494
+#: pyanaconda/ui/tui/spokes/storage.py:138
+#: pyanaconda/ui/gui/spokes/storage.py:378
 msgid "Custom partitioning selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:161
-#: pyanaconda/ui/gui/spokes/storage.py:724
+#: pyanaconda/ui/tui/spokes/storage.py:174
+#: pyanaconda/ui/gui/spokes/storage.py:602
 msgid ""
 "No disks detected.  Please shut down the computer, connect at least one "
 "disk, and restart to complete installation."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:163
-#: pyanaconda/ui/gui/spokes/storage.py:726
+#: pyanaconda/ui/tui/spokes/storage.py:176
+#: pyanaconda/ui/gui/spokes/storage.py:604
 msgid "No disks selected; please select at least one disk to install to."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:178
-#: pyanaconda/ui/tui/spokes/source.py:458
-#: pyanaconda/ui/gui/spokes/source.py:599
-#: pyanaconda/ui/gui/spokes/storage.py:682
+#: pyanaconda/ui/tui/spokes/storage.py:191
+#: pyanaconda/ui/tui/spokes/source.py:364
+#: pyanaconda/ui/gui/spokes/source.py:652
+#: pyanaconda/ui/gui/spokes/storage.py:553
 msgid "Probing storage..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:258
+#: pyanaconda/ui/tui/spokes/storage.py:212
+msgid "Select all"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:305
+msgid ""
+"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"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:307
+msgid ""
+"Warning: All storage changes made using the installer will be lost when you "
+"choose to format.\n"
+"\n"
+"Proceed to run dasdfmt?\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:322
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.py:92
+#, python-format
+msgid "Formatting /dev/%s. This may take a moment."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:366
 msgid "Generating updated storage configuration"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:263
-#: pyanaconda/ui/tui/spokes/storage.py:274
+#: pyanaconda/ui/tui/spokes/storage.py:371
+#: pyanaconda/ui/tui/spokes/storage.py:383
 #, python-format
 msgid "storage configuration failed: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:279
-#: pyanaconda/ui/gui/spokes/storage.py:325
-msgid "Checking storage configuration..."
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/storage.py:317
+#: pyanaconda/ui/tui/spokes/storage.py:430
 msgid "Autopartitioning Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:344
+#: pyanaconda/ui/tui/spokes/storage.py:456
 msgid ""
 "Installation requires partitioning of your hard drive. Select what space to "
 "use for the install target."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:383
+#: pyanaconda/ui/tui/spokes/storage.py:495
 msgid "Partition Scheme Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/storage.py:408
+#: pyanaconda/ui/tui/spokes/storage.py:519
 msgid "Select a partition scheme configuration."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:30
+#: pyanaconda/ui/tui/spokes/time_spoke.py:31
 msgid "Timezone settings"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:57
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:456
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:460
+#: pyanaconda/ui/tui/spokes/time_spoke.py:62
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:521
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:527
 #, python-format
 msgid "%s timezone"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:59
+#: pyanaconda/ui/tui/spokes/time_spoke.py:64
 msgid "Timezone is not set."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:67
+#: pyanaconda/ui/tui/spokes/time_spoke.py:72
 #, python-format
 msgid "Available timezones in region %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:70
+#: pyanaconda/ui/tui/spokes/time_spoke.py:75
 msgid "Available regions"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/time_spoke.py:129
+#: pyanaconda/ui/tui/spokes/time_spoke.py:134
 msgid ""
 "Please select the timezone.\n"
 "Use numbers or type names directly [b to region list, q to quit]: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:135
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:34
+msgid "Shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:49
+msgid "Start shell"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/shell_spoke.py:58
+msgid "Exit the shell to continue"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/source.py:54
 #, fuzzy
 msgid "Installation source"
 msgstr "Faka Kwisistimu"
 
-#: pyanaconda/ui/tui/spokes/source.py:138
-#: pyanaconda/ui/tui/spokes/source.py:184
-#: pyanaconda/ui/gui/spokes/source.py:529
-#: pyanaconda/ui/gui/spokes/source.glade.h:23
+#: pyanaconda/ui/tui/spokes/source.py:57
+#: pyanaconda/ui/tui/spokes/source.py:106
+#: pyanaconda/ui/gui/spokes/source.py:547
+#: pyanaconda/ui/gui/spokes/source.glade:759
 msgid "Closest mirror"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:176
-#: pyanaconda/ui/gui/spokes/source.py:521
+#: pyanaconda/ui/tui/spokes/source.py:98
+#: pyanaconda/ui/gui/spokes/source.py:539
 #, python-format
 msgid "NFS server %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:178
-#: pyanaconda/ui/gui/spokes/source.py:523
+#: pyanaconda/ui/tui/spokes/source.py:100
+#: pyanaconda/ui/gui/spokes/source.py:541
 msgid "Local media"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:181
-#: pyanaconda/ui/tui/spokes/source.py:191
-#: pyanaconda/ui/gui/spokes/source.py:517
+#: pyanaconda/ui/tui/spokes/source.py:103
+#: pyanaconda/ui/tui/spokes/source.py:117
+#: pyanaconda/ui/gui/spokes/source.py:535
 msgid "Error setting up software source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:186
-#: pyanaconda/ui/tui/spokes/software.py:102
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:462
-#: pyanaconda/ui/gui/spokes/software.py:200
-#: pyanaconda/ui/gui/spokes/source.py:531
+#: pyanaconda/ui/tui/spokes/source.py:108
+#: pyanaconda/ui/tui/spokes/software.py:87
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:529
+#: pyanaconda/ui/gui/spokes/software.py:216
+#: pyanaconda/ui/gui/spokes/source.py:549
 msgid "Nothing selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:193
-#: pyanaconda/ui/tui/spokes/software.py:82
+#: pyanaconda/ui/tui/spokes/source.py:119
+#: pyanaconda/ui/tui/spokes/software.py:67
 msgid "Processing..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:199
+#: pyanaconda/ui/tui/spokes/source.py:125
 #, python-format
 msgid "Repo URL set to: %s"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "CD/DVD"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "local ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:219
+#: pyanaconda/ui/tui/spokes/source.py:144
 msgid "Network"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:223
+#: pyanaconda/ui/tui/spokes/source.py:148
 msgid "Choose an installation source type."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:303
-#: pyanaconda/ui/gui/spokes/source.py:450
-msgid "Failed to set up installation source"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:308
-msgid "Error downloading package metadata"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:317
-#: pyanaconda/ui/tui/spokes/software.py:70
-#: pyanaconda/ui/gui/spokes/software.py:236
-#: pyanaconda/ui/gui/spokes/software.py:279
-#: pyanaconda/ui/gui/spokes/source.py:478
-msgid "No installation source available"
-msgstr ""
-
-#: pyanaconda/ui/tui/spokes/source.py:339
-#: pyanaconda/ui/tui/spokes/source.py:377
+#: pyanaconda/ui/tui/spokes/source.py:241
+#: pyanaconda/ui/tui/spokes/source.py:279
 msgid "Specify Repo Options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:343
+#: pyanaconda/ui/tui/spokes/source.py:245
 msgid "Repo URL"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:381
-msgid "NFS <server>:/<path>"
+#: pyanaconda/ui/tui/spokes/source.py:283
+msgid "<server>:/<path>"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:382
+#: pyanaconda/ui/tui/spokes/source.py:284
 msgid "NFS mount options"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:412
+#: pyanaconda/ui/tui/spokes/source.py:318
 msgid "Failed to set up installation source. Check the source address."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:420
+#: pyanaconda/ui/tui/spokes/source.py:326
 msgid "Select device containing the ISO file"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:479
+#: pyanaconda/ui/tui/spokes/source.py:385
 msgid "No mountable devices found"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:503
+#: pyanaconda/ui/tui/spokes/source.py:413
 msgid "Select an ISO to use as install source"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/source.py:532
+#: pyanaconda/ui/tui/spokes/source.py:442
 msgid "No *.iso files found in device root folder"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:38
+#: pyanaconda/ui/tui/spokes/software.py:39
 msgid "Software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:80
-#: pyanaconda/ui/gui/spokes/software.py:184
+#: pyanaconda/ui/tui/spokes/software.py:65
+#: pyanaconda/ui/gui/spokes/software.py:200
 msgid "Error checking software selection"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:84
-#: pyanaconda/ui/gui/spokes/software.py:187
+#: pyanaconda/ui/tui/spokes/software.py:69
+#: pyanaconda/ui/gui/spokes/software.py:203
 msgid "Installation source not set up"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:86
-#: pyanaconda/ui/gui/spokes/software.py:190
+#: pyanaconda/ui/tui/spokes/software.py:71
+#: pyanaconda/ui/gui/spokes/software.py:206
 msgid "Source changed - please verify"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:101
-#: pyanaconda/ui/gui/spokes/software.py:198
+#: pyanaconda/ui/tui/spokes/software.py:86
+#: pyanaconda/ui/gui/spokes/software.py:214
 msgid "Custom software selected"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:122
+#: pyanaconda/ui/tui/spokes/software.py:111
 msgid "Installation source needs to be set up first."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/software.py:132
-#: pyanaconda/ui/tui/spokes/software.py:142
+#: pyanaconda/ui/tui/spokes/software.py:121
+#: pyanaconda/ui/tui/spokes/software.py:131
 msgid "Base environment"
 msgstr ""
 
+#: pyanaconda/ui/tui/spokes/user.py:37
+msgid "User creation"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:114 pyanaconda/ui/gui/spokes/user.py:347
+msgid "No user will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:116
+msgid "You must set a password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:118 pyanaconda/ui/gui/spokes/user.py:349
+#, python-format
+msgid "Administrator %s will be created"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/user.py:120 pyanaconda/ui/gui/spokes/user.py:351
+#, python-format
+msgid "User %s will be created"
+msgstr ""
+
 #: pyanaconda/ui/tui/spokes/warnings.py:36
 #, fuzzy
 msgid "Warnings"
 msgstr "Isexwayiso"
 
 #: pyanaconda/ui/tui/spokes/warnings.py:44
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:4
+#: pyanaconda/ui/gui/spokes/welcome.glade:518
 msgid ""
 "This hardware (or a combination thereof) is not supported by Red Hat.  For "
 "more information on supported hardware, please refer to http://www.redhat."
@@ -1115,580 +2036,404 @@ msgstr ""
 msgid "\tInstallation complete.  Press return to quit"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:46
+#: pyanaconda/ui/tui/spokes/__init__.py:48
 msgid "Default spoke title"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:56
+#: pyanaconda/ui/tui/spokes/__init__.py:60
 msgid "testing status..."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:94
+#: pyanaconda/ui/tui/spokes/__init__.py:102
 msgid "New value"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:111
+#: pyanaconda/ui/tui/spokes/__init__.py:122
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:112
+#: pyanaconda/ui/tui/spokes/__init__.py:123
 #, python-format
 msgid "%s (confirm): "
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:115
+#: pyanaconda/ui/tui/spokes/__init__.py:126
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:130
+#: pyanaconda/ui/tui/spokes/__init__.py:146
 #, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:133
+#: pyanaconda/ui/tui/spokes/__init__.py:149
 msgid ""
 "You have provided a weak password.\n"
 "Would you like to use it anyway?"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:143
+#: pyanaconda/ui/tui/spokes/__init__.py:157
+msgid ""
+"You have provided a password containing non-ASCII characters.\n"
+"You may not be able to switch between keyboard layouts to login.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:163
 #, python-format
 msgid "Enter new value for '%s' and press enter\n"
 msgstr ""
 
-#: pyanaconda/ui/tui/spokes/__init__.py:239
+#: pyanaconda/ui/tui/spokes/__init__.py:171
+#, python-format
+msgid ""
+"You have provided an invalid username: %s\n"
+"Tip: Keep your username shorter than 32 characters and do not use spaces.\n"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:282
 msgid "Password set."
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:657
-msgid "_Exit Installer"
+#: pyanaconda/ui/gui/__init__.py:475 widgets/src/BaseWindow.c:113
+msgid "Help!"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:666 pyanaconda/ui/gui/hubs/progress.py:203
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.py:942 widgets/src/StandaloneWindow.c:54
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:1
-#: pyanaconda/ui/gui/hubs/summary.glade.h:2
+#: pyanaconda/ui/gui/__init__.py:728 widgets/src/StandaloneWindow.c:49
 msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_No"
 msgstr ""
 
-#: pyanaconda/ui/gui/__init__.py:681
+#: pyanaconda/ui/gui/__init__.py:743
 msgid "_Yes"
 msgstr ""
 
-#: pyanaconda/ui/gui/categories/__init__.py:47
-msgid "DEFAULT TITLE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/customization.py:32
-msgid "CUSTOMIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/localization.py:31
-msgid "LOCALIZATION"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/software.py:31
-msgid "SOFTWARE"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/system.py:32
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:162
-msgid "SYSTEM"
-msgstr ""
-
-#: pyanaconda/ui/gui/categories/user_settings.py:32
-msgid "USER SETTINGS"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/__init__.py:284
+#: pyanaconda/ui/gui/hubs/__init__.py:231
 msgid ""
 "Please complete items marked with this icon before continuing to the next "
 "step."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:200
+#: pyanaconda/ui/gui/hubs/progress.py:110
+msgid "Complete!"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/progress.py:208
 #, python-format
 msgid ""
 "%s is now successfully installed on your system and ready for you to use!  "
 "When you are ready, reboot your system to start using it!"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.py:282
-msgid "Complete!"
+#: pyanaconda/ui/gui/hubs/progress.py:211
+msgctxt "GUI|Progress"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:98
+#: pyanaconda/ui/gui/hubs/progress.py:219
 #, python-format
-msgid "New %(name)s %(version)s Installation"
+msgid ""
+"%s is now successfully installed, but some configuration still needs to be "
+"done.\n"
+"Finish it and then click the Finish configuration button please."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:99
+#: pyanaconda/ui/gui/hubs/progress.py:224
+#, python-format
+msgid ""
+"%s is now successfully installed and ready for you to use!\n"
+"Go ahead and reboot to start using it!"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:106
 #, python-format
 msgid "Create a new %(container_type)s ..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:100
+#: pyanaconda/ui/gui/spokes/custom.py:107
 #, python-format
 msgid "Create or select %(container_type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:101
-#, python-format
-msgid "CONFIGURE %(container_type)s"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:102
-#, python-format
-msgid ""
-"Please create a name for this %(container_type)s and select at least one "
-"disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:104
-msgid "Volume Group"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:105
-msgid "Volume"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:106
-msgid ""
-"Storage configuration reset due to unrecoverable error. Click for details."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:108
+#: pyanaconda/ui/gui/spokes/custom.py:109
 msgid "Device reconfiguration failed. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:111
-msgid "Please enter a valid mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:112
-msgid "That mount point is invalid. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:113
-msgid "That mount point is already in use. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:115
-#, python-format
 msgid ""
-"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
-"than you currently have selected (%(count)d)."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:118
-#: pyanaconda/ui/gui/spokes/custom.glade.h:22
-msgid "Please enter a valid name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:119
-msgid "That name is invalid. Try something else?"
+"Storage configuration reset due to unrecoverable error. Click for details."
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/custom.py:135
-#: pyanaconda/ui/gui/spokes/storage.glade.h:7
-#: pyanaconda/ui/gui/spokes/custom.glade.h:35
-msgid "LVM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:136
-#: pyanaconda/ui/gui/spokes/storage.glade.h:8
-#: pyanaconda/ui/gui/spokes/custom.glade.h:37
-msgid "LVM Thin Provisioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:137
-#: pyanaconda/ui/gui/spokes/custom.glade.h:36
-msgid "RAID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:138
-#: pyanaconda/ui/gui/spokes/storage.glade.h:5
-#: pyanaconda/ui/gui/spokes/custom.glade.h:33
-msgid "Standard Partition"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:139
-#: pyanaconda/ui/gui/spokes/storage.glade.h:6
-#: pyanaconda/ui/gui/spokes/custom.glade.h:34
-msgid "BTRFS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:140
-#: pyanaconda/ui/gui/spokes/custom.glade.h:16
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:4
-msgid "Disk"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:254
-#: pyanaconda/ui/gui/spokes/custom.py:597
-#: pyanaconda/ui/gui/spokes/network.py:975 widgets/src/SpokeSelector.c:55
-#: pyanaconda/ui/gui/spokes/filter.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:67
-msgid "None"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:328
-#, python-format
-msgid "Delete _all other filesystems in the %s root as well."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:337
-#, python-format
-msgid "Are you sure you want to delete all of the data on %s?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:339
-#, python-format
-msgid ""
-"Are you sure you want to delete all of the data on %s, including subvolumes "
-"and/or snapshots?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:431
-msgid "container"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:632
-#: pyanaconda/ui/gui/spokes/custom.glade.h:27
+#: pyanaconda/ui/gui/spokes/custom.glade:93
 msgid "MANUAL PARTITIONING"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:853
-#: pyanaconda/ui/gui/spokes/filter.py:508
+#: pyanaconda/ui/gui/spokes/custom.py:342
 #, python-format
+msgctxt "GUI|Custom Partitioning"
 msgid "%d _storage device selected"
 msgid_plural "%d _storage devices selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:966
+#: pyanaconda/ui/gui/spokes/custom.py:468
 #, python-format
 msgid ""
 "When you create mount points for your %(name)s %(version)s installation, "
 "you'll be able to view their details here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1037
-msgid ""
-"The 'swap' area on your computer is used by the operating\n"
-"system when running low on memory."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1040
-msgid ""
-"The 'boot' area on your computer is where files needed\n"
-"to start the operating system are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1043
-msgid ""
-"The 'root' area on your computer is where core system\n"
-"files and applications are stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1046
-msgid ""
-"The 'home' area on your computer is where all your personal\n"
-"data is stored."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1049
-msgid ""
-"The BIOS boot partition is required to enable booting\n"
-"from GPT-partitioned disks on BIOS hardware."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1052
-msgid ""
-"The PReP boot partition is required as part of the\n"
-"bootloader configuration on some PPC platforms."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.py:1244
+#: pyanaconda/ui/gui/spokes/custom.py:628
 #, python-format
-msgid "/boot/efi must be on a device of type %s"
+msgid ""
+"/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1248
+#: pyanaconda/ui/gui/spokes/custom.py:632
 #, python-format
 msgid "%(fs)s must be on a device of type %(type)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1251
-#: pyanaconda/ui/gui/spokes/custom.py:1253
+#: pyanaconda/ui/gui/spokes/custom.py:635
+#: pyanaconda/ui/gui/spokes/custom.py:637
 #, python-format
 msgid "%s cannot be encrypted"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1255
+#: pyanaconda/ui/gui/spokes/custom.py:639
 msgid "You must create a new filesystem on the root device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1257
+#: pyanaconda/ui/gui/spokes/custom.py:644
 #, python-format
-msgid "Devices of type %s require a valid RAID level selection."
+msgid "Device does not support RAID level selection %s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1490
+#: pyanaconda/ui/gui/spokes/custom.py:746
 msgid "Device resize request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1562
+#: pyanaconda/ui/gui/spokes/custom.py:817
 msgid "Device reformat request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1614
+#: pyanaconda/ui/gui/spokes/custom.py:1187
 #, python-format
 msgid "Specified name %s already in use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1730
-msgid "This file system does not support labels."
+#: pyanaconda/ui/gui/spokes/custom.py:1345
+msgid "No disks assigned"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1898
+#: pyanaconda/ui/gui/spokes/custom.py:1351
+#, python-format
+msgctxt "GUI|Custom Partitioning|Devices"
+msgid " and %d other"
+msgid_plural " and %d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1442
 msgid ""
 "The space available to this mountpoint can be changed by modifying the "
 "volume below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:1900
+#: pyanaconda/ui/gui/spokes/custom.py:1444
 msgid "This file system may not be resized."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2078
+#: pyanaconda/ui/gui/spokes/custom.py:1498
+msgid ""
+"Error checking storage configuration.  Click for details or press Done again "
+"to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1500
+msgid ""
+"Warning checking storage configuration.  Click for details or press Done "
+"again to continue."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:1606
 #, python-format
 msgid "Added new %(type)s to existing container %(name)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2090
+#: pyanaconda/ui/gui/spokes/custom.py:1618
 msgid "Failed to add new device. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2096
+#: pyanaconda/ui/gui/spokes/custom.py:1624
 msgid "Invalid partition size set. Use a valid integer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2121
+#: pyanaconda/ui/gui/spokes/custom.py:1732
 msgid "Device removal request failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2348
+#: pyanaconda/ui/gui/spokes/custom.py:1965
 #, python-format
 msgid "Volume Group name %s is already in use. Not saving changes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2482
+#: pyanaconda/ui/gui/spokes/custom.py:1996
+#, python-format
+msgid "(%s free)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2133
 #, python-format
 msgid ""
 "This Software RAID array is missing %(missingMembers)d of %(totalMembers)d "
 "member partitions. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2488
+#: pyanaconda/ui/gui/spokes/custom.py:2139
 #, python-format
 msgid ""
 "This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
 "volumes. You can remove it or select a different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2557
+#: pyanaconda/ui/gui/spokes/custom.py:2222
 msgid "No disks selected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2563
+#: pyanaconda/ui/gui/spokes/custom.py:2228
 msgid "Not enough free space on selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2569
+#: pyanaconda/ui/gui/spokes/custom.py:2234
+#: pyanaconda/ui/gui/spokes/custom.py:2260
 msgid "Automatic partitioning failed. Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2864
+#: pyanaconda/ui/gui/spokes/custom.py:2463
+msgid ""
+"Continuing with this action will reset all your partitioning selections to "
+"their current on-disk state."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Reset selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2471
+msgid "_Preserve current selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.py:2546
 msgid "Failed to unlock encrypted block device. Click for details"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.py:2889
-#, python-format
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Screen Layout\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"The right-hand side of the screen is where you can customize the currently-"
-"selected mountpoint.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"How to create a new filesystem on a new device\n"
-"\n"
-"1. Click on the + button.\n"
-"2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either "
-"of the text entry areas for help.)\n"
-"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.\n"
-"\n"
-"\n"
-"How to reformat a device/filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Click on the \"Customize\" expander in the mountpoint customization area "
-"on the right-hand side of the screen.\n"
-"3. Activate the \"Reformat\" checkbutton, select a filesystem type and, if "
-"applicable, enter a mountpoint above in the \"Mountpoint\" text entry area.\n"
-"4. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to set a mountpoint for a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem from the left-hand side of the screen.\n"
-"2. Enter a mountpoint in the \"Mountpoint\" text entry area in the "
-"mountpoint customization area.\n"
-"3. Click on \"Apply changes\"\n"
-"\n"
-"\n"
-"How to remove a filesystem that already exists on your disk\n"
-"\n"
-"1. Select the filesystem you wish to remove on the left-hand side of the "
-"screen.\n"
-"2. Click the - button.\n"
-"\n"
-"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.\n"
-"\n"
-"\n"
-"Tips and hints\n"
-"\n"
-"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.\n"
-"\n"
-"By default, new devices use any/all of your selected disks.\n"
-"\n"
-"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.\n"
-"\n"
-"When adding a new mountpoint by clicking the + button, leave the size entry "
-"blank to make the new device use all available free space.\n"
-"\n"
-"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.\n"
-"\n"
-"When the last partition is removed from a disk, that disk may be "
-"reinitialized with a new partition table if we think there is a more "
-"appropriate type for that disk.\n"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:348
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:392
+msgctxt "GUI|Spoke"
 msgid "DATE & _TIME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:447
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:512
 msgid "Restoring hardware time..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:458
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:523
 msgid "Invalid timezone"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:966
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:695
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:709
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:891
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:725
+msgid "PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:697
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:706
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:890
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:893
+msgid "AM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1040
 msgid "You need to set up networking first if you want to use NTP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:971
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:1045
 msgid "You have no working NTP server configured"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.py:408
+#: pyanaconda/ui/gui/spokes/filter.py:392
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:43
+#: pyanaconda/ui/gui/spokes/filter.py:494
+#, python-format
+msgctxt "GUI|Installation Destination|Filter"
+msgid "%d _storage device selected"
+msgid_plural "%d _storage devices selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:48
 #, python-format
 msgid "%s to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:259
+#: pyanaconda/ui/gui/spokes/keyboard.py:272
+msgctxt "GUI|Spoke"
 msgid "_KEYBOARD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:334
+#: pyanaconda/ui/gui/spokes/keyboard.py:359
 msgid "Testing layouts configuration not available."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.py:386
+#: pyanaconda/ui/gui/spokes/keyboard.py:367
+msgid "Getting list of layouts..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.py:422
 msgid "Layout switching not configured."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.py:46
+#: pyanaconda/ui/gui/spokes/langsupport.py:54
+msgctxt "GUI|Spoke"
 msgid "_LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:88
+#: pyanaconda/ui/gui/spokes/network.py:85
 msgid "Status unknown (missing)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:91
+#: pyanaconda/ui/gui/spokes/network.py:88
 msgid "Status unknown"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:90
 msgid "Unmanaged"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:96
+#: pyanaconda/ui/gui/spokes/network.py:93
+#: pyanaconda/ui/gui/spokes/network.py:97
+msgid "Unavailable"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:95
 msgid "Firmware missing"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:99
-msgid "Cable unplugged"
-msgstr ""
-
 #: pyanaconda/ui/gui/spokes/network.py:101
-msgid "Unavailable"
+msgid "Cable unplugged"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/network.py:103
@@ -1715,277 +2460,300 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:590
-msgid "unplugged"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.py:603
+#: pyanaconda/ui/gui/spokes/network.py:298
 msgid "Ethernet"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:605
+#: pyanaconda/ui/gui/spokes/network.py:299
 msgid "Wireless"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:607
-#: pyanaconda/ui/gui/spokes/network.glade.h:3
+#: pyanaconda/ui/gui/spokes/network.py:300
+#: pyanaconda/ui/gui/spokes/network.glade:15
 msgid "Bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:609
-#: pyanaconda/ui/gui/spokes/network.glade.h:7
+#: pyanaconda/ui/gui/spokes/network.py:301
+#: pyanaconda/ui/gui/spokes/network.glade:23
 msgid "Vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:611
-#: pyanaconda/ui/gui/spokes/network.glade.h:5
+#: pyanaconda/ui/gui/spokes/network.py:302
+#: pyanaconda/ui/gui/spokes/network.glade:19
 msgid "Team"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:677
-#: pyanaconda/ui/gui/spokes/network.glade.h:18
+#. TRANSLATORS: ethernet cable is unplugged
+#: pyanaconda/ui/gui/spokes/network.py:692
+msgid "unplugged"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:782
+#: pyanaconda/ui/gui/spokes/network.glade:536
+#: pyanaconda/ui/gui/spokes/network.glade:837
 msgid "IPv4 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:678
-#: pyanaconda/ui/gui/spokes/network.glade.h:17
+#: pyanaconda/ui/gui/spokes/network.py:783
+#: pyanaconda/ui/gui/spokes/network.glade:512
+#: pyanaconda/ui/gui/spokes/network.glade:849
+#: pyanaconda/ui/gui/spokes/network.glade:1417
 msgid "IPv6 Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:680
-#: pyanaconda/ui/gui/spokes/network.py:682
-#: pyanaconda/ui/gui/spokes/network.glade.h:33
+#: pyanaconda/ui/gui/spokes/network.py:785
+#: pyanaconda/ui/gui/spokes/network.py:787
+#: pyanaconda/ui/gui/spokes/network.glade:1405
 msgid "IP Address"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:765
+#: pyanaconda/ui/gui/spokes/network.py:876
 #, python-format
 msgid "%d Mb/s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:960
+#: pyanaconda/ui/gui/spokes/network.py:1080
 msgid "WEP"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:963
+#: pyanaconda/ui/gui/spokes/network.py:1083
 msgid "WPA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:966
+#: pyanaconda/ui/gui/spokes/network.py:1086
 msgid "WPA2"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:970
+#: pyanaconda/ui/gui/spokes/network.py:1090
 msgid "Enterprise"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1104
+#: pyanaconda/ui/gui/spokes/network.py:1095 widgets/src/SpokeSelector.c:57
+#: pyanaconda/ui/gui/spokes/filter.glade:158
+#: pyanaconda/ui/gui/spokes/filter.glade:560
+#: pyanaconda/ui/gui/spokes/filter.glade:904
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:532
+msgid "None"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.py:1219
+#: pyanaconda/ui/gui/spokes/network.glade:2438
 msgid "Authentication required by wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1105
+#: pyanaconda/ui/gui/spokes/network.py:1220
 #, python-format
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network '%(network_id)s'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1118
+#: pyanaconda/ui/gui/spokes/network.py:1233
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1126
+#: pyanaconda/ui/gui/spokes/network.py:1241
+msgctxt "GUI|Network|Secrets Dialog"
 msgid "_Key:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.py:1181
-msgid "_NETWORK CONFIGURATION"
+#: pyanaconda/ui/gui/spokes/network.py:1298
+msgctxt "GUI|Spoke"
+msgid "_NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:46
+#: pyanaconda/ui/gui/spokes/password.py:51
+msgctxt "GUI|Spoke"
 msgid "_ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:89
-#: pyanaconda/ui/gui/spokes/password.py:90
+#: pyanaconda/ui/gui/spokes/password.py:98
+#: pyanaconda/ui/gui/spokes/password.py:99
 msgid "The password is set."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:112
+#: pyanaconda/ui/gui/spokes/password.py:121
 msgid "Root password is set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:114
+#: pyanaconda/ui/gui/spokes/password.py:123
 msgid "Root account is disabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.py:116
+#: pyanaconda/ui/gui/spokes/password.py:125
 msgid "Root password is not set"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:48
+#: pyanaconda/ui/gui/spokes/software.py:52
+msgctxt "GUI|Spoke"
 msgid "_SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:122
-#: pyanaconda/ui/gui/spokes/source.py:511
-msgid "Checking software dependencies..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:127
-msgid "Error checking software dependencies"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/software.py:210
-#: pyanaconda/ui/gui/spokes/source.py:51
+#: pyanaconda/ui/gui/spokes/software.py:92
+#: pyanaconda/ui/gui/spokes/source.py:54
 msgid "Downloading package metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:214
+#: pyanaconda/ui/gui/spokes/software.py:95
 msgid "Downloading group metadata..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:355
+#: pyanaconda/ui/gui/spokes/software.py:135
+#: pyanaconda/ui/gui/spokes/source.py:529
+msgid "Checking software dependencies..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:140
+msgid "Error checking software dependencies"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/software.py:356
 msgid "Error checking software dependencies.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:452
+#: pyanaconda/ui/gui/spokes/software.py:460
 msgid ""
-"The following software marked for installation has errors.  This is likely "
-"caused by an error with\n"
-"your installation source.  You can change your installation source or quit "
-"the installer."
+"The software marked for installation has the following errors.  This is "
+"likely caused by an error with your installation source.  You can quit the "
+"installer, change your software source, or change your software selections."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:455
-#: pyanaconda/ui/gui/spokes/storage.glade.h:19
-#: pyanaconda/ui/gui/spokes/source.glade.h:4
-#: pyanaconda/ui/gui/spokes/custom.glade.h:1
-msgid "_Cancel"
+#: pyanaconda/ui/gui/spokes/software.py:465
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "_Quit"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.py:456
+#: pyanaconda/ui/gui/spokes/software.py:466
+msgctxt "GUI|Software Selection|Error Dialog"
 msgid "_Modify Software Source"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:50
+#: pyanaconda/ui/gui/spokes/software.py:467
+msgctxt "GUI|Software Selection|Error Dialog"
+msgid "Modify _Selections"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:53
 msgid "Setting up installation source..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:52
-msgid "Error downloading package metadata..."
+#: pyanaconda/ui/gui/spokes/source.py:83
+msgid "Invalid proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:167
+#: pyanaconda/ui/gui/spokes/source.py:88
+#, python-format
+msgid "Invalid proxy protocol: %s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:94
+msgid "Extra characters in proxy URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:98
+msgid "Proxy authentication data duplicated"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:231
 msgid "This media is good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:169
+#: pyanaconda/ui/gui/spokes/source.py:233
 msgid "This media is not good to install from."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:289
+#: pyanaconda/ui/gui/spokes/source.py:354
+msgctxt "GUI|Spoke"
 msgid "_INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:405
-#: pyanaconda/ui/gui/spokes/source.py:452
-#: pyanaconda/ui/gui/spokes/source.py:464
+#: pyanaconda/ui/gui/spokes/source.py:469
+#: pyanaconda/ui/gui/spokes/source.py:668
 msgid "Failed to set up installation source; check the repo url"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:454
+#: pyanaconda/ui/gui/spokes/source.py:533
+msgid "Error setting up base repository"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:544
+msgid "Error setting up ISO file"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:670
 msgid ""
 "Failed to set up installation source; check the repo url and proxy settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:515
-msgid "Error setting up base repository"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:526
-msgid "Error setting up ISO file"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:626
+#: pyanaconda/ui/gui/spokes/source.py:699
 #, python-format
 msgid "Device: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:627
+#: pyanaconda/ui/gui/spokes/source.py:700
 #, python-format
 msgid "Label: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1032
+#: pyanaconda/ui/gui/spokes/source.py:888
+msgid "URL is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:892
+msgid "Invalid URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:909
+msgid "Protocol in URL does not match selected protocol"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:912
+msgid "NFS server is empty"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:919
+msgid "Invalid host name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:922
+msgid "Remote directory is required"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.py:943
 msgid "Duplicate repository names."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1043
-msgid ""
-"Duplicate repository names not allowed; choose a unique name for each "
-"repository."
+#: pyanaconda/ui/gui/spokes/source.py:950
+msgid "Empty repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1065
-msgid "Empty repository name."
+#: pyanaconda/ui/gui/spokes/source.py:953
+msgid "Invalid repository name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.py:1069
-msgid "Invalid repository name."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.py:1072
+#: pyanaconda/ui/gui/spokes/source.py:959
 msgid "Repository name conflicts with internal repository name."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:126
+#: pyanaconda/ui/gui/spokes/storage.py:113
+msgid "Please wait... software metadata still loading."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:114
 #, python-format
 msgid ""
-"You have <b>%(freeSpace)s</b> of free space, which is enough to install "
-"%(productName)s.  What would you like to do?"
+"Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+"selection</a> requires <b>%(total)s</b> of available space, including <b>"
+"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:132
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">A_utomatically configure my %(productName)s "
-"installation to the disk(s) I selected and return me to the main menu.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:142
-#, python-format
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want more space. _Guide me through "
-"shrinking and/or removing partitions so I can have more space for "
-"%(productName)s.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:151
-msgid ""
-"<span font-desc=\"Cantarell 11\">I want to review/_modify my disk partitions "
-"before continuing.</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:174
-#, python-format
-msgid ""
-"Your current <a href=\"\"><b>%(product)s</b> software selection</a> requires "
-"<b>%(total)s</b> of available space, including <b>%(software)s</b> for "
-"software and <b>%(swap)s</b> for swap space."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:242
+#: pyanaconda/ui/gui/spokes/storage.py:164
 #, python-format
 msgid "%s The disks you've selected have the following amounts of free space:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:246
-#: pyanaconda/ui/gui/spokes/storage.py:287
-msgid "Please wait... software metadata still loading."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:251
+#: pyanaconda/ui/gui/spokes/storage.py:172
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %s</b>.  You can shrink "
@@ -1993,14 +2761,14 @@ msgid ""
 "adjust your partitions on your own in the custom partitioning interface."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:281
+#: pyanaconda/ui/gui/spokes/storage.py:196
 #, python-format
 msgid ""
 "%(sw_text)s You don't have enough space available to install <b>%(product)s</"
 "b>, even if you used all of the free space available on the selected disks."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:292
+#: pyanaconda/ui/gui/spokes/storage.py:207
 #, python-format
 msgid ""
 "<b>You don't have enough space available to install %(productName)s</b>, "
@@ -2009,128 +2777,148 @@ msgid ""
 "install a smaller version of <b>%(productName)s</b>, or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:343
+#: pyanaconda/ui/gui/spokes/storage.py:228
+msgctxt "GUI|Spoke"
 msgid "INSTALLATION _DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:427
+#: pyanaconda/ui/gui/spokes/storage.py:311
 msgid "Saving storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:433
-#: pyanaconda/ui/gui/spokes/storage.py:445
+#: pyanaconda/ui/gui/spokes/storage.py:317
+#: pyanaconda/ui/gui/spokes/storage.py:329
 msgid "Failed to save storage configuration..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:613
+#: pyanaconda/ui/gui/spokes/storage.py:365
+#: pyanaconda/ui/gui/spokes/storage.py:635
+msgid "Formatting DASDs"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:499
 msgid "Error checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:615
+#: pyanaconda/ui/gui/spokes/storage.py:501
 msgid "Warning checking storage configuration.  Click for details."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:666
+#: pyanaconda/ui/gui/spokes/storage.py:537
 #, python-format
 msgid "%s free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:711
+#: pyanaconda/ui/gui/spokes/storage.py:584
 #, python-format
 msgid "%(count)d disk selected; %(capacity)s capacity; %(free)s free"
 msgid_plural "%(count)d disks selected; %(capacity)s capacity; %(free)s free"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:766
+#: pyanaconda/ui/gui/spokes/storage.py:672
 msgid ""
 "You have chosen to skip bootloader installation.  Your system may not be "
 "bootable."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:938
+#: pyanaconda/ui/gui/spokes/storage.py:886
+msgid "You'll be able to make space available during custom partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:902
 msgid ""
 "The following errors were encountered when checking your storage "
 "configuration.  You can modify your storage layout or quit the installer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:942
+#: pyanaconda/ui/gui/spokes/storage.py:907
+msgctxt "GUI|Storage|Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.py:908
+msgctxt "GUI|Storage|Error Dialog"
 msgid "_Modify Storage Layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:954
+#: pyanaconda/ui/gui/spokes/storage.py:921
 msgid ""
 "The following warnings were encountered when checking your storage "
 "configuration.  These are not fatal, but you may wish to make changes to "
 "your storage layout."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.py:958
+#: pyanaconda/ui/gui/spokes/storage.py:925
 #, fuzzy
 msgid "_OK"
 msgstr "KULUNGILE"
 
-#: pyanaconda/ui/gui/spokes/user.py:54
+#: pyanaconda/ui/gui/spokes/user.py:71
 #, python-format
 msgid "Invalid group name: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:202
+#: pyanaconda/ui/gui/spokes/user.py:212
+msgctxt "GUI|Spoke"
 msgid "_USER CREATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:273 pyanaconda/ui/gui/spokes/user.py:274
+#: pyanaconda/ui/gui/spokes/user.py:285 pyanaconda/ui/gui/spokes/user.py:286
 msgid "The password was set by kickstart."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:300
+#: pyanaconda/ui/gui/spokes/user.py:314
 msgid "Invalid username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:302
+#: pyanaconda/ui/gui/spokes/user.py:316
 msgid "Full name cannot contain colon characters"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:333
-msgid "No user will be created"
+#: pyanaconda/ui/gui/spokes/welcome.py:254
+#, python-format
+msgid "WELCOME TO %(name)s %(version)s."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.py:335
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.py:270
 #, python-format
-msgid "Administrator %s will be created"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/user.py:337
-#, python-format
-msgid "User %s will be created"
+msgid ""
+"The following nodes were discovered using the iSCSI initiator <b>"
+"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
+"Please select which nodes you wish to log into:"
 msgstr ""
 
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:157
 msgid "DATA"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:257
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:278
 #, python-format
 msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:268
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:287
 msgid "_Click here to create them automatically."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:285
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:312
 msgid "Create new mount points by clicking the '+' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/accordion.py:296
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:320
 msgid ""
 "Or, assign new mount points to existing partitions after selecting them "
 "below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:133
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:325
+msgid "_New mount points will use the following partitioning scheme:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.py:131
 #, python-format
 msgid ""
 "<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> (unpartitioned "
@@ -2141,68 +2929,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:189
+#: pyanaconda/ui/gui/spokes/lib/cart.py:190
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Do not install bootloader"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.py:191
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/cart.py:193
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:183
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Set as Boot Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:32
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:63
+#, python-format
+msgid ""
+"The RAID level you have selected (%(level)s) requires more disks (%(min)d) "
+"than you currently have selected (%(count)d)."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:67
+#, python-format
+msgid "CONFIGURE %(container_type)s"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:68
+#, python-format
+msgid ""
+"Please create a name for this %(container_type)s and select at least one "
+"disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:71
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:72
+msgid "Volume Group"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:73
+msgid "Volume"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:113
+msgid "Can not relabel already existing filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:118
+msgid "Can not set label on filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:120
+msgid "Unacceptable label format for filesystem."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:130
+msgid "That mount point is already in use. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:132
+msgid "Please enter a valid mountpoint."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:134
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:146
+msgid "That mount point is invalid. Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:287
+msgid "container"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:359
+#, python-format
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "Delete _all other filesystems in the %s root as well."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:369
+#, python-format
+msgid "Are you sure you want to delete all of the data on %s?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:371
+#, python-format
+msgid ""
+"Are you sure you want to delete all of the data on %s, including snapshots "
+"and/or subvolumes?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py:648
+msgid "Invalid container name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:49
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.py:59
+msgctxt "GUI|Detailed Error Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:34
 #, python-format
 msgid "You have provided a weak passphrase: %s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.py:33
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:35
 msgid "Passphrases do not match."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:50
+#: pyanaconda/ui/gui/spokes/lib/passphrase.py:157
+msgid "Passphrase contains non-ASCII characters"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.py:53
 msgid "Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:51
+#: pyanaconda/ui/gui/spokes/lib/resize.py:54
 msgid "Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:52
+#: pyanaconda/ui/gui/spokes/lib/resize.py:55
 msgid "Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:110
+#: pyanaconda/ui/gui/spokes/lib/resize.py:114
 msgid "This device contains the installation source."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:155
+#: pyanaconda/ui/gui/spokes/lib/resize.py:160
 #, python-format
 msgid "%(freeSize)s of %(devSize)s"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:161
+#: pyanaconda/ui/gui/spokes/lib/resize.py:167
 msgid "Not resizeable"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:180
-msgid "<span foreground='grey' style='italic'>Free space</span>"
+#: pyanaconda/ui/gui/spokes/lib/resize.py:191
+msgid "Free space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:199
+#: pyanaconda/ui/gui/spokes/lib/resize.py:213
 msgid ""
 "You can remove existing filesystems you no longer need to free up space for "
 "this installation.  Removing a filesystem will permanently delete all of the "
 "data it contains."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:205
+#: pyanaconda/ui/gui/spokes/lib/resize.py:219
 msgid ""
 "There is also free space available in pre-existing filesystems.  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."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:214
+#: pyanaconda/ui/gui/spokes/lib/resize.py:229
 #, python-format
 msgid "<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)"
 msgid_plural ""
@@ -2210,945 +3093,1347 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:220
+#: pyanaconda/ui/gui/spokes/lib/resize.py:236
 #, python-format
 msgid "Total selected space to reclaim: <b>%s</b>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:405
-#: pyanaconda/ui/gui/spokes/lib/resize.py:410
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:12
+#: pyanaconda/ui/gui/spokes/lib/resize.py:451
+#: pyanaconda/ui/gui/spokes/lib/resize.py:456
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:269
+msgctxt "GUI|Reclaim Dialog"
 msgid "Delete _all"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.py:407
+#: pyanaconda/ui/gui/spokes/lib/resize.py:453
+msgctxt "GUI|Reclaim Dialog"
 msgid "Preserve _all"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:86
+#: widgets/src/BaseWindow.c:109
 msgid "DISTRIBUTION INSTALLATION"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:87
+#: widgets/src/BaseWindow.c:110
 msgid "SPOKE NAME"
 msgstr ""
 
-#: widgets/src/BaseWindow.c:88
+#: widgets/src/BaseWindow.c:111
 msgid "PRE-RELEASE / TESTING"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:52
+#: widgets/src/DiskOverview.c:54
 msgid "New Device"
 msgstr ""
 
-#: widgets/src/DiskOverview.c:54 widgets/src/DiskOverview.c:55
+#: widgets/src/DiskOverview.c:56 widgets/src/DiskOverview.c:57
 msgid "0 MB"
 msgstr ""
 
-#: widgets/src/MountpointSelector.c:50
+#: widgets/src/MountpointSelector.c:52
 msgid "0 GB"
 msgstr ""
 
-#: widgets/src/SpokeSelector.c:56
+#: widgets/src/SpokeSelector.c:58
 msgid "New Selector"
 msgstr ""
 
-#: widgets/src/SpokeWindow.c:48 pyanaconda/ui/gui/spokes/source.glade.h:1
+#: widgets/src/SpokeWindow.c:46
 msgid "_Done"
 msgstr ""
 
-#: widgets/src/StandaloneWindow.c:55
-#: pyanaconda/ui/gui/spokes/storage.glade.h:2
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:2
+#: widgets/src/StandaloneWindow.c:50
 msgid "_Continue"
 msgstr "_Qhubeka"
 
-#: widgets/src/LayoutIndicator.c:31
+#: widgets/src/LayoutIndicator.c:32
 #, c-format
 msgid "Current layout: '%s'. Click to switch to the next layout."
 msgstr ""
 
-#: widgets/src/LayoutIndicator.c:32
+#: widgets/src/LayoutIndicator.c:33
 #, c-format
 msgid "Current layout: '%s'. Add more layouts to enable switching."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:1
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:36
+msgctxt "GUI|Advanced User"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:50
+msgctxt "GUI|Advanced User"
 msgid "_Save Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:2
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:81
 msgid "ADVANCED USER CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:3
-msgid "Home Directory"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:4
-msgid "Create a _home directory for this user."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:5
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:103
+msgctxt "GUI|Advanced User"
 msgid "Home _directory:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:6
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:138
 msgid "User and Group IDs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:7
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:157
+msgctxt "GUI|Advanced User"
 msgid "Specify a _user ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:8
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:173
+msgctxt "GUI|Advanced User"
 msgid "Specify a _group ID manually:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:9
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:231
 msgid "Group Membership"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:10
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:259
+msgctxt "GUI|Advanced User"
 msgid "_Add user to the following groups:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:11
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:291
+msgid "Example:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:308
 msgid "wheel, my-team (1245), project-x (29935)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:12
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:342
+msgid "Tip:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advanced_user.glade:361
 msgid ""
-"You may input a comma-separated list of group names and group IDs here.\n"
+"You may input a comma-separated list of group names and group IDs here. "
 "Groups that do not already exist will be created; specify their GID in "
 "parentheses. "
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:14
-msgid "Example:"
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:108
+msgctxt "GUI|Date and Time|NTP"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advanced_user.glade.h:15
-msgid "Tip:"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:122
+#, fuzzy
+msgctxt "GUI|Date and Time|NTP"
+msgid "_OK"
+msgstr "KULUNGILE"
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:1
-msgid "DATE & TIME"
-msgstr ""
-
-#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:6
-msgid ":"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:7
-msgid "PM"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:10
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:147
 msgid "Add and mark for usage NTP servers"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:12
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:170
+msgid "New NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:189
+msgid "Add NTP Server"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:240
 msgid "Working"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/datetime_spoke.glade.h:13
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:248
 msgid "Use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:1
-#: pyanaconda/ui/gui/spokes/storage.glade.h:20
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:276
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:490
+msgid "Configure NTP"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:297
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:879
+msgid "DATE & TIME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:347
+msgctxt "GUI|Date and Time"
+msgid "_Region:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:377
+msgid "Region"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:394
+msgctxt "GUI|Date and Time"
+msgid "_City:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:424
+msgid "City"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:452
+msgctxt "GUI|Date and Time"
+msgid "_Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:470
+msgid "Use Network Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:557
+msgid "Hours"
+msgstr ""
+
+#. TRANSLATORS: This is the separator between hours and minutes, like in HH:MM
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:570
+msgid ":"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:590
+msgid "Minutes"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:608
+msgid "Hour Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:626
+msgid "Hour Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:644
+msgid "AM/PM Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:662
+msgid "Minutes Up"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:680
+msgid "AM/PM Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:698
+msgid "Minutes Down"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:767
+msgctxt "GUI|Date and Time"
+msgid "24-_hour"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:785
+msgctxt "GUI|Date and Time"
+msgid "_AM/PM"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/datetime_spoke.glade:844
+msgid "Set Date & Time"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:58
+#: pyanaconda/ui/gui/spokes/storage.glade:446
+#: pyanaconda/ui/gui/spokes/storage.glade:1026
 msgid "INSTALLATION DESTINATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:2
+#: pyanaconda/ui/gui/spokes/filter.glade:131
 msgid "Search Results:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:3
+#: pyanaconda/ui/gui/spokes/filter.glade:144
+msgctxt "GUI|Installation Destination|Filter|Search"
 msgid "Search _By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:5
+#: pyanaconda/ui/gui/spokes/filter.glade:159
 msgid "Port / Target / LUN #"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:160
 msgid "Target WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:197
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Port:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:8
+#: pyanaconda/ui/gui/spokes/filter.glade:222
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_Target:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:9
+#: pyanaconda/ui/gui/spokes/filter.glade:248
+msgctxt "GUI|Installation Destination|Filter|Search|Port Target LUN"
 msgid "_LUN:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:10
+#: pyanaconda/ui/gui/spokes/filter.glade:288
+msgctxt "GUI|Installation Destination|Filter|Search|WWID"
 msgid "_WWID:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:11
+#: pyanaconda/ui/gui/spokes/filter.glade:360
+#: pyanaconda/ui/gui/spokes/filter.glade:563
+#: pyanaconda/ui/gui/spokes/filter.glade:741
 msgid "WWID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:12
-#: pyanaconda/ui/gui/spokes/custom.glade.h:17
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:6
+#: pyanaconda/ui/gui/spokes/filter.glade:374
+#: pyanaconda/ui/gui/spokes/filter.glade:755
+#: pyanaconda/ui/gui/spokes/filter.glade:1101
+#: pyanaconda/ui/gui/spokes/filter.glade:1351
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:145
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:235
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:728
 msgid "Capacity"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:13
+#: pyanaconda/ui/gui/spokes/filter.glade:388
+#: pyanaconda/ui/gui/spokes/filter.glade:562
+#: pyanaconda/ui/gui/spokes/filter.glade:784
+#: pyanaconda/ui/gui/spokes/filter.glade:906
+#: pyanaconda/ui/gui/spokes/filter.glade:1130
 msgid "Interconnect"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:14
+#: pyanaconda/ui/gui/spokes/filter.glade:402
 msgid "Model"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:15
+#: pyanaconda/ui/gui/spokes/filter.glade:416
+#: pyanaconda/ui/gui/spokes/filter.glade:1379
 msgid "LUN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:16
+#: pyanaconda/ui/gui/spokes/filter.glade:430
 msgid "Port"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:17
+#: pyanaconda/ui/gui/spokes/filter.glade:444
 msgid "Target"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:18
+#: pyanaconda/ui/gui/spokes/filter.glade:458
+#: pyanaconda/ui/gui/spokes/filter.glade:561
+#: pyanaconda/ui/gui/spokes/filter.glade:769
+#: pyanaconda/ui/gui/spokes/filter.glade:905
+#: pyanaconda/ui/gui/spokes/filter.glade:1115
 msgid "Vendor"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:19
-msgid "_Search"
+#: pyanaconda/ui/gui/spokes/filter.glade:479
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Clear"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:20
-msgid "_Filter By:"
+#: pyanaconda/ui/gui/spokes/filter.glade:493
+msgctxt "GUI|Installation Destination|Filter|Search"
+msgid "_Find"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:21
+#: pyanaconda/ui/gui/spokes/filter.glade:515
+msgctxt "GUI|Installation Destination|Filter"
+msgid "Searc_h"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:546
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:599
+msgctxt "GUI|Installation Destination|Filter|Multipath|Vendor"
 msgid "Show Only _Devices From:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:22
+#: pyanaconda/ui/gui/spokes/filter.glade:637
+msgctxt "GUI|Installation Destination|Filter|Multipath|Interconnect"
 msgid "Show Only _Devices With:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:23
+#: pyanaconda/ui/gui/spokes/filter.glade:675
+msgctxt "GUI|Installation Destination|Filter|Multipath|WWID"
 msgid "Show Only _Devices Containing:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:24
+#: pyanaconda/ui/gui/spokes/filter.glade:798
 msgid "Paths"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:25
+#: pyanaconda/ui/gui/spokes/filter.glade:819
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:833
+msgctxt "GUI|Installation Destination|Filter|Multipath"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:858
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Multipath Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:26
-#: pyanaconda/ui/gui/spokes/custom.glade.h:19
+#: pyanaconda/ui/gui/spokes/filter.glade:890
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "Filter _By:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:907
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:261
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:754
 msgid "ID"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:27
+#: pyanaconda/ui/gui/spokes/filter.glade:943
+msgctxt "GUI|Installation Destination|Filter|Other|Vendor"
+msgid "Show Only _Devices From:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:981
+msgctxt "GUI|Installation Destination|Filter|Other|Interconnect"
+msgid "Show Only _Devices With:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1019
+msgctxt "GUI|Installation Destination|Filter|Other|ID"
+msgid "Show Only _Devices Containing:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1087
 msgid "Identifier"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:28
+#: pyanaconda/ui/gui/spokes/filter.glade:1151
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1165
+msgctxt "GUI|Installation Destination|Filter|Other"
+msgid "_Find"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1190
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Other SAN Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:29
-msgid "Nothing here yet."
+#: pyanaconda/ui/gui/spokes/filter.glade:1222
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Filter By:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:30
-msgid "Firmware _RAID"
+#: pyanaconda/ui/gui/spokes/filter.glade:1236
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Label"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:31
-msgid "label"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/filter.glade.h:32
+#: pyanaconda/ui/gui/spokes/filter.glade:1247
+msgctxt "GUI|Installation Destination|Filter|zSeries"
 msgid "_Go"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:33
+#: pyanaconda/ui/gui/spokes/filter.glade:1260
+msgctxt "GUI|Installation Destination|Filter|zSeries"
+msgid "_Clear"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1323
 msgid "CCW"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:34
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:7
+#: pyanaconda/ui/gui/spokes/filter.glade:1337
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:152
 msgid "Type"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:35
+#: pyanaconda/ui/gui/spokes/filter.glade:1365
 msgid "WWPN"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:36
+#: pyanaconda/ui/gui/spokes/filter.glade:1411
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_zSeries Devices"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:37
+#: pyanaconda/ui/gui/spokes/filter.glade:1434
+msgctxt "GUI|Installation Destination|Filter"
 msgid "_Add ZFCP LUN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:38
+#: pyanaconda/ui/gui/spokes/filter.glade:1449
+msgid "Add EC_KD DASD..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/filter.glade:1464
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add _iSCSI Target..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:39
+#: pyanaconda/ui/gui/spokes/filter.glade:1479
+msgctxt "GUI|Installation Destination|Filter"
 msgid "Add FCo_E SAN..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/filter.glade.h:40
-#: pyanaconda/ui/gui/spokes/storage.glade.h:27
-#: pyanaconda/ui/gui/spokes/custom.glade.h:63
-msgid "summary"
+#: pyanaconda/ui/gui/spokes/network.glade:16
+msgid "bond"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:1
+#: pyanaconda/ui/gui/spokes/network.glade:20
+msgid "team"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:24
+msgid "vlan"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:31
 #, fuzzy
 msgid "Add device"
 msgstr "Ithuluzi le-RAID"
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:2
+#: pyanaconda/ui/gui/spokes/network.glade:45
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:59
+#, fuzzy
+msgctxt "GUI|Network|Add Device Dialog"
+msgid "_Add"
+msgstr "_Yongeza"
+
+#: pyanaconda/ui/gui/spokes/network.glade:88
+msgctxt "GUI|Network|Add Device Dialog"
 msgid "_Select the type of device you wish to add"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:4
-msgid "bond"
+#: pyanaconda/ui/gui/spokes/network.glade:161
+#: pyanaconda/ui/gui/spokes/network.glade:2273
+msgid "NETWORK & HOSTNAME"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:6
-msgid "team"
+#: pyanaconda/ui/gui/spokes/network.glade:200
+msgid ""
+"Please use the live desktop environment's tools for customizing your network "
+"configuration.  You can set the hostname here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:8
-msgid "vlan"
+#: pyanaconda/ui/gui/spokes/network.glade:414
+msgid "Slaves"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:9
+#: pyanaconda/ui/gui/spokes/network.glade:438
+#: pyanaconda/ui/gui/spokes/network.glade:874
+#: pyanaconda/ui/gui/spokes/network.glade:1442
+msgid "DNS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:464
+#: pyanaconda/ui/gui/spokes/network.glade:861
+#: pyanaconda/ui/gui/spokes/network.glade:1429
+msgid "Default Route"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:488
+msgid "Subnet Mask"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:560
+#: pyanaconda/ui/gui/spokes/network.glade:825
+#: pyanaconda/ui/gui/spokes/network.glade:1273
+msgid "Speed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:584
+#: pyanaconda/ui/gui/spokes/network.glade:813
+msgid "Hardware Address"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:608
+msgid "Parent"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:620
+msgid "Vlan ID"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:695
+msgctxt "GUI|Network|Wired"
+msgid "C_onfigure..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:699
+msgid "To apply the configuration immediately turn the device off and on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:986
+msgid "Security"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:998
+msgctxt "GUI|Network|Wireless"
+msgid "_Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1012
+msgid "Network Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1024
+msgid "Security Key"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1108
+msgctxt "GUI|Network|Wireless"
+msgid "_Use as Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1125
+msgctxt "GUI|Network|Wireless"
+msgid "_Stop Hotspot..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1142
+#, fuzzy
+msgctxt "GUI|Network|Wireless"
+msgid "_Configure..."
+msgstr "_Qhubeka"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1261
+msgid "IMEI"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1285
+msgid "Provider"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1467
+#, fuzzy
+msgctxt "GUI|Network|Mobile Broadband"
+msgid "_Configure..."
+msgstr "_Qhubeka"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1578
+msgid "VPN Type"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1590
+msgid "Gateway"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1602
+msgid "Group Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1614
+msgid "Group Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1626
+#: pyanaconda/ui/gui/spokes/user.glade:118
+msgid "Username"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1733
+#, fuzzy
+msgctxt "GUI|Network|VPN"
+msgid "_Configure..."
+msgstr "_Qhubeka"
+
+#: pyanaconda/ui/gui/spokes/network.glade:1856
+msgctxt "GUI|Network|Proxy"
+msgid "_Method"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1881
+msgctxt "GUI|Network|Proxy"
+msgid "_Configuration URL"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1907
+msgctxt "GUI|Network|Proxy"
+msgid "HTTP _Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1921
+msgctxt "GUI|Network|Proxy"
+msgid "H_TTPS Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1935
+msgctxt "GUI|Network|Proxy"
+msgid "_FTP Proxy"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:1949
+msgctxt "GUI|Network|Proxy"
+msgid "_Socks Host"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2142
+msgid "Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2158
+msgctxt "GUI|Network"
+msgid "Unloc_k"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2179
+msgctxt "GUI|Network"
+msgid "_Airplane Mode"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2198
+msgid "More Network Config Box"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2218
+msgctxt "GUI|Network"
+msgid "_Hostname:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/network.glade:2279
 msgid "NETWORK CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:10
+#: pyanaconda/ui/gui/spokes/network.glade:2324
 msgid ""
 "We'll need network access to fetch information about your location and to "
 "make software\n"
 "updates available for you."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:12
-msgid ""
-"Please use the live desktop environment's tools for customizing your network "
-"configuration.  You can set the hostname here."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:13
-msgid "Slaves"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:14
-msgid "DNS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:15
-msgid "Default Route"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:16
-msgid "Subnet Mask"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:19
-msgid "Speed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:20
-msgid "Hardware Address"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:21
-msgid "Parent"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:22
-msgid "Vlan ID"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:23
-msgid "C_onfigure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:24
-msgid "Security"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:25
-msgid "_Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:26
-msgid "Network Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:27
-msgid "Security Key"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:28
-msgid "_Use as Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:29
-msgid "_Stop Hotspot..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:30
-msgid "_Configure..."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:31
-msgid "IMEI"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:32
-msgid "Provider"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:34
-msgid "VPN Type"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:35
-msgid "Gateway"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:36
-msgid "Group Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:37
-msgid "Group Password"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:38
-msgid "Username"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:39
-msgid "_Method"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:40
-msgid "_Configuration URL"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:41
-msgid "HTTP _Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:42
-msgid "H_TTPS Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:43
-msgid "_FTP Proxy"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:44
-msgid "_Socks Host"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:46
-msgid "Unloc_k"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:47
-msgid "_Airplane Mode"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:48
-msgid "_Hostname:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/network.glade.h:49
+#: pyanaconda/ui/gui/spokes/network.glade:2354
 msgid "Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:50
-msgid "<b>Authentication required by wireless network</b>"
+#: pyanaconda/ui/gui/spokes/network.glade:2368
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/network.glade.h:51
+#: pyanaconda/ui/gui/spokes/network.glade:2383
+#, fuzzy
+msgctxt "GUI|Network|Authentication Dialog"
+msgid "C_onnect"
+msgstr "Kuxhunyiwe!"
+
+#: pyanaconda/ui/gui/spokes/network.glade:2457
 msgid ""
 "Passwords or encryption keys are required to access\n"
 "the wireless network"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:1
+#: pyanaconda/ui/gui/spokes/software.glade:10
 msgid "SOFTWARE SELECTION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:2
+#: pyanaconda/ui/gui/spokes/software.glade:66
 msgid "Base Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:3
+#: pyanaconda/ui/gui/spokes/software.glade:84
 msgid "Add-Ons for Selected Environment"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/software.glade.h:4
-msgid "column"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:27
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "Cancel & _add more disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:3
-msgid "INSTALLATION OPTIONS"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:4
-msgid "<b>Partition scheme:</b>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:9
-msgid "_Encrypt my data. I'll set a passphrase later."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:10
-msgid "_Custom partitioning"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.glade.h:11
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:1
+#: pyanaconda/ui/gui/spokes/storage.glade:43
+msgctxt "GUI|Storage|Need Space Dialog"
 msgid "_Reclaim space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:12
+#: pyanaconda/ui/gui/spokes/storage.glade:78
+#: pyanaconda/ui/gui/spokes/storage.glade:295
+msgid "INSTALLATION OPTIONS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:95
+#: pyanaconda/ui/gui/spokes/storage.glade:311
 msgid ""
 "Here we'll describe how much space is needed for the current software "
 "selection."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:13
+#: pyanaconda/ui/gui/spokes/storage.glade:121
+#: pyanaconda/ui/gui/spokes/storage.glade:337
 msgid "disk free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:14
+#: pyanaconda/ui/gui/spokes/storage.glade:137
+#: pyanaconda/ui/gui/spokes/storage.glade:352
 msgid "Free space available for use."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:15
+#: pyanaconda/ui/gui/spokes/storage.glade:153
+#: pyanaconda/ui/gui/spokes/storage.glade:368
 msgid "fs free"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:16
+#: pyanaconda/ui/gui/spokes/storage.glade:169
+#: pyanaconda/ui/gui/spokes/storage.glade:384
 msgid "Free space unavailable but reclaimable from existing partitions."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:17
+#: pyanaconda/ui/gui/spokes/storage.glade:192
+#: pyanaconda/ui/gui/spokes/storage.glade:407
 msgid "Here we'll describe what your options are."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:18
+#: pyanaconda/ui/gui/spokes/storage.glade:219
+msgid "Need Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:244
+msgctxt "GUI|Storage|No Space Dialog"
 msgid "_Quit installer"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:21
+#: pyanaconda/ui/gui/spokes/storage.glade:260
+msgctxt "GUI|Storage|No Space Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:434
+msgid "No Space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:509
+msgid "Device Selection"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:528
 msgid ""
 "Select the device(s) you'd like to install to.  They will be left untouched "
 "until you click on the main menu's \"Begin Installation\" button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:22
+#: pyanaconda/ui/gui/spokes/storage.glade:546
 msgid "Local Standard Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:23
+#: pyanaconda/ui/gui/spokes/storage.glade:610
+#: pyanaconda/ui/gui/spokes/storage.glade:750
 msgid "Disks left unselected here will not be touched."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:24
+#: pyanaconda/ui/gui/spokes/storage.glade:629
 msgid "Specialized & Network Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:25
+#: pyanaconda/ui/gui/spokes/storage.glade:699
+msgctxt "GUI|Storage"
 msgid "_Add a disk..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/storage.glade.h:26
+#: pyanaconda/ui/gui/spokes/storage.glade:716
+msgid "Add Specialized Disk"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:769
+msgid "Other Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:795
+#, fuzzy
+msgid "Partitioning"
+msgstr "Isexwayiso"
+
+#: pyanaconda/ui/gui/spokes/storage.glade:812
+msgid "Encryption"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:825
+msgid "A_utomatically configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:841
+msgid "_I will configure partitioning."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:873
+msgid "_Encrypt my data."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:888
+msgid "You'll set a passphrase next."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:909
+msgid "I would like to _make additional space available."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:925
+msgid "Storage Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:957
+msgid "summary"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/storage.glade:990
+msgctxt "GUI|Storage"
 msgid "_Full disk summary and bootloader..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:1
-msgid "ADD A KEYBOARD LAYOUT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:2
-msgid "You may add a keyboard layout by selecting it below:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:3
-#: pyanaconda/ui/gui/spokes/source.glade.h:32
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:5
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:4
+#: pyanaconda/ui/gui/spokes/keyboard.glade:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:389
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:5
+#: pyanaconda/ui/gui/spokes/keyboard.glade:57
 msgid ""
 "Which keyboard layouts would you like to use on this system?  You may move "
 "any layout to the top of the list to select it as the default."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:6
+#: pyanaconda/ui/gui/spokes/keyboard.glade:96
 msgid ""
 "Changes here will only apply to the installed system. Use the desktop's tool "
 "to configure the keyboard for the installation process."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:7
+#: pyanaconda/ui/gui/spokes/keyboard.glade:153
 msgid "name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:8
-msgid "Add layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:167
+msgid "Selected Layouts"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:9
-msgid "Remove layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:190
+msgctxt "GUI|Keyboard Layout"
+msgid "_Add layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:10
-msgid "Move selected layout up"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:205
+msgctxt "GUI|Keyboard Layout"
+msgid "_Remove layout"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:11
-msgid "Move selected layout down"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:220
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _up"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:12
-msgid "Preview layout"
+#: pyanaconda/ui/gui/spokes/keyboard.glade:235
+msgctxt "GUI|Keyboard Layout"
+msgid "Move selected layout _down"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:13
+#: pyanaconda/ui/gui/spokes/keyboard.glade:251
+msgctxt "GUI|Keyboard Layout"
+msgid "_Preview layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:291
+msgctxt "GUI|Keyboard Layout"
 msgid "_Test the layout configuration below:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:14
+#: pyanaconda/ui/gui/spokes/keyboard.glade:332
 msgid "Alt + Shift to switch layouts."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:15
+#: pyanaconda/ui/gui/spokes/keyboard.glade:347
+msgctxt "GUI|Keyboard Layout"
 msgid "_Options"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:16
+#: pyanaconda/ui/gui/spokes/keyboard.glade:422
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:436
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Add Layout"
+msgid "_Add"
+msgstr "_Yongeza"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:468
+msgid "ADD A KEYBOARD LAYOUT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:485
+msgid "You may add a keyboard layout by selecting it below:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:521
+#: pyanaconda/ui/gui/spokes/source.glade:991
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:133
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:163
+msgid "Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:534
+msgid "Available Layouts"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:576
+msgid "Add Layout"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:608
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:622
+#, fuzzy
+msgctxt "GUI|Keyboard Layout|Switching Options"
+msgid "_OK"
+msgstr "KULUNGILE"
+
+#: pyanaconda/ui/gui/spokes/keyboard.glade:654
 msgid "LAYOUT SWITCHING OPTIONS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:17
+#: pyanaconda/ui/gui/spokes/keyboard.glade:671
 msgid ""
 "Which combination(s) would you prefer for switching between keyboard layouts?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:18
+#: pyanaconda/ui/gui/spokes/keyboard.glade:707
 msgid "use"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/keyboard.glade.h:19
+#: pyanaconda/ui/gui/spokes/keyboard.glade:720
 msgid "description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:1
+#: pyanaconda/ui/gui/spokes/keyboard.glade:754
+msgid "Layout Options"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/langsupport.glade:33
 msgid "LANGUAGE SUPPORT"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:2
+#: pyanaconda/ui/gui/spokes/langsupport.glade:79
 msgid "Select additional language support to be installed:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:3
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:12
+#: pyanaconda/ui/gui/spokes/langsupport.glade:138
+#: pyanaconda/ui/gui/spokes/langsupport.glade:242
+#: pyanaconda/ui/gui/spokes/welcome.glade:273
+#: pyanaconda/ui/gui/spokes/welcome.glade:373
 msgid "nativeName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:4
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:13
+#: pyanaconda/ui/gui/spokes/langsupport.glade:155
+#: pyanaconda/ui/gui/spokes/welcome.glade:290
 msgid "englishName"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:5
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:14
+#: pyanaconda/ui/gui/spokes/langsupport.glade:173
+#: pyanaconda/ui/gui/spokes/welcome.glade:308
 msgid "selected"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:6
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:15
+#: pyanaconda/ui/gui/spokes/langsupport.glade:194
+#: pyanaconda/ui/gui/spokes/welcome.glade:337
 msgid "Type here to search."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/langsupport.glade.h:7
+#: pyanaconda/ui/gui/spokes/langsupport.glade:228
 msgid "checked"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:1
+#: pyanaconda/ui/gui/spokes/password.glade:8
+#: pyanaconda/ui/gui/spokes/password.glade:203
 msgid "ROOT PASSWORD"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:2
+#: pyanaconda/ui/gui/spokes/password.glade:54
+msgctxt "GUI|Password"
 msgid "_Root Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:3
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:68
+msgctxt "GUI|Password"
 msgid "_Confirm:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:4
-#: pyanaconda/ui/gui/spokes/user.glade.h:8
+#: pyanaconda/ui/gui/spokes/password.glade:104
+#: pyanaconda/ui/gui/spokes/user.glade:189
+msgid "Confirm Password"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/password.glade:150
+#: pyanaconda/ui/gui/spokes/user.glade:252
 msgid "empty password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/password.glade.h:5
+#: pyanaconda/ui/gui/spokes/password.glade:171
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:2
+#: pyanaconda/ui/gui/spokes/source.glade:29
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:43
+msgctxt "GUI|Software Source|ISO Chooser Dialog"
+msgid "_Open"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:95
+msgctxt "GUI|Software Source|Media Check Dialog"
+msgid "_Done"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/source.glade:128
 msgid "MEDIA VERIFICATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:3
+#: pyanaconda/ui/gui/spokes/source.glade:155
 msgid "Verifying media, please wait..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:5
-msgid "_Add"
-msgstr "_Yongeza"
+#: pyanaconda/ui/gui/spokes/source.glade:224
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Cancel"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:6
+#: pyanaconda/ui/gui/spokes/source.glade:239
+#, fuzzy
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Ok"
+msgstr "KULUNGILE"
+
+#: pyanaconda/ui/gui/spokes/source.glade:267
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:7
-msgid "<b>_Proxy URL</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:300
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "_Proxy URL"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:8
+#: pyanaconda/ui/gui/spokes/source.glade:317
 msgid "<span size=\"small\"><b>Example:</b> squid.mysite.org:3128</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:9
+#: pyanaconda/ui/gui/spokes/source.glade:349
+msgctxt "GUI|Software Source|Proxy Dialog"
 msgid "_Use Authentication"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:10
-msgid "<b>User_name</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:376
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "User_name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:11
-msgid "<b>Pass_word</b>"
+#: pyanaconda/ui/gui/spokes/source.glade:393
+msgctxt "GUI|Software Source|Proxy Dialog"
+msgid "Pass_word"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:12
+#: pyanaconda/ui/gui/spokes/source.glade:473
 msgid "INSTALLATION SOURCE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:13
+#: pyanaconda/ui/gui/spokes/source.glade:532
 msgid "Which installation source would you like to use?"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:14
+#: pyanaconda/ui/gui/spokes/source.glade:546
+msgctxt "GUI|Software Source"
 msgid "_Auto-detected installation media:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:573
 msgid "Device:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:16
+#: pyanaconda/ui/gui/spokes/source.glade:585
 msgid "Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:17
+#: pyanaconda/ui/gui/spokes/source.glade:594
+#: pyanaconda/ui/gui/spokes/source.glade:694
+msgctxt "GUI|Software Source"
 msgid "_Verify"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:18
+#: pyanaconda/ui/gui/spokes/source.glade:618
+msgctxt "GUI|Software Source"
 msgid "_ISO file:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:19
+#: pyanaconda/ui/gui/spokes/source.glade:646
 #, fuzzy
+msgctxt "GUI|Software Source"
 msgid "D_evice:"
 msgstr "Ithuluzi le-RAID"
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:20
+#: pyanaconda/ui/gui/spokes/source.glade:677
+msgctxt "GUI|Software Source"
 msgid "_Choose an ISO"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:21
+#: pyanaconda/ui/gui/spokes/source.glade:718
+msgctxt "GUI|Software Source"
 msgid "_On the network:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:22
-msgid "nfs"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:24
+#: pyanaconda/ui/gui/spokes/source.glade:782
+msgctxt "GUI|Software Source"
 msgid "_Proxy setup..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:25
+#: pyanaconda/ui/gui/spokes/source.glade:797
+msgctxt "GUI|Software Source"
 msgid "This URL refers to a _mirror list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:26
+#: pyanaconda/ui/gui/spokes/source.glade:835
+msgctxt "GUI|Software Source"
 msgid "N_FS mount options:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:27
+#: pyanaconda/ui/gui/spokes/source.glade:850
+#: pyanaconda/ui/gui/spokes/source.glade:851
 msgid "This field is optional."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:28
+#: pyanaconda/ui/gui/spokes/source.glade:885
 msgid "Updates"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:29
+#: pyanaconda/ui/gui/spokes/source.glade:912
+msgctxt "GUI|Software Source"
 msgid ""
 "Don't install the latest available software _updates. Install the default "
-"versions provided by the install source above."
+"versions provided by the installation source above."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:30
+#: pyanaconda/ui/gui/spokes/source.glade:937
 msgid "Additional repositories"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:31
+#: pyanaconda/ui/gui/spokes/source.glade:978
 msgid "Enabled"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:33
+#: pyanaconda/ui/gui/spokes/source.glade:1023
+#: pyanaconda/ui/gui/spokes/source.glade:1024
 msgid "Add a new repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:34
-#: pyanaconda/ui/gui/spokes/custom.glade.h:51
-#, fuzzy
-msgid "Add"
-msgstr "_Yongeza"
+#: pyanaconda/ui/gui/spokes/source.glade:1025
+msgctxt "GUI|Software Source"
+msgid "A_dd"
+msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:35
+#: pyanaconda/ui/gui/spokes/source.glade:1042
+#: pyanaconda/ui/gui/spokes/source.glade:1043
 msgid "Remove the selected repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:36
-#: pyanaconda/ui/gui/spokes/custom.glade.h:53
-msgid "Remove"
+#: pyanaconda/ui/gui/spokes/source.glade:1044
+msgctxt "GUI|Software Source"
+msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:37
+#: pyanaconda/ui/gui/spokes/source.glade:1061
+#: pyanaconda/ui/gui/spokes/source.glade:1062
 msgid "Revert to the previous list of repositories."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:38
-msgid "Reset"
+#: pyanaconda/ui/gui/spokes/source.glade:1063
+msgctxt "GUI|Software Source"
+msgid "Rese_t"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:39
+#: pyanaconda/ui/gui/spokes/source.glade:1092
+#: pyanaconda/ui/gui/spokes/source.glade:1093
 msgid "URL for the repository, without protocol."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:40
+#: pyanaconda/ui/gui/spokes/source.glade:1106
+#: pyanaconda/ui/gui/spokes/source.glade:1107
 msgid "URL of proxy in the form of protocol://host:[port]"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:41
+#: pyanaconda/ui/gui/spokes/source.glade:1120
+#: pyanaconda/ui/gui/spokes/source.glade:1121
 msgid "Optional proxy username."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:42
+#: pyanaconda/ui/gui/spokes/source.glade:1134
 msgid "Optional proxy password."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:43
-msgid "This URL refers to a mirror list."
+#: pyanaconda/ui/gui/spokes/source.glade:1146
+msgctxt "GUI|Software Source"
+msgid "This URL refers to a mirror _list."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:44
-#: pyanaconda/ui/gui/spokes/custom.glade.h:15
+#: pyanaconda/ui/gui/spokes/source.glade:1166
+msgctxt "GUI|Software Source"
 msgid "_Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:45
+#: pyanaconda/ui/gui/spokes/source.glade:1182
+#: pyanaconda/ui/gui/spokes/source.glade:1183
 msgid "Protocol for the repository URL."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:46
-msgid "P_roxy URL:"
+#: pyanaconda/ui/gui/spokes/source.glade:1204
+msgctxt "GUI|Software Source"
+msgid "Pro_xy URL:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:47
+#: pyanaconda/ui/gui/spokes/source.glade:1221
+msgctxt "GUI|Software Source"
 msgid "U_sername:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:48
+#: pyanaconda/ui/gui/spokes/source.glade:1238
+msgctxt "GUI|Software Source"
 msgid "Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:49
-msgid "Invalid repository name. Try something else?"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/source.glade.h:50
+#: pyanaconda/ui/gui/spokes/source.glade:1254
+#: pyanaconda/ui/gui/spokes/source.glade:1255
 msgid "Name of the repository."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/source.glade.h:51
-msgid "Duplicate names in list of additional repositories."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:3
-msgid "Unsupported Hardware Detected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:5
+#: pyanaconda/ui/gui/spokes/welcome.glade:23
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_Get me out of here!"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:6
+#: pyanaconda/ui/gui/spokes/welcome.glade:37
+msgctxt "GUI|Welcome|Beta Warn Dialog"
 msgid "_I accept my fate."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:7
+#: pyanaconda/ui/gui/spokes/welcome.glade:68
 msgid "This is unstable, pre-release software."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:8
+#: pyanaconda/ui/gui/spokes/welcome.glade:97
 msgid ""
 "You wake up inside an OS installer in Timbuktu, and it's six months in the "
 "future.  But, there are bugs.  Bugs everywhere.  Bugs you must live with.  "
@@ -3156,641 +4441,1003 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:10
-#, python-format
-msgid "WELCOME TO %(name)s %(version)s."
+#: pyanaconda/ui/gui/spokes/welcome.glade:126
+msgid "Beta Warn"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/welcome.glade.h:11
+#: pyanaconda/ui/gui/spokes/welcome.glade:225
 msgid "What language would you like to use during the installation process?"
 msgstr "Iluphi ulimi ongathanda ukulisebenzisa ngesikhathi senqubo yokufaka?"
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:1
+#: pyanaconda/ui/gui/spokes/welcome.glade:316
+msgid "Languages"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:389
+msgid "Locales"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:423
+msgid "WELCOME"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:444
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:458
+#, fuzzy
+msgctxt "GUI|Welcome|Unsupported Hardware Dialog"
+msgid "_Continue"
+msgstr "_Qhubeka"
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:489
+msgid "Unsupported Hardware Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/welcome.glade:547
+msgid "Unsupported Hardware"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:10
+#: pyanaconda/ui/gui/spokes/user.glade:346
 msgid "CREATE USER"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:2
+#: pyanaconda/ui/gui/spokes/user.glade:62
+msgctxt "GUI|User"
 msgid "_Full name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:3
+#: pyanaconda/ui/gui/spokes/user.glade:80
+msgctxt "GUI|User"
 msgid "_Username"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:4
+#: pyanaconda/ui/gui/spokes/user.glade:101
+msgid "Full Name"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/user.glade:133
+msgctxt "GUI|User"
 msgid "_Password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:5
+#: pyanaconda/ui/gui/spokes/user.glade:151
+msgctxt "GUI|User"
 msgid "_Confirm password"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:6
+#: pyanaconda/ui/gui/spokes/user.glade:203
 msgid ""
 "<b>Tip:</b> Keep your username shorter than 32 characters and do not use "
 "spaces."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:7
+#: pyanaconda/ui/gui/spokes/user.glade:213
+msgctxt "GUI|User"
 msgid "Require a password to use this account"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:9
+#: pyanaconda/ui/gui/spokes/user.glade:271
+msgctxt "GUI|User"
 msgid "Make this user administrator"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/user.glade.h:10
+#: pyanaconda/ui/gui/spokes/user.glade:289
+msgctxt "GUI|User"
 msgid "_Advanced..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:2
-msgid "_Add mount point"
+#: pyanaconda/ui/gui/spokes/custom.glade:27
+msgid "Btrfs"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:3
-msgid "<b>_Desired Capacity:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:62
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:540
+msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:4
-msgid "<b>Mount _Point:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:66
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:544
+msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:5
-msgid "ADD A NEW MOUNT POINT"
+#: pyanaconda/ui/gui/spokes/custom.glade:70
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:548
+msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:6
-msgid ""
-"More customization options are available\n"
-"after creating the mount point below."
+#: pyanaconda/ui/gui/spokes/custom.glade:74
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:552
+msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:8
-msgid ""
-"That mount point is already in\n"
-"use.  Try something else?"
+#: pyanaconda/ui/gui/spokes/custom.glade:78
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:556
+msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:10
-msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+#: pyanaconda/ui/gui/spokes/custom.glade:82
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:560
+msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:11
-msgid "_Delete It"
+#: pyanaconda/ui/gui/spokes/custom.glade:184
+msgid "Add a new mount point."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:12
-msgid "_Save"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:13
-msgid "CONFIGURE CONTAINER"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:14
-msgid ""
-"Please create a name for this container and select at least one disk below."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:18
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:7
-msgid "Free"
-msgstr "Eyamahhala"
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:20
+#: pyanaconda/ui/gui/spokes/custom.glade:185
 #, fuzzy
-msgid "RAID Level:"
-msgstr "Ithuluzi le-RAID"
+msgctxt "GUI|Custom Partitioning"
+msgid "Add"
+msgstr "_Yongeza"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:21
-msgid "Encrypt"
+#: pyanaconda/ui/gui/spokes/custom.glade:200
+msgid "Remove the selected mount point(s)."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:23
-msgid "Si_ze policy:"
+#: pyanaconda/ui/gui/spokes/custom.glade:201
+msgctxt "GUI|Custom Partitioning"
+msgid "Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:24
-msgid "Automatic"
+#: pyanaconda/ui/gui/spokes/custom.glade:216
+msgid "Reload storage configuration from disk."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:25
-msgid "As large as possible"
+#: pyanaconda/ui/gui/spokes/custom.glade:217
+msgctxt "GUI|Custom Partitioning"
+msgid "Refresh"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:26
-msgid "Fixed"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:28
+#: pyanaconda/ui/gui/spokes/custom.glade:282
+#: pyanaconda/ui/gui/spokes/custom.glade:1014
+#: pyanaconda/ui/gui/spokes/custom.glade:1158
+#: pyanaconda/ui/gui/spokes/custom.glade:1245
 msgid "Selected Device"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:29
+#: pyanaconda/ui/gui/spokes/custom.glade:300
+#: pyanaconda/ui/gui/spokes/custom.glade:1032
+#: pyanaconda/ui/gui/spokes/custom.glade:1176
+#: pyanaconda/ui/gui/spokes/custom.glade:1263
 msgid "Device description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:30
-msgid "<b>_Label:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:361
+msgid "Mount _Point:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:31
-msgid "<b>Device _Type:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:409
+msgid "_Desired Capacity:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:32
-msgid "<b>File _System:</b>"
+#: pyanaconda/ui/gui/spokes/custom.glade:461
+msgid "_Label:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:38
-msgid "_Encrypt"
-msgstr ""
+#: pyanaconda/ui/gui/spokes/custom.glade:509
+#, fuzzy
+msgid "Device(s):"
+msgstr "Ithuluzi le-RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:39
-msgid "Re_format"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:40
-msgid "_Volume Group:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:41
+#: pyanaconda/ui/gui/spokes/custom.glade:539
+msgctxt "GUI|Custom Partitioning|Configure|Devices"
 msgid "_Modify..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:42
+#: pyanaconda/ui/gui/spokes/custom.glade:571
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:627
 #, fuzzy
-msgid "R_AID Level:"
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Device _Type:"
 msgstr "Ithuluzi le-RAID"
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:43
+#: pyanaconda/ui/gui/spokes/custom.glade:669
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:710
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "File S_ystem:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:745
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "Ref_ormat"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:799
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Volume Group:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:851
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "_Modify..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/custom.glade:883
+#, fuzzy
+msgctxt "GUI|Custom Partitioning|Configure"
+msgid "RA_ID Level:"
+msgstr "Ithuluzi le-RAID"
+
+#: pyanaconda/ui/gui/spokes/custom.glade:946
 msgid "_Update Settings"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:44
+#: pyanaconda/ui/gui/spokes/custom.glade:969
 msgid ""
-"Note:  The settings you make on this screen will not be applied\n"
-"until you click on the main menu's 'Begin Installation' button."
+"Note:  The settings you make on this screen will not be applied until you "
+"click on the main menu's 'Begin Installation' button."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:46
+#: pyanaconda/ui/gui/spokes/custom.glade:1066
 msgid ""
 "This device is encrypted and cannot be read without a valid passphrase. You "
 "may unlock it below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:47
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:4
+#: pyanaconda/ui/gui/spokes/custom.glade:1087
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Passphrase:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:48
+#: pyanaconda/ui/gui/spokes/custom.glade:1115
+msgctxt "GUI|Custom Partitioning|Encrypted"
 msgid "_Unlock"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:49
+#: pyanaconda/ui/gui/spokes/custom.glade:1210
 msgid ""
 "This device cannot be edited directly. You can remove it or select a "
 "different device."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:50
-msgid "Add a new mountpoint."
+#: pyanaconda/ui/gui/spokes/custom.glade:1358
+msgid "AVAILABLE SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:52
-msgid "Remove the selected mountpoint(s)."
+#: pyanaconda/ui/gui/spokes/custom.glade:1411
+msgid "TOTAL SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:54
-msgid "Configure selected mountpoint."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:55
-msgid "Configure"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:56
-msgid "Reload storage configuration from disk."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:57
-msgid "Refresh"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:58
-msgid "Click for help."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:59
-msgid "Help"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:60
-msgid "<span size=\"small\" foreground=\"white\">AVAILABLE SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:61
-msgid "<span size=\"small\" foreground=\"white\">TOTAL SPACE</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:62
+#: pyanaconda/ui/gui/spokes/custom.glade:1451
+msgctxt "GUI|Custom Partitioning"
 msgid "_Reset All"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:64
-msgid "_Select"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:23
+msgctxt "GUI|Advanced Storage|FCoE"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/custom.glade.h:65
-msgid "CONFIGURE MOUNT POINT"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:66
-msgid "Select one or more disks this device may reside on."
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:68
-msgid "RAID0 <span foreground=\"grey\">(Performance)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:69
-msgid "RAID1 <span foreground=\"grey\">(Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:70
-msgid "RAID4 <span foreground=\"grey\">(Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:71
-msgid "RAID5 <span foreground=\"grey\">(Distributed Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:72
-msgid "RAID6 <span foreground=\"grey\">(Redundant Error Checking)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/custom.glade.h:73
-msgid "RAID10 <span foreground=\"grey\">(Performance, Redundancy)</span>"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:56
 msgid ""
 "Please select the network interface which is connected to your FCoE switch."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:70
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_NIC:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:92
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use _DCB"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:108
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "Use auto _vlan"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:144
+msgctxt "GUI|Advanced Storage|FCoE"
 msgid "_Add FCoE Disk(s)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:6
-msgid "<b>Error adding FCoE SAN.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:187
+msgid "Error adding FCoE SAN."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/fcoe.glade:215
 msgid ""
 "The following error occurred while attempting to add an FCoE SAN.  Please "
 "check your configuration and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:38
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:52
+#, fuzzy
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
+msgid "_OK"
+msgstr "KULUNGILE"
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:84
 msgid "ADD iSCSI STORAGE TARGET"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:2
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:113
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:3
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:141
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Target IP Address:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:4
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:169
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "iSCSI _Initiator Name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:5
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:185
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:743
 msgid "No credentials (discovery authentication disabled)"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:6
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:186
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:744
 msgid "CHAP pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:7
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:187
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:745
 msgid "CHAP pair and a reverse pair"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:8
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:202
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Discovery Authentication Type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:9
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:217
 msgid ""
 "<span size=\"small\"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-"
 "a8675309</span>"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:10
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:262
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:11
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:276
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|CHAP"
 msgid "CHAP _Password:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:12
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:385
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:399
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:413
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP User_name:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:13
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:427
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP"
 msgid "Reverse CHAP Pass_word:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:14
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:460
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Start"
 msgid "_Start Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:15
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:497
 msgid "Discovering iSCSI targets.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:16
-msgid "<b>Discovery login rejected.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:537
+msgid "Discovery login rejected."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:17
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:552
 msgid ""
 "The following error occurred discovering iSCSI targets.  Please double check "
 "your authorization information and try again."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:18
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:574
+msgctxt "GUI|Advanced Storage|iSCSI|Configure|Retry"
 msgid "_Retry Discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:19
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:614
+msgctxt "GUI|Advanced Storage|iSCSI|Configure"
 msgid "_Bind targets to network interfaces"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:21
-#, python-format
-msgid ""
-"The following nodes were discovered using the iSCSI initiator <b>"
-"%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>.  "
-"Please select which nodes you wish to log into:"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:22
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:689
 msgid "Node Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:23
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:700
 msgid "Interface"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:24
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:729
+msgctxt "GUI|Advanced Storage|iSCSI|Login"
 msgid "_Node login authentication type:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:25
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:746
 msgid "Use the credentials from discovery"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:26
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:781
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:795
+msgctxt "GUI|Advanced Storage|iSCSI|Login|CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:904
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Username:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:918
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "CHAP _Password:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:932
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
 msgid "_Reverse CHAP Username:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:27
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:946
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Reverse CHAP"
+msgid "Reverse CHAP Pass_word:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:994
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Login"
 msgid "_Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:28
-msgid "<b>Node login failed.</b>"
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1050
+msgid "Node login failed."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:29
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1065
 msgid ""
 "The following error occurred logging into the selected iSCSI node.  Please "
 "double check your authorization information and try again"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade.h:30
+#: pyanaconda/ui/gui/spokes/advstorage/iscsi.glade:1087
+msgctxt "GUI|Advanced Storage|iSCSI|Login|Retry"
 msgid "Retry _Log In"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:1
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:22
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:36
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_OK"
+msgstr "KULUNGILE"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:68
+msgid "ADD DASD STORAGE TARGET"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:97
+msgid "To use DASD disks, you must provide the device number."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:126
+#, fuzzy
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Device number:"
+msgstr "Ithuluzi le-RAID"
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:146
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Start Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:183
+msgid "Discovering DASD devices.  This may take a moment..."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:225
+msgid "Device discovery failed."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:242
+msgid ""
+"The following error occurred discovering DASD devices.  Please double check "
+"your configuration information and try again."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/advstorage/dasd.glade:268
+msgctxt "GUI|Advanced Storage|DASD|Configure"
+msgid "_Retry Discovery"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:26
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:78
 msgid "SELECTED DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:43
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Close"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:106
 msgid "Boot"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:120
 msgid "Description"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:158
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:248
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:741
+msgid "Free"
+msgstr "Eyamahhala"
+
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:199
+msgctxt "GUI|Selected Disks Dialog"
 msgid "_Remove"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/cart.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/cart.glade:226
 msgid "Disk summary goes here"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/detailederror.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:21
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:37
+msgctxt "GUI|Custom Partitioning|Confirm Delete Dialog"
+msgid "_Delete It"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:129
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:144
+msgctxt "GUI|Custom Partitioning|Configure Dialog"
+msgid "_Select"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:176
+msgid "CONFIGURE MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:191
+msgid "Select one or more disks this device may reside on."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:321
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:336
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Add mount point"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:369
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "_Desired Capacity:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:386
+msgctxt "GUI|Custom Partitioning|Add Dialog"
+msgid "Mount _Point:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:404
+msgid "ADD A NEW MOUNT POINT"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:421
+msgid ""
+"More customization options are available\n"
+"after creating the mount point below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:456
+msgid ""
+"That mount point is already in\n"
+"use.  Try something else?"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:480
+msgid "eg: \"20 GB\", \"500mb\" (minus the quotation marks)"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:536
+msgid "Single <span foreground=\"grey\">(No Redundancy, No Striping)</span>"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:584
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:598
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Save"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:630
+msgid "CONFIGURE CONTAINER"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:645
+msgid ""
+"Please create a name for this container and select at least one disk below."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:663
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "_Name:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:783
+#, fuzzy
+msgid "RAID Level:"
+msgstr "Ithuluzi le-RAID"
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:811
+msgid "Encrypt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:852
+msgid "Please enter a valid name."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:882
+msgctxt "GUI|Custom Partitioning|Container Dialog"
+msgid "Si_ze policy:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:897
+msgid "Automatic"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:898
+msgid "As large as possible"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:899
+msgid "Fixed"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:8
+msgid "UNFORMATTED DASDS"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:23
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:37
+#, fuzzy
+msgctxt "GUI|DAD Format Dialog"
+msgid "_OK"
+msgstr "KULUNGILE"
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:70
+msgid ""
+"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."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:86
+msgid "Unformatted DASDs Detected"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:136
+msgid ""
+"<b>Warning</b>: All storage changes made using the installer will be lost "
+"when you choose to format."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:160
+msgctxt "GUI|DAD Format Dialog"
+msgid "_Format with dasdfmt"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:207
+msgid ""
+"You may <a href=\"\">go back to the main menu</a> to complete other\n"
+"installation options while formatting completes."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:247
+msgid "Disk formatting complete."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/dasdfmt.glade:262
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:269
+msgid ""
+"Pressing 'OK' below will take you to the disk selection screen where you "
+"will need to re-select your disks."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/detailederror.glade:25
 msgid "An unknown error occurred during installation.  Details are below."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:1
-msgid "DISK ENCRYPTION PASSPHRASE"
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:23
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:38
+msgctxt "GUI|Passphrase Dialog"
 msgid "_Save Passphrase"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:66
+msgid "DISK ENCRYPTION PASSPHRASE"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:82
 msgid ""
 "You have chosen to encrypt some of your data. You will need to create a "
 "passphrase that you will use to access your data when you start your "
 "computer."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/passphrase.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:103
+msgctxt "GUI|Passphrase Dialog"
+msgid "_Passphrase:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:132
+msgctxt "GUI|Passphrase Dialog"
+msgid "Con_firm:"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/passphrase.glade:270
 msgid ""
 "Warning: You won't be able to switch between keyboard layouts (from the "
 "default one) when you decrypt your disks after install."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:8
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:71
 msgid "RESCAN DISKS"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:25
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_Cancel"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:39
+#, fuzzy
+msgctxt "GUI|Refresh Dialog|Rescan"
+msgid "_OK"
+msgstr "KULUNGILE"
+
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:87
 msgid ""
 "You can remove or insert additional disks at this time and press 'Rescan "
 "Disks' below for the changes to take effect."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:118
 msgid ""
 "<b>Warning:</b> All storage changes made using the installer will be lost "
 "when you press 'Rescan Disks'."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:143
+msgctxt "GUI|Refresh Dialog|Rescan"
 msgid "_Rescan Disks"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:176
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:212
 msgid "Scanning disks.  This may take a moment..."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:223
 msgid ""
 "You may <a href=\"\">go back to the main menu</a> to complete other\n"
 "installation options while this scan completes."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:8
-msgid "<b>Disk rescan complete.</b>"
+#: pyanaconda/ui/gui/spokes/lib/refresh.glade:254
+msgid "Disk rescan complete."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/refresh.glade.h:9
-msgid ""
-"Pressing 'OK' below will take you to the disk selection screen where you "
-"will need to re-select your disks."
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:55
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Cancel"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:70
+msgctxt "GUI|Reclaim Dialog"
+msgid "_Reclaim space"
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:104
 msgid "RECLAIM DISK SPACE"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:121
 msgid "Description goes here."
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:174
 msgid "Filesystem"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:7
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:185
 msgid "Reclaimable Space"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:8
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:6
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:196
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:141
 msgid "Action"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:221
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Preserve"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:10
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:237
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Delete"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/resize.glade.h:11
+#: pyanaconda/ui/gui/spokes/lib/resize.glade:253
+msgctxt "GUI|Reclaim Dialog"
 msgid "_Shrink"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:23
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:87
 msgid "SUMMARY OF CHANGES"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:2
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:40
+msgctxt "GUI|Summary Dialog"
 msgid "_Cancel & Return to Custom Partitioning"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:3
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:55
+msgctxt "GUI|Summary Dialog"
 msgid "_Accept Changes"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:4
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:103
 msgid ""
 "Your customizations will result in the following changes taking effect after "
 "you return to the main menu and begin installation:"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:5
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:130
 msgid "Order"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:8
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:163
 msgid "Device Name"
 msgstr ""
 
-#: pyanaconda/ui/gui/spokes/lib/summary.glade.h:9
+#: pyanaconda/ui/gui/spokes/lib/summary.glade:174
 msgid "Mountpoint"
 msgstr ""
 
-#: pyanaconda/ui/gui/main.glade.h:1
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:35
+msgid ""
+"The system needs better quality of random data, you can improve it by typing "
+"randomly on keyboard and moving your mouse. The installation will continue "
+"automatically regardless of random data quality when time runs out."
+msgstr ""
+
+#: pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade:53
+msgid "Random data quality:"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:24
+msgid "_Exit Installer"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:94
+msgctxt "GUI|Main"
+msgid "_No"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:108
+msgctxt "GUI|Main"
+msgid "_Yes"
+msgstr ""
+
+#: pyanaconda/ui/gui/main.glade:151
 msgid ""
 "Are you sure you wish to quit the\n"
 "installation process?"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:1
+#: pyanaconda/ui/gui/main.glade:175
+msgid "Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:8
+#: pyanaconda/ui/gui/hubs/summary.glade:143
 msgid "INSTALLATION SUMMARY"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:3
+#: pyanaconda/ui/gui/hubs/summary.glade:80
+msgctxt "GUI|Summary"
+msgid "_Quit"
+msgstr ""
+
+#: pyanaconda/ui/gui/hubs/summary.glade:96
+#, fuzzy
+msgctxt "GUI|Summary"
 msgid "_Begin Installation"
+msgstr "Faka Kwisistimu"
+
+#: pyanaconda/ui/gui/hubs/summary.glade:127
+msgid "We won't touch your disks until you click 'Begin Installation'."
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/summary.glade.h:4
-msgid "We won't touch your disks until you hit this button."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:1
+#: pyanaconda/ui/gui/hubs/progress.glade:8
+#: pyanaconda/ui/gui/hubs/progress.glade:257
 msgid "CONFIGURATION"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:2
+#: pyanaconda/ui/gui/hubs/progress.glade:87
 msgid "Preparing to install"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:4
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system, but some configuration "
-"still needs to be done.  Finish it and then click the Finish configuration "
-"button please."
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:5
+#: pyanaconda/ui/gui/hubs/progress.glade:145
+msgctxt "GUI|Progress"
 msgid "_Finish configuration"
 msgstr ""
 
-#: pyanaconda/ui/gui/hubs/progress.glade.h:7
-#, c-format, python-format
-msgid ""
-"%s is now successfully installed on your system and ready for you to use!  "
-"Go ahead and reboot to start using it!"
-msgstr ""
-
-#: pyanaconda/ui/gui/hubs/progress.glade.h:8
+#: pyanaconda/ui/gui/hubs/progress.glade:198
+msgctxt "GUI|Progress"
 msgid "_Reboot"
 msgstr ""
 
@@ -3806,40 +5453,41 @@ msgstr ""
 msgid "Install the live CD to your hard disk"
 msgstr ""
 
-#: ../data/liveinst/console.apps/liveinst:5
+#: /home/vpodzime/anaconda/data/liveinst/console.apps/liveinst:5
 msgid "Starting Install to Hard Drive"
 msgstr ""
 
 #: data/liveinst/gnome/fedora-welcome.desktop.in.h:1
-#: data/liveinst/gnome/fedora-welcome:64
+#: data/liveinst/gnome/fedora-welcome:65
 msgid "Welcome to Fedora"
 msgstr ""
 
-#: anaconda:372
+#: anaconda:594
 #, python-format
 msgid ""
 "%(product_name)s requires %(needed_ram)s MB of memory to install, but you "
 "only have %(total_ram)s MB on this machine.\n"
 msgstr ""
 
-#: anaconda:374
+#: anaconda:596
 #, python-format
 msgid ""
 "The %(product_name)s graphical installer requires %(needed_ram)s MB of "
-"memory, but you only have %(total_ram)s MB."
+"memory, but you only have %(total_ram)s MB\n"
+"."
 msgstr ""
 
-#: anaconda:377
+#: anaconda:599
 msgid ""
 "\n"
 "Press <return> to reboot your system.\n"
 msgstr ""
 
-#: anaconda:379
+#: anaconda:601
 msgid "Not enough RAM"
 msgstr ""
 
-#: anaconda:380
+#: anaconda:602
 msgid ""
 " Try the text mode installer by running:\n"
 "\n"
@@ -3848,60 +5496,67 @@ msgid ""
 " from a root terminal."
 msgstr ""
 
-#: anaconda:383
+#: anaconda:605
 msgid " Starting text mode."
 msgstr ""
 
-#: anaconda:414
+#: anaconda:642
 #, fuzzy
 msgid "Fatal Error"
 msgstr "Iphutha"
 
-#: anaconda:525
+#: anaconda:767
 msgid "DISPLAY variable not set. Starting text mode."
 msgstr ""
 
-#: anaconda:533
+#: anaconda:775
 msgid "Graphical installation is not available. Starting text mode."
 msgstr ""
 
-#: anaconda:541
+#: anaconda:783
 msgid ""
 "Text mode provides a limited set of installation options. It does not offer "
 "custom partitioning for full control over the disk layout. Would you like to "
 "use VNC mode instead?"
 msgstr ""
 
-#: anaconda:660
+#: anaconda:872
 #, python-format
 msgid "Please ssh install@%s to begin the install."
 msgstr ""
 
-#: anaconda:662
+#: anaconda:874
 msgid "Please ssh install@<host> to continue installation."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:93
+#: data/liveinst/gnome/fedora-welcome:94
 msgid "Try Fedora"
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:111
+#: data/liveinst/gnome/fedora-welcome:110
 msgid ""
 "You are currently running Fedora from live media.\n"
 "You can install Fedora now, or choose \"Install to Hard Drive\" in the "
 "Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:129
+#: data/liveinst/gnome/fedora-welcome:128
 msgid ""
 "You can choose \"Install to Hard Drive\"\n"
 "in the Activities Overview at any later time."
 msgstr ""
 
-#: data/liveinst/gnome/fedora-welcome:132
+#: data/liveinst/gnome/fedora-welcome:131
 msgid "Close"
 msgstr ""
 
+#~ msgid "Can't have a question in command line mode!"
+#~ msgstr "Angeke ube nombuzo endleleni yolayini womyaleli!"
+
+#, fuzzy
+#~ msgid "R_AID Level:"
+#~ msgstr "Ithuluzi le-RAID"
+
 #~ msgid "Completed"
 #~ msgstr "Kuqediwe"
 
@@ -3937,27 +5592,5 @@ msgstr ""
 #~ msgid "You cannot delete a partition of a LDL formatted DASD."
 #~ msgstr "Angeke ukwazi ukucisha isahlulo se-LDL se-DASD eyakhelwe."
 
-#~ msgid ""
-#~ "You have not defined a root partition (/), which is required for "
-#~ "installation of %s to continue."
-#~ msgstr ""
-#~ "Awuzange uchaze ukwahlula kwempande (/), okudingekayo ukze ukufakwa kwe-"
-#~ "%s kuqhubeke."
-
-#~ msgid ""
-#~ "Your root partition is less than 250 megabytes which is usually too small "
-#~ "to install %s."
-#~ msgstr ""
-#~ "Isahlulo sakho sempande singaphansi kwama-byte angu-250 "
-#~ "ongokwejwayelekile incane kakhulu ukuthi ingafakwa %s."
-
-#~ msgid ""
-#~ "You have not specified a swap partition.  Although not strictly required "
-#~ "in all cases, it will significantly improve performance for most "
-#~ "installations."
-#~ msgstr ""
-#~ "Awuzange ucacise isahlulo sokushintsha. Yize kungadingakali kuzozonke "
-#~ "izinto, kungathuthukusa ukusebenza kokufakiwe."
-
 #~ msgid "Back"
 #~ msgstr "Emuva"
diff --git a/anaconda/pyanaconda/Makefile.am b/anaconda/pyanaconda/Makefile.am
index ae1159c..2d48bd2 100644
--- a/anaconda/pyanaconda/Makefile.am
+++ b/anaconda/pyanaconda/Makefile.am
@@ -24,4 +24,8 @@ MAINTAINERCLEANFILES = Makefile.in
 # anaconda Python code
 pkgpyexecdir    = $(pyexecdir)/py$(PACKAGE_NAME)
 anacondadir     = $(pkgpyexecdir)
-anaconda_PYTHON = $(srcdir)/*.py
+
+# Filter version.py out of the distributed python files since it will
+# be generated by the configure script
+anaconda_PYTHON = $(filter-out %/version.py,$(wildcard $(srcdir)/*.py))
+nodist_anaconda_PYTHON = $(builddir)/version.py
diff --git a/anaconda/pyanaconda/addons.py b/anaconda/pyanaconda/addons.py
index 343b2dc..d360946 100644
--- a/anaconda/pyanaconda/addons.py
+++ b/anaconda/pyanaconda/addons.py
@@ -22,8 +22,8 @@
 __all__ = ["AddonSection", "AddonRegistry", "AddonData", "collect_addon_paths"]
 
 import os
+import functools
 from pykickstart.sections import Section
-from pykickstart.options import KSOptionParser
 
 def collect_addon_paths(toplevel_addon_paths, ui_subdir="gui"):
     """This method looks into the directories present
@@ -46,7 +46,7 @@ def collect_addon_paths(toplevel_addon_paths, ui_subdir="gui"):
             directories = os.listdir(path)
         except OSError:
             directories = []
-                
+
         for addon_id in directories:
             addon_ks_path = os.path.join(path, addon_id, "ks")
             if os.path.isdir(addon_ks_path):
@@ -74,8 +74,8 @@ class AddonRegistry(object):
         self.__dict__ = dictionary
 
     def __str__(self):
-        return reduce(lambda acc,(id, addon): acc + str(addon),
-                      self.__dict__.iteritems(), "")
+        return functools.reduce(lambda acc, (id, addon): acc + str(addon),
+                                self.__dict__.iteritems(), "")
 
     def execute(self, storage, ksdata, instClass, users):
         """This method calls execute on all the registered addons."""
@@ -109,9 +109,10 @@ class AddonData(object):
     def __init__(self, name):
         self.name = name
         self.content = ""
+        self.header_args = ""
 
     def __str__(self):
-        return "%%addon %s\n%s%%end\n" % (self.name, self.content)
+        return "%%addon %s %s\n%s%%end\n" % (self.name, self.header_args, self.content)
 
     def setup(self, storage, ksdata, instClass):
         """Make the changes to the install system.
@@ -129,6 +130,24 @@ class AddonData(object):
         """
         pass
 
+    def handle_header(self, lineno, args):
+        """Process additional arguments to the %addon line.
+
+           This function receives any arguments on the %addon line after the
+           addon ID. For example, for the line:
+
+               %addon com_example_foo --argument='example'
+
+           This function would be called with args=["--argument='example'"].
+
+           By default AddonData.handle_header just preserves the passed
+           arguments by storing them and adding them to the __str__ output.
+
+        """
+
+        if args:
+            self.header_args += " ".join(args)
+
     def handle_line(self, line):
         """Process one kickstart line."""
         self.content += line
@@ -160,14 +179,16 @@ class AddonSection(Section):
     def handleHeader(self, lineno, args):
         """Process the arguments to the %addon header."""
         Section.handleHeader(self, lineno, args)
-        op = KSOptionParser(version=self.version)
-        (_opts, extra) = op.parse_args(args=args[1:], lineno=lineno)
-        self.addon_id = extra[0]
+        self.addon_id = args[1]
 
         # if the addon is not registered, create dummy placeholder for it
         if self.addon_id and not hasattr(self.handler.addons, self.addon_id):
             setattr(self.handler.addons, self.addon_id, AddonData(self.addon_id))
 
+        # Parse additional arguments to %addon with the AddonData handler
+        addon = getattr(self.handler.addons, self.addon_id)
+        addon.handle_header(lineno, args[2:])
+
     def finalize(self):
         """Let addon know no additional data will come."""
         Section.finalize(self)
diff --git a/anaconda/pyanaconda/anaconda.py b/anaconda/pyanaconda/anaconda.py
index 88a9a4d..57116bb 100644
--- a/anaconda/pyanaconda/anaconda.py
+++ b/anaconda/pyanaconda/anaconda.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # anaconda: The Red Hat Linux Installation program
 #
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -30,11 +28,14 @@
 
 import os
 import sys
-from pyanaconda.constants import ROOT_PATH
+import stat
+from glob import glob
 from tempfile import mkstemp
+import threading
 
 from pyanaconda.bootloader import get_bootloader
 from pyanaconda import constants
+from pyanaconda import iutil
 from pyanaconda import addons
 
 import logging
@@ -50,7 +51,6 @@ class Anaconda(object):
         self.desktop = desktop.Desktop()
         self.dir = None
         self.displayMode = None
-        self.extraModules = []
         self.id = None
         self._instClass = None
         self._intf = None
@@ -64,7 +64,6 @@ class Anaconda(object):
         self.proxyUsername = None
         self.proxyPassword = None
         self.reIPLMessage = None
-        self.rescue = False
         self.rescue_mount = True
         self.rootParts = None
 
@@ -76,6 +75,15 @@ class Anaconda(object):
         # *sigh* we still need to be able to write this out
         self.xdriver = None
 
+        # Data for inhibiting the screensaver
+        self.dbus_session_connection = None
+        self.dbus_inhibit_id = None
+
+        # This is used to synchronize Gtk.main calls between the graphical
+        # interface and error dialogs. Whoever gets to their initialization code
+        # first will lock gui_initializing
+        self.gui_initialized = threading.Lock()
+
     @property
     def bootloader(self):
         if not self._bootloader:
@@ -113,14 +121,21 @@ class Anaconda(object):
             if not klass:
                 from pyanaconda.flags import flags
 
-                if flags.livecdInstall:
+                if self.ksdata.ostreesetup.seen:
+                    from pyanaconda.packaging.rpmostreepayload import RPMOSTreePayload
+                    klass = RPMOSTreePayload
+                elif flags.livecdInstall:
                     from pyanaconda.packaging.livepayload import LiveImagePayload
                     klass = LiveImagePayload
                 elif self.ksdata.method.method == "liveimg":
                     from pyanaconda.packaging.livepayload import LiveImageKSPayload
                     klass = LiveImageKSPayload
                 elif flags.dnf:
-                    from pyanaconda.packaging.dnfpayload import DNFPayload as klass
+                    try:
+                        from pyanaconda.packaging.dnfpayload import DNFPayload
+                        klass = DNFPayload
+                    except ImportError:
+                        log.critical('Importing DNF  failed.', exc_info=True)
                 else:
                     from pyanaconda.packaging.yumpayload import YumPayload
                     klass = YumPayload
@@ -131,7 +146,6 @@ class Anaconda(object):
 
     @property
     def protected(self):
-        import stat
         specs = []
         if os.path.exists("/run/initramfs/livedev") and \
            stat.S_ISBLK(os.stat("/run/initramfs/livedev")[stat.ST_MODE]):
@@ -143,6 +157,10 @@ class Anaconda(object):
         if self.stage2 and self.stage2.startswith("hd:"):
             specs.append(self.stage2[3:].split(":", 3)[0])
 
+        # zRAM swap devices need to be protected
+        for zram_dev in glob("/dev/zram*"):
+            specs.append(zram_dev)
+
         return specs
 
     @property
@@ -179,8 +197,8 @@ class Anaconda(object):
         dump_text = exn.traceback_and_object_dump(self)
         dump_text += threads
         dump_text = dump_text.encode("utf-8")
-        os.write(fd, dump_text)
-        os.close(fd)
+        iutil.eintr_retry_call(os.write, fd, dump_text)
+        iutil.eintr_retry_call(os.close, fd)
 
         # append to a given file
         with open("/tmp/anaconda-tb-all.log", "a+") as f:
@@ -194,7 +212,7 @@ class Anaconda(object):
         if self.displayMode == 'g':
             from pyanaconda.ui.gui import GraphicalUserInterface
             self._intf = GraphicalUserInterface(self.storage, self.payload,
-                                                self.instClass)
+                                                self.instClass, gui_lock=self.gui_initialized)
 
             # needs to be refreshed now we know if gui or tui will take place
             addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS,
@@ -219,9 +237,9 @@ class Anaconda(object):
         if self.xdriver is None:
             return
         if root is None:
-            root = ROOT_PATH
+            root = iutil.getSysroot()
         if not os.path.isdir("%s/etc/X11" %(root,)):
-            os.makedirs("%s/etc/X11" %(root,), mode=0755)
+            os.makedirs("%s/etc/X11" %(root,), mode=0o755)
         f = open("%s/etc/X11/xorg.conf" %(root,), 'w')
         f.write('Section "Device"\n\tIdentifier "Videocard0"\n\tDriver "%s"\nEndSection\n' % self.xdriver)
         f.close()
diff --git a/anaconda/pyanaconda/anaconda_argparse.py b/anaconda/pyanaconda/anaconda_argparse.py
new file mode 100644
index 0000000..c7ac77f
--- /dev/null
+++ b/anaconda/pyanaconda/anaconda_argparse.py
@@ -0,0 +1,355 @@
+#
+# anaconda_argparse.py: option parsing for anaconda (CLI and boot args)
+#
+# Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#   Will Woods <wwoods@redhat.com>
+#   Martin Kolman <mkolman@redhat.com>
+
+DESCRIPTION = "Anaconda is the installation program used by Fedora," \
+              "Red Hat Enterprise Linux and some other distributions."
+
+import itertools
+import os
+import sys
+import fcntl
+import termios
+import struct
+
+from argparse import ArgumentParser, ArgumentError, HelpFormatter, Namespace
+
+from pyanaconda.flags import BootArgs
+
+import logging
+log = logging.getLogger("anaconda")
+
+# Help text formatting constants
+
+LEFT_PADDING = 8  # the help text will start after 8 spaces
+RIGHT_PADDING = 8  # there will be 8 spaces left on the right
+DEFAULT_HELP_WIDTH = 80
+
+def get_help_width():
+    """
+    Try to detect the terminal window width size and use it to
+    compute optimal help text width. If it can't be detected
+    a default values is returned.
+
+    :returns: optimal help text width in number of characters
+    :rtype: int
+    """
+    # don't do terminal size detection on s390, it is not supported
+    # by its arcane TTY system and only results in cryptic error messages
+    # ending on the standard output
+    # (we do the s390 detection here directly to avoid
+    #  the delay caused by importing the Blivet module
+    #  just for this single call)
+    is_s390 = os.uname()[4].startswith('s390')
+    if is_s390:
+        return DEFAULT_HELP_WIDTH
+
+    help_width = DEFAULT_HELP_WIDTH
+    try:
+        data = fcntl.ioctl(sys.stdout, termios.TIOCGWINSZ, '1234')
+        columns = int(struct.unpack('hh', data)[1])
+        # apply the right padding
+        columns = columns - RIGHT_PADDING
+        if columns > 0:
+            help_width = columns
+    # pylint: disable=broad-except
+    except Exception as e:
+        # detection failed, use the default
+        # NOTE: this could be caused by the COLUMNS string having a value
+        # that can't be converted to an integer
+        print("anaconda argparse: terminal size detection failed, using default width")
+        print(e)
+    return help_width
+
+class AnacondaArgumentParser(ArgumentParser):
+    """
+    Subclass of ArgumentParser that also examines boot arguments.
+    """
+
+    def __init__(self, *args, **kwargs):
+        """
+        If the "bootarg_prefix" keyword argument is set, it's assumed that all
+        bootargs will start with that prefix.
+
+        "require_prefix" is a bool:
+            False: accept the argument with or without the prefix.
+            True: ignore the argument without the prefix. (default)
+        """
+        help_width = get_help_width()
+        self._boot_arg = dict()
+        self.deprecated_bootargs = []
+        self.bootarg_prefix = kwargs.pop("bootarg_prefix", "")
+        self.require_prefix = kwargs.pop("require_prefix", True)
+        ArgumentParser.__init__(self, description=DESCRIPTION,
+                                formatter_class=lambda prog: HelpFormatter(
+                                    prog, max_help_position=LEFT_PADDING, width=help_width),
+                                *args, **kwargs)
+
+    def add_argument(self, *args, **kwargs):
+        """
+        Add a new option - like ArgumentParser.add_argument.
+
+        The long options will be added to the list of boot args, unless
+        the keyword argument 'bootarg' is set to False.
+
+        Positional arguments that don't start with '-' are considered extra
+        boot args to look for.
+
+        NOTE: conflict_handler is currently ignored for boot args - they will
+        always raise ArgumentError if they conflict.
+        """
+        # TODO: add kwargs to make an option commandline-only or boot-arg-only
+        flags = [a for a in args if a.startswith('-')]
+        bootargs = [a for a in args if not a.startswith('-')]
+        do_bootarg = kwargs.pop("bootarg", True)
+        option = super(AnacondaArgumentParser, self).add_argument(*flags, **kwargs)
+        # make a generator that returns only the long opts without the -- prefix
+        long_opts = (o[2:] for o in option.option_strings if o.startswith("--"))
+        bootargs += (flag for flag in long_opts)
+        if do_bootarg:
+            for b in bootargs:
+                if b in self._boot_arg:
+                    raise ArgumentError(
+                        "conflicting bootopt string: %s" % b, option)
+                else:
+                    self._boot_arg[b] = option
+        return option
+
+    def _get_bootarg_option(self, arg):
+        """
+        Find the correct Option for a given bootarg (if one exists)
+
+        :param string arg: boot option
+
+        :returns: argparse option object or None if no suitable option is found
+        :rtype argparse option or None
+        """
+        if self.bootarg_prefix and arg.startswith(self.bootarg_prefix):
+            prefixed_option = True
+            arg = arg[len(self.bootarg_prefix):]
+        else:
+            prefixed_option = False
+        option = self._boot_arg.get(arg)
+
+        if self.require_prefix and not prefixed_option:
+            return None
+        if option and self.bootarg_prefix and not prefixed_option:
+            self.deprecated_bootargs.append(arg)
+        return option
+
+    def parse_boot_cmdline(self, boot_cmdline):
+        """
+        Parse the boot cmdline and create an appropriate Namespace instance
+        according to the option definitions set by add_argument.
+
+        boot_cmdline can be given as a string (to be parsed by BootArgs), or a
+        dict (or any object with .iteritems()) of {bootarg:value} pairs.
+
+        If boot_cmdline is None, the boot_cmdline data will be whatever BootArgs reads
+        by default (/proc/cmdline, /run/initramfs/etc/cmdline, /etc/cmdline).
+
+        If an option requires a value but the boot arg doesn't provide one,
+        we'll quietly not set anything in the Namespace. We also skip any boot options
+        that were not specified by add_argument as we don't care about them
+        (there will usually be quite a lot of them (rd.*, etc.).
+
+        :param boot_cmdline: the Anaconda boot command line arguments
+        :type boot_cmdline: string, dict or None
+
+        :returns: an argparse Namespace instance
+        :rtype: Namespace
+        """
+        namespace = Namespace()
+        if boot_cmdline is None or type(boot_cmdline) is str:
+            bootargs = BootArgs(boot_cmdline)
+        else:
+            bootargs = boot_cmdline
+        self.deprecated_bootargs = []
+        # go over all options corresponding to current boot cmdline
+        # and do any modifications necessary
+        # NOTE: program cmdline overrides boot cmdline
+        for arg, val in bootargs.iteritems():
+            option = self._get_bootarg_option(arg)
+            if option is None:
+                # this boot option is unknown to Anaconda, skip it
+                continue
+            if option.nargs != 0 and val is None:
+                # nargs == 0 -> the option expects one or more arguments but the
+                # boot option was not given any, so we skip it
+                log.warning("boot option specified without expected number of "
+                            "arguments and will be ignored: %s", arg)
+                continue
+            if option.nargs == 0 and option.const is not None:
+                # nargs == 0 & constr == True -> store_true
+                # (we could also check the class, but it begins with an
+                # underscore, so it would be ugly)
+                # special case: "mpath=0" would otherwise set mpath to True
+                if option.const is True and val in ("0", "no", "off"):
+                    setattr(namespace, option.dest, False)
+                # Set all other set_const cases to the const specified
+                else:
+                    setattr(namespace, option.dest, option.const)
+
+                # anaconda considers cases such as noselinux=off to be a negative
+                # concord, which is to say that selinux will be set to False and
+                # we hate you.
+
+                continue
+            setattr(namespace, option.dest, val)
+        return namespace
+
+    # pylint: disable=arguments-differ
+    def parse_args(self, args=None, boot_cmdline=None):
+        """
+        Like ArgumentParser.parse_args(), but also parses the boot cmdline.
+        (see parse_boot_cmdline for details on that process.)
+        Program cmdline arguments will override boot cmdline arguments.
+
+        :param args: program command line arguments
+        :type args: string or None
+
+        :param boot_cmdline: the Anaconda boot command line arguments
+        :type boot_cmdline: string, dict or None
+
+        :returns: an argparse Namespace instance
+        :rtype: Namespace
+        """
+        # parse boot options first
+        namespace = self.parse_boot_cmdline(boot_cmdline)
+        # parse CLI arguments (if any) and add them to the namespace
+        # created from parsing boot options, overriding any options
+        # with the same destination already present in the namespace
+        # NOTE: this means that CLI options override boot options
+        namespace = ArgumentParser.parse_args(self, args, namespace)
+        return namespace
+
+def name_path_pairs(image_specs):
+    """Processes and verifies image file specifications. Generates pairs
+       of names and paths.
+
+       :param image_specs: a list of image specifications
+       :type image_specs: list of str
+
+       Each image spec in image_specs has format <path>[:<name>] where
+       <path> is the path to a local file and <name> is an optional
+       name used to identify the disk in UI. <name> may not contain colons
+       or slashes.
+
+       If no name given in specification, synthesizes name from basename
+       of path. Since two distinct paths may have the same basename, handles
+       name collisions by synthesizing a different name for the colliding
+       name.
+
+       Raises an exception if:
+         * A path is empty
+         * A path specifies a non-existant file
+         * A path specifies a directory
+         * Duplicate paths are specified
+         * A name contains a "/"
+    """
+    image_specs = (spec.rsplit(":", 1) for spec in image_specs)
+    path_name_pairs = ((image_spec[0], image_spec[1].strip() if len(image_spec) == 2 else None) for image_spec in image_specs)
+
+    paths_seen = []
+    names_seen = []
+    for (path, name) in path_name_pairs:
+        if path == "":
+            raise ValueError("empty path specified for image file")
+        path = os.path.abspath(path)
+        if not os.path.exists(path):
+            raise ValueError("non-existant path %s specified for image file" % path)
+        if os.path.isdir(path):
+            raise ValueError("directory path %s specified for image file" % path)
+        if path in paths_seen:
+            raise ValueError("path %s specified twice for image file" % path)
+        paths_seen.append(path)
+
+        if name and "/" in name:
+            raise ValueError("improperly formatted image file name %s, includes slashes" % name)
+
+        if not name:
+            name = os.path.splitext(os.path.basename(path))[0]
+
+        if name in names_seen:
+            names = ("%s_%d" % (name, n) for n in itertools.count())
+            name = next(itertools.dropwhile(lambda n: n in names_seen, names))
+        names_seen.append(name)
+
+        yield name, path
+
+class HelpTextParser(object):
+    """Class to parse help text from file and make it available to option
+       parser.
+    """
+
+    def __init__(self, path):
+        """ Initializer
+            :param path: The absolute path to the help text file
+        """
+        self._path = path
+
+        self._help_text = None
+
+    def read(self, lines):
+        """Reads option, help text pairs from a text file.
+
+           Each pair is separated from the next by an empty line.
+           The option comes first, followed by any number of lines of help text.
+
+           :param lines: a sequence of lines of text
+        """
+        if not lines:
+            return
+        expect_option = True
+        option = None
+        text = []
+        for line in (line.strip() for line in lines):
+            if line == "":
+                expect_option = True
+            elif expect_option:
+                if option:
+                    yield option, " ".join(text)
+                option = line
+                text = []
+                expect_option = False
+            else:
+                text.append(line)
+        yield option, " ".join(text)
+
+    def help_text(self, option):
+        """
+        Returns the help text corresponding to the given command-line option.
+        If no help text is available, returns the empty string.
+
+        :param str option: The name of the option
+
+        :rtype: str
+        """
+        if self._help_text is None:
+            self._help_text = {}
+            try:
+                with open(self._path) as lines:
+                    for parsed_option, parsed_text in self.read(lines):
+                        self._help_text[parsed_option] = parsed_text
+            except StandardError:
+                log.error("error reading help text file %s", self._path)
+
+        return self._help_text.get(option, "")
diff --git a/anaconda/pyanaconda/anaconda_log.py b/anaconda/pyanaconda/anaconda_log.py
index 3e90c51..5c7b78b 100644
--- a/anaconda/pyanaconda/anaconda_log.py
+++ b/anaconda/pyanaconda/anaconda_log.py
@@ -30,6 +30,7 @@ import types
 import warnings
 
 from pyanaconda.flags import flags
+from pyanaconda.constants import LOGLVL_LOCK
 
 DEFAULT_TTY_LEVEL = logging.INFO
 ENTRY_FORMAT = "%(asctime)s,%(msecs)03d %(levelname)s %(name)s: %(message)s"
@@ -49,8 +50,11 @@ ANACONDA_SYSLOG_FACILITY = SysLogHandler.LOG_LOCAL1
 from threading import Lock
 program_log_lock = Lock()
 
-logLevelMap = {"debug": logging.DEBUG, "info": logging.INFO,
-               "warning": logging.WARNING, "error": logging.ERROR,
+logLevelMap = {"lock": LOGLVL_LOCK,
+               "debug": logging.DEBUG,
+               "info": logging.INFO,
+               "warning": logging.WARNING,
+               "error": logging.ERROR,
                "critical": logging.CRITICAL}
 
 # sets autoSetLevel for the given handler
@@ -63,6 +67,11 @@ def setHandlersLevel(logr, level):
         filter (lambda hdlr: hasattr(hdlr, "autoSetLevel") and hdlr.autoSetLevel, logr.handlers))
 
 class AnacondaSyslogHandler(SysLogHandler):
+    # syslog doesn't understand these level names
+    levelMap = { "ERR": "error",
+                 "CRIT": "critical",
+                 "LOCK": "debug"}
+
     def __init__(self,
                  address=('localhost', SYSLOG_UDP_PORT),
                  facility=SysLogHandler.LOG_USER,
@@ -76,6 +85,10 @@ class AnacondaSyslogHandler(SysLogHandler):
         SysLogHandler.emit(self, record)
         record.msg = original_msg
 
+    def mapPriority(self, level):
+        """Map the priority level to a syslog level """
+        return self.levelMap.get(level, SysLogHandler.mapPriority(self, level))
+
 class AnacondaLog:
     SYSLOG_CFGFILE  = "/etc/rsyslog.conf"
     VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0"
@@ -87,6 +100,7 @@ class AnacondaLog:
         logging.addLevelName(logging.WARNING, "WARN")
         logging.addLevelName(logging.ERROR, "ERR")
         logging.addLevelName(logging.CRITICAL, "CRIT")
+        logging.addLevelName(LOGLVL_LOCK, "LOCK")
 
         # Create the base of the logger hierarchy.
         self.anaconda_logger = logging.getLogger("anaconda")
@@ -123,7 +137,7 @@ class AnacondaLog:
 
         # Create the packaging logger.
         packaging_logger = logging.getLogger("packaging")
-        packaging_logger.setLevel(logging.DEBUG)
+        packaging_logger.setLevel(LOGLVL_LOCK)
         self.addFileHandler(PACKAGING_LOG_FILE, packaging_logger,
                             minLevel=logging.INFO,
                             autoLevel=True)
@@ -180,7 +194,7 @@ class AnacondaLog:
     def forwardToSyslog(self, logr):
         """Forward everything that goes in the logger to the syslog daemon.
         """
-        if flags.imageInstall:
+        if flags.imageInstall or flags.dirInstall:
             # don't clutter up the system logs when doing an image install
             return
 
@@ -191,7 +205,7 @@ class AnacondaLog:
         syslogHandler.setLevel(logging.DEBUG)
         logr.addHandler(syslogHandler)
 
-    # pylint: disable-msg=W0622
+    # pylint: disable=redefined-builtin
     def showwarning(self, message, category, filename, lineno,
                       file=sys.stderr, line=None):
         """ Make sure messages sent through python's warnings module get logged.
@@ -199,7 +213,7 @@ class AnacondaLog:
             The warnings mechanism is used by some libraries we use,
             notably pykickstart.
         """
-        self.anaconda_logger.warning("%s" % warnings.formatwarning(
+        self.anaconda_logger.warning("%s", warnings.formatwarning(
                 message, category, filename, lineno, line))
 
     def restartSyslog(self):
diff --git a/anaconda/pyanaconda/anaconda_optparse.py b/anaconda/pyanaconda/anaconda_optparse.py
deleted file mode 100644
index 1916b8a..0000000
--- a/anaconda/pyanaconda/anaconda_optparse.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# anaconda_optparse.py: option parsing for anaconda (CLI and boot args)
-#
-# Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#   Will Woods <wwoods@redhat.com>
-
-from pyanaconda.flags import BootArgs
-from optparse import OptionParser, OptionConflictError
-
-class AnacondaOptionParser(OptionParser):
-    """
-    Subclass of OptionParser that also examines boot arguments.
-
-    If the "bootarg_prefix" keyword argument is set, it's assumed that all
-    bootargs will start with that prefix.
-
-    "require_prefix" is a bool:
-        False: accept the argument with or without the prefix.
-        True: ignore the argument without the prefix. (default)
-    """
-    def __init__(self, *args, **kwargs):
-        self._boot_arg = dict()
-        self.deprecated_bootargs = []
-        self.bootarg_prefix = kwargs.pop("bootarg_prefix","")
-        self.require_prefix = kwargs.pop("require_prefix",True)
-        OptionParser.__init__(self, *args, **kwargs)
-
-    def add_option(self, *args, **kwargs):
-        """
-        Add a new option - like OptionParser.add_option.
-
-        The long options will be added to the list of boot args, unless
-        the keyword argument 'bootarg' is set to False.
-
-        Positional arguments that don't start with '-' are considered extra
-        boot args to look for.
-
-        NOTE: conflict_handler is currently ignored for boot args - they will
-        always raise OptionConflictError if they conflict.
-        """
-        # TODO: add kwargs to make an option commandline-only or boot-arg-only
-        flags = [a for a in args if a.startswith('-')]
-        bootargs = [a for a in args if not a.startswith('-')]
-        do_bootarg = kwargs.pop("bootarg", True)
-        option = OptionParser.add_option(self, *flags, **kwargs)
-        bootargs += (flag[2:] for flag in option._long_opts)
-        if do_bootarg:
-            for b in bootargs:
-                if b in self._boot_arg:
-                    raise OptionConflictError(
-                          "conflicting bootopt string: %s" % b, option)
-                else:
-                    self._boot_arg[b] = option
-        return option
-
-    def _get_bootarg_option(self, arg):
-        """Find the correct Option for a given bootarg (if one exists)"""
-        if self.bootarg_prefix and arg.startswith(self.bootarg_prefix):
-            prefixed_option = True
-            arg = arg[len(self.bootarg_prefix):]
-        else:
-            prefixed_option = False
-        option = self._boot_arg.get(arg)
-
-        if self.require_prefix and not prefixed_option:
-            return None
-        if option and self.bootarg_prefix and not prefixed_option:
-            self.deprecated_bootargs.append(arg)
-        return option
-
-    def parse_boot_cmdline(self, cmdline, values=None):
-        """
-        Parse the boot cmdline and set appropriate values according to
-        the options set by add_option.
-
-        cmdline can be given as a string (to be parsed by BootArgs), or a
-        dict (or any object with .iteritems()) of {bootarg:value} pairs.
-
-        If cmdline is None, the cmdline data will be whatever BootArgs reads
-        by default (/proc/cmdline, /run/initramfs/etc/cmdline, /etc/cmdline).
-
-        If an option requires a value but the boot arg doesn't provide one,
-        we'll quietly not set anything.
-        """
-        if cmdline is None or type(cmdline) is str:
-            bootargs = BootArgs(cmdline)
-        else:
-            bootargs = cmdline
-        self.deprecated_bootargs = []
-        for arg, val in bootargs.iteritems():
-            option = self._get_bootarg_option(arg)
-            if option is None:
-                continue
-            if option.takes_value() and val is None:
-                continue # TODO: emit a warning or something there?
-            if option.action == "store_true" and val in ("0", "no", "off"):
-                # special case: "mpath=0" would otherwise set mpath to True
-                setattr(values, option.dest, False)
-                continue
-            option.process(arg, val, values, self)
-        return values
-
-    # pylint: disable-msg=W0221
-    def parse_args(self, args=None, values=None, cmdline=None):
-        """
-        Like OptionParser.parse_args(), but also parses the boot cmdline.
-        (see parse_boot_cmdline for details on that process.)
-        Commandline arguments will override boot arguments.
-        """
-        if values is None:
-            values = self.get_default_values()
-        v = self.parse_boot_cmdline(cmdline, values)
-        return OptionParser.parse_args(self, args, v)
diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py
index e6c988b..5942cba 100644
--- a/anaconda/pyanaconda/bootloader.py
+++ b/anaconda/pyanaconda/bootloader.py
@@ -26,19 +26,22 @@ import os
 import re
 import shutil
 import struct
+import blivet
 from parted import PARTITION_BIOS_GRUB
 
 from pyanaconda import iutil
-from blivet.devicelibs import mdraid
+from blivet.devicelibs import raid
 from pyanaconda.isys import sync
 from pyanaconda.product import productName
 from pyanaconda.flags import flags
-from pyanaconda.constants import ROOT_PATH
 from blivet.errors import StorageError
 from blivet.fcoe import fcoe
 import pyanaconda.network
+from pyanaconda.errors import errorHandler, ERROR_RAISE, ZIPLError
+from pyanaconda.packaging.rpmostreepayload import RPMOSTreePayload
 from pyanaconda.nm import nm_device_hwaddress
 from blivet import platform
+from blivet.size import Size
 from pyanaconda.i18n import _, N_
 
 import logging
@@ -52,11 +55,11 @@ def get_boot_block(device, seek_blocks=0):
         except StorageError:
             return ""
     block_size = device.partedDevice.sectorSize
-    fd = os.open(device.path, os.O_RDONLY)
+    fd = iutil.eintr_retry_call(os.open, device.path, os.O_RDONLY)
     if seek_blocks:
         os.lseek(fd, seek_blocks * block_size, 0)
-    block = os.read(fd, 512)
-    os.close(fd)
+    block = iutil.eintr_retry_call(os.read, fd, 512)
+    iutil.eintr_retry_call(os.close, fd)
     if not status:
         try:
             device.teardown(recursive=True)
@@ -112,6 +115,12 @@ def parse_serial_opt(arg):
         pass
     return opts
 
+def _is_on_iscsi(device):
+    """Tells whether a given device is on an iSCSI disk or not."""
+
+    return all(isinstance(disk, blivet.devices.iScsiDiskDevice)
+               for disk in device.disks)
+
 class BootLoaderError(Exception):
     pass
 
@@ -218,7 +227,7 @@ class BootLoader(object):
     name = "Generic Bootloader"
     packages = []
     config_file = None
-    config_file_mode = 0600
+    config_file_mode = 0o600
     can_dual_boot = False
     can_update = False
     image_label_attr = "label"
@@ -237,7 +246,7 @@ class BootLoader(object):
     stage2_bootable = False
     stage2_must_be_primary = True
     stage2_description = N_("/boot filesystem")
-    stage2_max_end_mb = 2 * 1024 * 1024
+    stage2_max_end = Size("2 TiB")
 
     @property
     def stage2_format_types(self):
@@ -299,13 +308,11 @@ class BootLoader(object):
     #
     # disk list access
     #
-    # pylint: disable-msg=E0202
     @property
     def disk_order(self):
         """Potentially partial order for disks."""
         return self._disk_order
 
-    # pylint: disable-msg=E0102,E0202,E1101
     @disk_order.setter
     def disk_order(self, order):
         log.debug("new disk order: %s", order)
@@ -331,7 +338,6 @@ class BootLoader(object):
     #
     # image list access
     #
-    # pylint: disable-msg=E0202
     @property
     def default(self):
         """The default image."""
@@ -340,7 +346,6 @@ class BootLoader(object):
 
         return self._default_image
 
-    # pylint: disable-msg=E0102,E0202,E1101
     @default.setter
     def default(self, image):
         if image not in self.images:
@@ -393,7 +398,7 @@ class BootLoader(object):
             return ret
 
         if raid_levels and device.level not in raid_levels:
-            levels_str = ",".join("RAID%d" % l for l in raid_levels)
+            levels_str = ",".join("%s" % l for l in raid_levels)
             self.errors.append(_("RAID sets that contain '%(desc)s' must have one "
                                  "of the following raid levels: %(raid_level)s.")
                                  % {"desc" : desc, "raid_level" : levels_str})
@@ -482,15 +487,15 @@ class BootLoader(object):
         log.debug("_is_valid_size(%s) returning %s", device.name, ret)
         return ret
 
-    def _is_valid_location(self, device, max_mb=None, desc=""):
+    def _is_valid_location(self, device, max_end=None, desc=""):
         ret = True
-        if max_mb and device.type == "partition" and device.partedPartition:
+        if max_end and device.type == "partition" and device.partedPartition:
             end_sector = device.partedPartition.geometry.end
             sector_size = device.partedPartition.disk.device.sectorSize
-            end_mb = (sector_size * end_sector) / (1024.0 * 1024.0)
-            if end_mb > max_mb:
-                self.errors.append(_("%(desc)s must be within the first %(max_mb)dMB of "
-                                     "the disk.") % {"desc": desc, "max_mb": max_mb})
+            end = Size(sector_size * end_sector)
+            if end > max_end:
+                self.errors.append(_("%(desc)s must be within the first %(max_end)s of "
+                                     "the disk.") % {"desc": desc, "max_end": max_end})
                 ret = False
 
         log.debug("_is_valid_location(%s) returning %s", device.name, ret)
@@ -577,6 +582,10 @@ class BootLoader(object):
             log.debug("stage1 device cannot be of type %s", device.type)
             return False
 
+        if blivet.arch.isS390() and _is_on_iscsi(device):
+            log.debug("stage1 device cannot be on an iSCSI disk on s390(x)")
+            return False
+
         description = self.device_description(device)
 
         if self.stage2_is_valid_stage1 and device == self.stage2_device:
@@ -600,7 +609,7 @@ class BootLoader(object):
             valid = False
 
         if not self._is_valid_location(device,
-                                       max_mb=constraint["max_end_mb"],
+                                       max_end=constraint["max_end"],
                                        desc=description):
             valid = False
 
@@ -685,21 +694,25 @@ class BootLoader(object):
         if device.protected:
             valid = False
 
+        if blivet.arch.isS390() and _is_on_iscsi(device):
+            self.errors.append(_("%s cannot be on an iSCSI disk on s390(x)") % self.stage2_description)
+            valid = False
+
         if not self._device_type_match(device, self.stage2_device_types):
             self.errors.append(_("%(desc)s cannot be of type %(type)s")
-                                 % {"desc" : self.stage2_description, "type" : device.type})
+                                 % {"desc" : _(self.stage2_description), "type" : device.type})
             valid = False
 
         if not self._is_valid_disklabel(device,
                                         disklabel_types=self.disklabel_types):
             valid = False
 
-        if not self._is_valid_size(device, desc=self.stage2_description):
+        if not self._is_valid_size(device, desc=_(self.stage2_description)):
             valid = False
 
         if not self._is_valid_location(device,
-                                       max_mb=self.stage2_max_end_mb,
-                                       desc=self.stage2_description):
+                                       max_end=self.stage2_max_end,
+                                       desc=_(self.stage2_description)):
             valid = False
 
         if not self._is_valid_partition(device,
@@ -710,14 +723,14 @@ class BootLoader(object):
                                  raid_levels=self.stage2_raid_levels,
                                  metadata=self.stage2_raid_metadata,
                                  member_types=self.stage2_raid_member_types,
-                                 desc=self.stage2_description):
+                                 desc=_(self.stage2_description)):
             valid = False
 
         if linux and \
            not self._is_valid_format(device,
                                      format_types=self.stage2_format_types,
                                      mountpoints=self.stage2_mountpoints,
-                                     desc=self.stage2_description):
+                                     desc=_(self.stage2_description)):
             valid = False
 
         non_linux_format_types = platform.platform._non_linux_format_types
@@ -728,7 +741,7 @@ class BootLoader(object):
 
         if not self.encryption_support and device.encrypted:
             self.errors.append(_("%s cannot be on an encrypted block "
-                                 "device.") % self.stage2_description)
+                                 "device.") % _(self.stage2_description))
             valid = False
 
         log.debug("is_valid_stage2_device(%s) returning %s", device.name, valid)
@@ -741,7 +754,6 @@ class BootLoader(object):
     def has_windows(self, devices):
         return False
 
-    # pylint: disable-msg=E0202
     @property
     def timeout(self):
         """Bootloader timeout in seconds."""
@@ -756,17 +768,14 @@ class BootLoader(object):
         """ Run additional bootloader checks """
         return True
 
-    # pylint: disable-msg=E0102,E0202,E1101
     @timeout.setter
     def timeout(self, seconds):
         self._timeout = seconds
 
-    # pylint: disable-msg=E0202
     @property
     def update_only(self):
         return self._update_only
 
-    # pylint: disable-msg=E0102,E0202,E1101
     @update_only.setter
     def update_only(self, value):
         if value and not self.can_update:
@@ -911,7 +920,7 @@ class BootLoader(object):
 
     def write_config_post(self):
         try:
-            os.chmod(ROOT_PATH + self.config_file, self.config_file_mode)
+            iutil.eintr_retry_call(os.chmod, iutil.getSysroot() + self.config_file, self.config_file_mode)
         except OSError as e:
             log.error("failed to set config file permissions: %s", e)
 
@@ -920,7 +929,7 @@ class BootLoader(object):
         if not self.config_file:
             raise BootLoaderError("no config file defined for this bootloader")
 
-        config_path = os.path.normpath(ROOT_PATH + self.config_file)
+        config_path = os.path.normpath(iutil.getSysroot() + self.config_file)
         if os.access(config_path, os.R_OK):
             os.rename(config_path, config_path + ".anacbak")
 
@@ -952,7 +961,7 @@ class BootLoader(object):
 
         self.write_config()
         sync()
-        self.stage2_device.format.sync(root=ROOT_PATH)
+        self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
         self.install()
 
     def install(self, args=None):
@@ -977,12 +986,14 @@ class GRUB(BootLoader):
 
     # list of strings representing options for boot device types
     stage2_device_types = ["partition", "mdarray"]
-    stage2_raid_levels = [mdraid.RAID1]
+    stage2_raid_levels = [raid.RAID1]
     stage2_raid_member_types = ["partition"]
     stage2_raid_metadata = ["0", "0.90", "1.0"]
 
     packages = ["grub"]
 
+    _serial_consoles = ["ttyS"]
+
     def __init__(self):
         super(GRUB, self).__init__()
         self.encrypted_password = ""
@@ -1033,10 +1044,16 @@ class GRUB(BootLoader):
         """ relative path to splash image directory."""
         return GRUB._config_dir
 
+    @property
+    def has_serial_console(self):
+        """ true if the console is a serial console. """
+
+        return any(self.console.startswith(sconsole) for sconsole in self._serial_consoles)
+
     @property
     def serial_command(self):
         command = ""
-        if self.console and self.console.startswith("ttyS"):
+        if self.console and self.has_serial_console:
             unit = self.console[-1]
             command = ["serial"]
             s = parse_serial_opt(self.console_options)
@@ -1061,7 +1078,7 @@ class GRUB(BootLoader):
         if not self.console:
             return
 
-        if self.console.startswith("ttyS"):
+        if self.has_serial_console:
             config.write("%s\n" % self.serial_command)
             config.write("terminal --timeout=%s serial console\n"
                          % self.timeout)
@@ -1136,7 +1153,7 @@ class GRUB(BootLoader):
 
         if iutil.isConsoleOnVirtualTerminal(self.console):
             splash = "splash.xpm.gz"
-            splash_path = os.path.normpath("%s/boot/%s/%s" % (ROOT_PATH,
+            splash_path = os.path.normpath("%s/boot/%s/%s" % (iutil.getSysroot(),
                                                         self.splash_dir,
                                                         splash))
             if os.access(splash_path, os.R_OK):
@@ -1189,7 +1206,7 @@ class GRUB(BootLoader):
 
     def write_device_map(self):
         """ Write out a device map containing all supported devices. """
-        map_path = os.path.normpath(ROOT_PATH + self.device_map_file)
+        map_path = os.path.normpath(iutil.getSysroot() + self.device_map_file)
         if os.access(map_path, os.R_OK):
             os.rename(map_path, map_path + ".anacbak")
 
@@ -1205,7 +1222,7 @@ class GRUB(BootLoader):
         super(GRUB, self).write_config_post()
 
         # make symlink for menu.lst (grub's default config file name)
-        menu_lst = "%s%s/menu.lst" % (ROOT_PATH, self.config_dir)
+        menu_lst = "%s%s/menu.lst" % (iutil.getSysroot(), self.config_dir)
         if os.access(menu_lst, os.R_OK):
             try:
                 os.rename(menu_lst, menu_lst + '.anacbak')
@@ -1218,7 +1235,7 @@ class GRUB(BootLoader):
             log.error("failed to create grub menu.lst symlink: %s", e)
 
         # make symlink to grub.conf in /etc since that's where configs belong
-        etc_grub = "%s/etc/%s" % (ROOT_PATH, self._config_file)
+        etc_grub = "%s/etc/%s" % (iutil.getSysroot(), self._config_file)
         if os.access(etc_grub, os.R_OK):
             try:
                 os.unlink(etc_grub)
@@ -1246,30 +1263,24 @@ class GRUB(BootLoader):
     def install_targets(self):
         """ List of (stage1, stage2) tuples representing install targets. """
         targets = []
-        if self.stage2_device.type == "mdarray" and \
-           self.stage2_device.level == 1:
-            # make sure we have stage1 and stage2 installed with redundancy
-            # so that boot can succeed even in the event of failure or removal
-            # of some of the disks containing the member partitions of the
-            # /boot array
-            for stage2dev in self.stage2_device.parents:
-                if self.stage1_device.isDisk:
-                    # install to mbr
-                    if self.stage2_device.dependsOn(self.stage1_device):
-                        # if target disk contains any of /boot array's member
-                        # partitions, set up stage1 on each member's disk
-                        # and stage2 on each member partition
-                        stage1dev = stage2dev.disk
-                    else:
-                        # if target disk does not contain any of /boot array's
-                        # member partitions, install stage1 to the target disk
-                        # and stage2 to each of the member partitions
-                        stage1dev = self.stage1_device
-                else:
-                    # target is /boot device and /boot is raid, so install
-                    # grub to each of /boot member partitions
-                    stage1dev = stage2dev
 
+        # make sure we have stage1 and stage2 installed with redundancy
+        # so that boot can succeed even in the event of failure or removal
+        # of some of the disks containing the member partitions of the
+        # /boot array. If the stage1 is not a disk, it probably needs to
+        # be a partition on a particular disk (biosboot, prepboot), so only
+        # add the redundant targets if installing stage1 to a disk that is
+        # a member of the stage2 array.
+
+        if self.stage2_device.type == "mdarray" and \
+           self.stage2_device.level == raid.RAID1 and \
+           self.stage1_device.isDisk and \
+           self.stage2_device.dependsOn(self.stage1_device):
+            for stage2dev in self.stage2_device.parents:
+                # if target disk contains any of /boot array's member
+                # partitions, set up stage1 on each member's disk
+                # and stage2 on each member partition
+                stage1dev = stage2dev.disk
                 targets.append((stage1dev, stage2dev))
         else:
             targets.append((self.stage1_device, self.stage2_device))
@@ -1277,8 +1288,7 @@ class GRUB(BootLoader):
         return targets
 
     def install(self, args=None):
-        rc = iutil.execWithRedirect("grub-install", ["--just-copy"],
-                                    root=ROOT_PATH)
+        rc = iutil.execInSysroot("grub-install", ["--just-copy"])
         if rc:
             raise BootLoaderError("bootloader install failed")
 
@@ -1294,13 +1304,12 @@ class GRUB(BootLoader):
                       "stage1dev": self.grub_device_name(stage1dev),
                       "stage2dev": self.grub_device_name(stage2dev)})
             (pread, pwrite) = os.pipe()
-            os.write(pwrite, cmd)
-            os.close(pwrite)
+            iutil.eintr_retry_call(os.write, pwrite, cmd)
+            iutil.eintr_retry_call(os.close, pwrite)
             args = ["--batch", "--no-floppy",
                     "--device-map=%s" % self.device_map_file]
-            rc = iutil.execWithRedirect("grub", args,
-                                        stdin=pread, root=ROOT_PATH)
-            os.close(pread)
+            rc = iutil.execInSysroot("grub", args, stdin=pread)
+            iutil.eintr_retry_call(os.close, pread)
             if rc:
                 raise BootLoaderError("bootloader install failed")
 
@@ -1321,6 +1330,32 @@ class GRUB(BootLoader):
         self.warnings = warnings
         return bool(ret)
 
+    # Add a warning about certain RAID situations to is_valid_stage2_device
+    def is_valid_stage2_device(self, device, linux=True, non_linux=False):
+        valid = super(GRUB, self).is_valid_stage2_device(device, linux, non_linux)
+
+        # If the stage2 device is on a raid1, check that the stage1 device is also redundant,
+        # either by also being part of an array or by being a disk (which is expanded
+        # to every disk in the array by install_targets).
+        if self.stage1_device and self.stage2_device and \
+                self.stage2_device.type == "mdarray" and \
+                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. " \
+                        "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.") % \
+                        {"stage1dev" : self.stage1_device.name,
+                         "stage2dev" : self.stage2_device.name}
+                self.warnings.append(msg)
+
+        return valid
+
 class GRUB2(GRUB):
     """ GRUBv2
 
@@ -1346,21 +1381,22 @@ class GRUB2(GRUB):
     packages = ["grub2"]
     _config_file = "grub.cfg"
     _config_dir = "grub2"
-    config_file_mode = 0600
+    config_file_mode = 0o600
     defaults_file = "/etc/default/grub"
     can_dual_boot = True
     can_update = True
     terminal_type = "gfxterm"
 
     # requirements for boot devices
-    stage2_device_types = ["partition", "mdarray"]
-    stage2_raid_levels = [mdraid.RAID0, mdraid.RAID1, mdraid.RAID4,
-                          mdraid.RAID5, mdraid.RAID6, mdraid.RAID10]
+    stage2_device_types = ["partition", "mdarray", "lvmlv", "btrfs volume",
+                           "btrfs subvolume"]
+    stage2_raid_levels = [raid.RAID0, raid.RAID1, raid.RAID4,
+                          raid.RAID5, raid.RAID6, raid.RAID10]
     stage2_raid_metadata = ["0", "0.90", "1.0", "1.2"]
 
     @property
     def stage2_format_types(self):
-        if productName.startswith("Red Hat Enterprise Linux"):
+        if productName.startswith("Red Hat "):
             return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
         else:
             return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
@@ -1410,7 +1446,7 @@ class GRUB2(GRUB):
 
     def write_device_map(self):
         """ Write out a device map containing all supported devices. """
-        map_path = os.path.normpath(ROOT_PATH + self.device_map_file)
+        map_path = os.path.normpath(iutil.getSysroot() + self.device_map_file)
         if os.access(map_path, os.R_OK):
             os.rename(map_path, map_path + ".anacbak")
 
@@ -1435,13 +1471,13 @@ class GRUB2(GRUB):
         dev_map.close()
 
     def write_defaults(self):
-        defaults_file = "%s%s" % (ROOT_PATH, self.defaults_file)
+        defaults_file = "%s%s" % (iutil.getSysroot(), self.defaults_file)
         defaults = open(defaults_file, "w+")
         defaults.write("GRUB_TIMEOUT=%d\n" % self.timeout)
         defaults.write("GRUB_DISTRIBUTOR=\"$(sed 's, release .*$,,g' /etc/system-release)\"\n")
         defaults.write("GRUB_DEFAULT=saved\n")
         defaults.write("GRUB_DISABLE_SUBMENU=true\n")
-        if self.console and self.console.startswith("ttyS"):
+        if self.console and self.has_serial_console:
             defaults.write("GRUB_TERMINAL=\"serial console\"\n")
             defaults.write("GRUB_SERIAL_COMMAND=\"%s\"\n" % self.serial_command)
         else:
@@ -1467,12 +1503,12 @@ class GRUB2(GRUB):
             raise RuntimeError("cannot encrypt empty password")
 
         (pread, pwrite) = os.pipe()
-        os.write(pwrite, "%s\n%s\n" % (self.password, self.password))
-        os.close(pwrite)
+        iutil.eintr_retry_call(os.write, pwrite, "%s\n%s\n" % (self.password, self.password))
+        iutil.eintr_retry_call(os.close, pwrite)
         buf = iutil.execWithCapture("grub2-mkpasswd-pbkdf2", [],
                                     stdin=pread,
-                                    root=ROOT_PATH)
-        os.close(pread)
+                                    root=iutil.getSysroot())
+        iutil.eintr_retry_call(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")
@@ -1481,10 +1517,10 @@ class GRUB2(GRUB):
         if not self.password and not self.encrypted_password:
             return
 
-        users_file = ROOT_PATH + "/etc/grub.d/01_users"
+        users_file = iutil.getSysroot() + "/etc/grub.d/01_users"
         header = open(users_file, "w")
         header.write("#!/bin/sh -e\n\n")
-        header.write("cat << EOF\n")
+        header.write("cat << \"EOF\"\n")
         # XXX FIXME: document somewhere that the username is "root"
         header.write("set superusers=\"root\"\n")
         header.write("export superusers\n")
@@ -1493,7 +1529,7 @@ class GRUB2(GRUB):
         header.write("%s\n" % password_line)
         header.write("EOF\n")
         header.close()
-        os.chmod(users_file, 0700)
+        iutil.eintr_retry_call(os.chmod, users_file, 0o700)
 
     def write_config(self):
         self.write_config_console(None)
@@ -1514,17 +1550,14 @@ class GRUB2(GRUB):
         os.chmod("%s/etc/grub.d/10_linux" % ROOT_PATH, 0644)
 
         # make sure the default entry is the OS we are installing
-        entry_title = "%s, with Xen hypervisor" % (productName)
-        rc = iutil.execWithRedirect("grub2-set-default",
-                                    [entry_title],
-                                    root=ROOT_PATH)
+        entry_title = "0"
+        rc = iutil.execInSysroot("grub2-set-default", [entry_title])
         if rc:
             log.error("failed to set default menu entry to %s", productName)
 
         # now tell grub2 to generate the main configuration file
-        rc = iutil.execWithRedirect("grub2-mkconfig",
-                                    ["-o", self.config_file],
-                                    root=ROOT_PATH)
+        rc = iutil.execInSysroot("grub2-mkconfig",
+                                 ["-o", self.config_file])
         if rc:
             raise BootLoaderError("failed to write bootloader configuration")
 
@@ -1543,9 +1576,15 @@ class GRUB2(GRUB):
                 # This is hopefully a temporary hack. GRUB2 currently refuses
                 # to install to a partition's boot block without --force.
                 grub_args.insert(0, '--force')
+            else:
+                if flags.nombr:
+                    grub_args.insert(0,'--grub-setup=/bin/true')
+                    log.info("bootloader.py: mbr update by grub2 disabled")
+                else:
+                    log.info("bootloader.py: mbr will be updated for grub2")
 
             rc = iutil.execWithRedirect("grub2-install", grub_args,
-                                        root=ROOT_PATH,
+                                        root=iutil.getSysroot(),
                                         env_prune=['MALLOC_PERTURB_'])
             if rc:
                 raise BootLoaderError("bootloader install failed")
@@ -1559,15 +1598,17 @@ class GRUB2(GRUB):
             self.update()
             return
 
-        self.write_device_map()
-        self.stage2_device.format.sync(root=ROOT_PATH)
-        sync()
-        self.install()
-        sync()
-        self.stage2_device.format.sync(root=ROOT_PATH)
-        self.write_config()
-        sync()
-        self.stage2_device.format.sync(root=ROOT_PATH)
+        try:
+            self.write_device_map()
+            self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
+            sync()
+            self.install()
+            sync()
+            self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
+        finally:
+            self.write_config()
+            sync()
+            self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
 
     def check(self):
         """ When installing to the mbr of a disk grub2 needs enough space
@@ -1594,20 +1635,27 @@ class GRUB2(GRUB):
         if not self.stage1_disk:
             return False
 
-        # If the first partition starts too low show an error.
+        # If the first partition starts too low and there is no biosboot partition show an error.
+        error_msg = None
+        biosboot = False
         parts = self.stage1_disk.format.partedDisk.partitions
         for p in parts:
-            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") \
-                        % {"deviceName": self.stage1_device.name, "fsType": self.stage2_device.format.type,
-                           "deviceType": self.stage2_device.type}
-                log.error(msg)
-                self.errors.append(msg)
-                ret = False
+            if p.getFlag(PARTITION_BIOS_GRUB):
+                biosboot = True
                 break
 
+            start = p.geometry.start * p.disk.device.sectorSize
+            if start < min_start:
+                error_msg = _("%(deviceName)s may not have enough space for grub2 to embed "
+                              "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}
+
+        if error_msg and not biosboot:
+            log.error(error_msg)
+            self.errors.append(error_msg)
+            ret = False
+
         return ret
 
 class EFIGRUB(GRUB2):
@@ -1616,6 +1664,8 @@ class EFIGRUB(GRUB2):
     stage2_is_valid_stage1 = False
     stage2_bootable = False
 
+    _efi_binary = "\\shim.efi"
+
     @property
     def _config_dir(self):
         return "efi/EFI/%s" % (self.efi_dir,)
@@ -1625,10 +1675,16 @@ class EFIGRUB(GRUB2):
         self.efi_dir = 'BOOT'
 
     def efibootmgr(self, *args, **kwargs):
+        if flags.imageInstall or flags.dirInstall:
+            log.info("Skipping efibootmgr for image/directory install.")
+            return ""
+
         if kwargs.pop("capture", False):
             exec_func = iutil.execWithCapture
         else:
             exec_func = iutil.execWithRedirect
+        if "root" not in kwargs:
+            kwargs["root"] = iutil.getSysroot()
 
         return exec_func("efibootmgr", list(args), **kwargs)
 
@@ -1654,7 +1710,7 @@ class EFIGRUB(GRUB2):
             if slot == "BootOrder:":
                 bootorder = _product
 
-            if _product == productName:
+            if _product == productName.split("-")[0]:
                 slot_id = slot[4:8]
                 # slot_id is hex, we can't use .isint and use this regex:
                 if not re.match("^[0-9a-fA-F]+$", slot_id):
@@ -1666,34 +1722,33 @@ class EFIGRUB(GRUB2):
                     if rc:
                         raise BootLoaderError("failed to update BootOrder while removing old boot entry")
 
-                rc = self.efibootmgr("-b", slot_id, "-B",
-                                     root=ROOT_PATH)
+                rc = self.efibootmgr("-b", slot_id, "-B")
                 if rc:
-                    raise BootLoaderError("failed to remove old efi boot entry")
+                    raise BootLoaderError("failed to remove old efi boot entry.  This is most likely a kernel bug.")
 
     @property
     def efi_dir_as_efifs_dir(self):
         ret = self._config_dir.replace('efi/', '')
         return "\\" + ret.replace('/', '\\')
 
-    def add_efi_boot_target(self):
-        if self.stage1_device.type == "partition":
-            boot_disk = self.stage1_device.disk
-            boot_part_num = self.stage1_device.partedPartition.number
-        elif self.stage1_device.type == "mdarray":
-            # FIXME: I'm just guessing here. This probably needs the full
-            #        treatment, ie: multiple targets for each member.
-            boot_disk = self.stage1_device.parents[0].disk
-            boot_part_num = self.stage1_device.parents[0].partedPartition.number
-        boot_part_num = str(boot_part_num)
+    def _add_single_efi_boot_target(self, partition):
+        boot_disk = partition.disk
+        boot_part_num = str(partition.partedPartition.number)
 
-        rc = self.efibootmgr("-c", "-w", "-L", productName,
+        rc = self.efibootmgr("-c", "-w", "-L", productName.split("-")[0],
                              "-d", boot_disk.path, "-p", boot_part_num,
                              "-l",
-                             self.efi_dir_as_efifs_dir + "\\shim.efi",
-                             root=ROOT_PATH)
+                             self.efi_dir_as_efifs_dir + self._efi_binary,
+                             root=iutil.getSysroot())
         if rc:
-            raise BootLoaderError("failed to set new efi boot target")
+            raise BootLoaderError("failed to set new efi boot target. This is most likely a kernel bug.")
+
+    def add_efi_boot_target(self):
+        if self.stage1_device.type == "partition":
+            self._add_single_efi_boot_target(self.stage1_device)
+        elif self.stage1_device.type == "mdarray":
+            for parent in self.stage1_device.parents:
+                self._add_single_efi_boot_target(parent)
 
     def install(self, args=None):
         if not flags.leavebootorder:
@@ -1715,10 +1770,12 @@ class EFIGRUB(GRUB2):
             self.update()
             return
 
-        sync()
-        self.stage2_device.format.sync(root=ROOT_PATH)
-        self.write_config()
-        self.install()
+        try:
+            sync()
+            self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
+            self.install()
+        finally:
+            self.write_config()
 
     def check(self):
         return True
@@ -1794,11 +1851,21 @@ class XenEFI(EFIGRUB):
 
     write_config = BootLoader.write_config
 
+
+# FIXME: We need to include grubby, and omit the shim package 
+#        on aarch64 until we get all the EFI bits in place.
+class Aarch64EFIGRUB(EFIGRUB):
+    packages = ["grub2-efi", "efibootmgr", "grubby"]
+
+    _serial_consoles = ["ttyAMA", "ttyS"]
+
+    _efi_binary = "\\grubaa64.efi"
+
+
 class MacEFIGRUB(EFIGRUB):
     def mactel_config(self):
-        if os.path.exists(ROOT_PATH + "/usr/libexec/mactel-boot-setup"):
-            rc = iutil.execWithRedirect("/usr/libexec/mactel-boot-setup", [],
-                                        root=ROOT_PATH)
+        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")
 
@@ -1820,6 +1887,8 @@ class MacEFIGRUB(EFIGRUB):
         return valid
 
 
+# Inherit abstract methods from BootLoader
+# pylint: disable=abstract-method
 class YabootBase(BootLoader):
     def write_config_password(self, config):
         if self.password:
@@ -1873,7 +1942,7 @@ class Yaboot(YabootBase):
 
     # stage2 device requirements
     stage2_device_types = ["partition", "mdarray"]
-    stage2_device_raid_levels = [mdraid.RAID1]
+    stage2_device_raid_levels = [raid.RAID1]
 
     #
     # configuration
@@ -1925,7 +1994,7 @@ class Yaboot(YabootBase):
         super(Yaboot, self).write_config_post()
 
         # make symlink in /etc to yaboot.conf if config is in /boot/etc
-        etc_yaboot_conf = ROOT_PATH + "/etc/yaboot.conf"
+        etc_yaboot_conf = iutil.getSysroot() + "/etc/yaboot.conf"
         if not os.access(etc_yaboot_conf, os.R_OK):
             try:
                 os.symlink("../boot/etc/yaboot.conf", etc_yaboot_conf)
@@ -1933,8 +2002,8 @@ class Yaboot(YabootBase):
                 log.error("failed to create /etc/yaboot.conf symlink: %s", e)
 
     def write_config(self):
-        if not os.path.isdir(ROOT_PATH + self.config_dir):
-            os.mkdir(ROOT_PATH + self.config_dir)
+        if not os.path.isdir(iutil.getSysroot() + self.config_dir):
+            os.mkdir(iutil.getSysroot() + self.config_dir)
 
         # this writes the config
         super(Yaboot, self).write_config()
@@ -1945,8 +2014,7 @@ class Yaboot(YabootBase):
 
     def install(self, args=None):
         args = ["-f", "-C", self.config_file]
-        rc = iutil.execWithRedirect(self.prog, args,
-                                    root=ROOT_PATH)
+        rc = iutil.execInSysroot(self.prog, args)
         if rc:
             raise BootLoaderError("bootloader installation failed")
 
@@ -2071,7 +2139,7 @@ class IPSeriesGRUB2(GRUB2):
     def write_defaults(self):
         super(IPSeriesGRUB2, self).write_defaults()
 
-        defaults_file = "%s%s" % (ROOT_PATH, self.defaults_file)
+        defaults_file = "%s%s" % (iutil.getSysroot(), self.defaults_file)
         defaults = open(defaults_file, "a+")
         # The terminfo's X and Y size, and output location could change in the future
         defaults.write("GRUB_TERMINFO=\"terminfo -g 80x24 console\"\n")
@@ -2103,18 +2171,17 @@ class ZIPL(BootLoader):
     packages = ["s390utils-base"]
 
     # stage2 device requirements
-    stage2_device_types = ["partition", "mdarray", "lvmlv"]
-    stage2_device_raid_levels = [mdraid.RAID1]
+    stage2_device_types = ["partition"]
 
     @property
     def stage2_format_types(self):
-        if productName.startswith("Red Hat Enterprise Linux"):
+        if productName.startswith("Red Hat "):
             return ["xfs", "ext4", "ext3", "ext2"]
         else:
             return ["ext4", "ext3", "ext2", "xfs"]
 
     image_label_attr = "short_label"
-    preserve_args = ["cio_ignore"]
+    preserve_args = ["cio_ignore", "rd.znet", "rd_ZNET"]
 
     def __init__(self):
         super(ZIPL, self).__init__()
@@ -2130,6 +2197,10 @@ class ZIPL(BootLoader):
 
     def write_config_images(self, config):
         for image in self.images:
+            if "kdump" in (image.initrd or image.kernel):
+                # no need to create bootloader entries for kdump
+                continue
+
             args = Arguments()
             if image.initrd:
                 initrd_line = "\tramdisk=%s/%s\n" % (self.boot_dir,
@@ -2138,6 +2209,8 @@ class ZIPL(BootLoader):
                 initrd_line = ""
             args.add("root=%s" % image.device.fstabSpec)
             args.update(self.boot_args)
+            if image.device.type == "btrfs subvolume":
+                args.update(["rootflags=subvol=%s" % image.device.name])
             log.info("bootloader.py: used boot args: %s ", args)
             stanza = ("[%(label)s]\n"
                       "\timage=%(boot_dir)s/%(kernel)s\n"
@@ -2165,7 +2238,7 @@ class ZIPL(BootLoader):
     #
 
     def install(self, args=None):
-        buf = iutil.execWithCapture("zipl", [], root=ROOT_PATH)
+        buf = iutil.execWithCapture("zipl", [], root=iutil.getSysroot())
         for line in buf.splitlines():
             if line.startswith("Preparing boot device: "):
                 # Output here may look like:
@@ -2174,6 +2247,11 @@ class ZIPL(BootLoader):
                 # We want to extract the device name and pass that.
                 name = re.sub(r".+?: ", "", line)
                 self.stage1_name = re.sub(r"(\s\(.+\))?\.$", "", name)
+            # a limitation of s390x is that the kernel parameter list must not
+            # exceed 896 bytes; there is nothing we can do about this, so just
+            # catch the error and show it to the user instead of crashing
+            elif line.startswith("Error: The length of the parameters "):
+                errorHandler.cb(ZIPLError(line))
 
         if not self.stage1_name:
             raise BootLoaderError("could not find IPL device")
@@ -2223,7 +2301,7 @@ class EXTLINUX(BootLoader):
         self.write_config_console(config)
         for image in self.images:
             args = Arguments()
-            args.add("root=%s" % image.device.fstabSpec)
+            args.update(["root=%s" % image.device.fstabSpec, "ro"])
             if image.device.type == "btrfs subvolume":
                 args.update(["rootflags=subvol=%s" % image.device.name])
             args.update(self.boot_args)
@@ -2248,10 +2326,10 @@ class EXTLINUX(BootLoader):
                   "menu hidden\n\n"
                   "timeout %(timeout)d\n"
                   "#totaltimeout 9000\n\n"
-                  "default %(default)s\n\n"
-                  % { "productName": productName, "timeout": self.timeout *10,
-                     "default": self.image_label(self.default)})
+                  % { "productName": productName, "timeout": self.timeout *10 })
         config.write(header)
+        if self.default is not None:
+            config.write("default %(default)s\n\n" % { "default" : self.image_label(self.default) })
         self.write_config_password(config)
 
     def write_config_password(self, config):
@@ -2260,7 +2338,7 @@ class EXTLINUX(BootLoader):
             config.write("menu notabmsg Press [Tab] and enter the password to edit options")
 
     def write_config_post(self):
-        etc_extlinux = os.path.normpath(ROOT_PATH + "/etc/" + self._config_file)
+        etc_extlinux = os.path.normpath(iutil.getSysroot() + "/etc/" + self._config_file)
         if not os.access(etc_extlinux, os.R_OK):
             try:
                 os.symlink("../boot/%s" % self._config_file, etc_extlinux)
@@ -2276,8 +2354,7 @@ class EXTLINUX(BootLoader):
 
     def install(self, args=None):
         args = ["--install", self._config_dir]
-        rc = iutil.execWithRedirect("extlinux", args,
-                                    root=ROOT_PATH)
+        rc = iutil.execInSysroot("extlinux", args)
 
         if rc:
             raise BootLoaderError("bootloader install failed")
@@ -2291,6 +2368,7 @@ bootloader_by_platform = {platform.X86: GRUB2,
                           platform.IPSeriesPPC: IPSeriesGRUB2,
                           platform.NewWorldPPC: MacYaboot,
                           platform.S390: ZIPL,
+                          platform.Aarch64EFI: Aarch64EFIGRUB,
                           platform.ARM: EXTLINUX,
                           platform.omapARM: EXTLINUX}
 
@@ -2306,13 +2384,13 @@ def get_bootloader():
 
 # anaconda-specific functions
 
-def writeSysconfigKernel(storage, version):
+def writeSysconfigKernel(storage, version, instClass):
     # get the name of the default kernel package based on the version
     kernel_basename = "vmlinuz-" + version
     kernel_file = "/boot/%s" % kernel_basename
-    if not os.path.isfile(ROOT_PATH + kernel_file):
-        kernel_file = "/boot/efi/EFI/qubes/%s" % kernel_basename
-        if not os.path.isfile(ROOT_PATH + kernel_file):
+    if not os.path.isfile(iutil.getSysroot() + kernel_file):
+        kernel_file = "/boot/efi/EFI/%s/%s" % (instClass.efi_dir, kernel_basename)
+        if not os.path.isfile(iutil.getSysroot() + kernel_file):
             log.error("failed to recreate path to default kernel image")
             return
 
@@ -2322,17 +2400,17 @@ def writeSysconfigKernel(storage, version):
         log.error("failed to import rpm python module")
         return
 
-    ts = rpm.TransactionSet(ROOT_PATH)
+    ts = rpm.TransactionSet(iutil.getSysroot())
     mi = ts.dbMatch('basenames', kernel_file)
     try:
-        h = mi.next()
+        h = next(mi)
     except StopIteration:
         log.error("failed to get package name for default kernel")
         return
 
     kernel = h.name
 
-    f = open(ROOT_PATH + "/etc/sysconfig/kernel", "w+")
+    f = open(iutil.getSysroot() + "/etc/sysconfig/kernel", "w+")
     f.write("# UPDATEDEFAULT specifies if new-kernel-pkg should make\n"
             "# new kernels the default\n")
     # only update the default if we're setting the default to linux (#156678)
@@ -2349,6 +2427,20 @@ def writeSysconfigKernel(storage, version):
         f.write("HYPERVISOR_ARGS=logging=vga,serial,memory\n")
     f.close()
 
+def writeBootLoaderFinal(storage, payload, instClass, ksdata):
+    """ Do the final write of the bootloader. """
+
+    # set up dracut/fips boot args
+    # XXX FIXME: do this from elsewhere?
+    storage.bootloader.set_boot_args(storage=storage,
+                                     payload=payload)
+    try:
+        storage.bootloader.write()
+    except BootLoaderError as e:
+        log.error("bootloader.write failed: %s", e)
+        if errorHandler.cb(e) == ERROR_RAISE:
+            raise
+
 def writeBootLoader(storage, payload, instClass, ksdata):
     """ Write bootloader configuration to disk.
 
@@ -2356,16 +2448,21 @@ def writeBootLoader(storage, payload, instClass, ksdata):
         image. We only have to add images for the non-default kernels and
         adjust the default to reflect whatever the default variant is.
     """
-    from pyanaconda.errors import errorHandler, ERROR_RAISE
-
     if not storage.bootloader.skip_bootloader:
         stage1_device = storage.bootloader.stage1_device
         log.info("bootloader 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)
 
+    if isinstance(payload, RPMOSTreePayload):
+        if storage.bootloader.skip_bootloader:
+            log.info("skipping bootloader install per user request")
+            return
+        writeBootLoaderFinal(storage, payload, instClass, ksdata)
+        return
+
     # get a list of installed kernel packages
-    kernel_versions = payload.kernelVersionList
+    kernel_versions = payload.kernelVersionList + payload.rescueKernelList
     if not kernel_versions:
         log.warning("no kernel was installed -- bootloader config unchanged")
         return
@@ -2387,7 +2484,7 @@ def writeBootLoader(storage, payload, instClass, ksdata):
         storage.bootloader.efi_dir = instClass.efi_dir
 
     # write out /etc/sysconfig/kernel
-    writeSysconfigKernel(storage, version)
+    writeSysconfigKernel(storage, version, instClass)
 
     if storage.bootloader.skip_bootloader:
         log.info("skipping bootloader install per user request")
@@ -2408,19 +2505,4 @@ def writeBootLoader(storage, payload, instClass, ksdata):
                                          label=label, short=short)
         storage.bootloader.add_image(image)
 
-    # set up dracut/fips boot args
-    # XXX FIXME: do this from elsewhere?
-    #storage.bootloader.set_boot_args(keyboard=anaconda.keyboard,
-    #                                 storage=anaconda.storage,
-    #                                 language=anaconda.instLanguage,
-    #                                 network=anaconda.network)
-    storage.bootloader.set_boot_args(storage=storage,
-                                     payload=payload,
-                                     keyboard=ksdata.keyboard)
-
-    try:
-        storage.bootloader.write()
-    except BootLoaderError as e:
-        if errorHandler.cb(e) == ERROR_RAISE:
-            raise
-
+    writeBootLoaderFinal(storage, payload, instClass, ksdata)
diff --git a/anaconda/pyanaconda/constants.py b/anaconda/pyanaconda/constants.py
index 7af5014..8128537 100644
--- a/anaconda/pyanaconda/constants.py
+++ b/anaconda/pyanaconda/constants.py
@@ -19,16 +19,16 @@
 # Author(s): Erik Troan <ewt@redhat.com>
 #
 
+import string
 from pyanaconda.i18n import N_
 
-SELINUX_DEFAULT = 1
+# Use -1 to indicate that the selinux configuration is unset
+SELINUX_DEFAULT = -1
 
 # where to look for 3rd party addons
 ADDON_PATHS = ["/usr/share/anaconda/addons"]
 
-# pull in kickstart constants as well
-# pylint: disable-msg=W0401
-from pykickstart.constants import *
+from pykickstart.constants import AUTOPART_TYPE_LVM
 
 # common string needs to be easy to change
 from pyanaconda import product
@@ -51,7 +51,6 @@ DD_RPMS = "/tmp/DD-*"
 TRANSLATIONS_UPDATE_DIR="/tmp/updates/po"
 
 ANACONDA_CLEANUP = "anaconda-cleanup"
-ROOT_PATH = "/mnt/sysimage"
 MOUNT_DIR = "/mnt/install"
 DRACUT_REPODIR = "/run/install/repo"
 DRACUT_ISODIR = "/run/install/source"
@@ -91,7 +90,7 @@ THREAD_CHECK_STORAGE = "AnaCheckStorageThread"
 THREAD_CUSTOM_STORAGE_INIT = "AnaCustomStorageInit"
 THREAD_WAIT_FOR_CONNECTING_NM = "AnaWaitForConnectingNMThread"
 THREAD_PAYLOAD = "AnaPayloadThread"
-THREAD_PAYLOAD_MD = "AnaPayloadMDThread"
+THREAD_PAYLOAD_RESTART = "AnaPayloadRestartThread"
 THREAD_INPUT_BASENAME = "AnaInputThread"
 THREAD_SYNC_TIME_BASENAME = "AnaSyncTime"
 THREAD_EXCEPTION_HANDLING_TEST = "AnaExceptionHandlingTest"
@@ -107,7 +106,9 @@ THREAD_ISCSI_LOGIN = "AnaIscsiLoginThread"
 THREAD_GEOLOCATION_REFRESH = "AnaGeolocationRefreshThread"
 THREAD_DATE_TIME = "AnaDateTimeThread"
 THREAD_TIME_INIT = "AnaTimeInitThread"
-THREAD_XKL_WRAPPER_INIT = "AnaXklWrapperInitThread"
+THREAD_DASDFMT = "AnaDasdfmtThread"
+THREAD_KEYBOARD_INIT = "AnaKeyboardThread"
+THREAD_ADD_LAYOUTS_INIT = "AnaAddLayoutsInitThread"
 
 # Geolocation constants
 
@@ -140,5 +141,27 @@ PASSWORD_WEAK = N_("The password you have provided is weak. You will have to pre
 PASSWORD_WEAK_WITH_ERROR = N_("The password you have provided is weak: %s. You will have to press Done twice to confirm it.")
 PASSWORD_WEAK_CONFIRM = N_("You have provided a weak password. Press Done again to use anyway.")
 PASSWORD_WEAK_CONFIRM_WITH_ERROR = N_("You have provided a weak password: %s. Press Done again to use anyway.")
+PASSWORD_ASCII = N_("The password you have provided contains non-ASCII characters. You may not be able to switch between keyboard layouts to login. Press Done to continue.")
 
 PASSWORD_STRENGTH_DESC = [N_("Empty"), N_("Weak"), N_("Fair"), N_("Good"), N_("Strong")]
+
+# the number of seconds we consider a noticeable freeze of the UI
+NOTICEABLE_FREEZE = 0.1
+
+# all ASCII characters
+PW_ASCII_CHARS = string.digits + string.ascii_letters + string.punctuation + " "
+
+# Recognizing a tarfile
+TAR_SUFFIX = (".tar", ".tbz", ".tgz", ".txz", ".tar.bz2", "tar.gz", "tar.xz")
+
+# cmdline arguments that append instead of overwrite
+CMDLINE_APPEND = ["modprobe.blacklist"]
+
+DEFAULT_AUTOPART_TYPE = AUTOPART_TYPE_LVM
+
+import logging
+LOGLVL_LOCK = logging.DEBUG-1
+
+# for how long (in seconds) we try to wait for enough entropy for LUKS
+# keep this a multiple of 60 (minutes)
+MAX_ENTROPY_WAIT = 10 * 60
\ No newline at end of file
diff --git a/anaconda/pyanaconda/constants_text.py b/anaconda/pyanaconda/constants_text.py
index 08a8046..750a984 100644
--- a/anaconda/pyanaconda/constants_text.py
+++ b/anaconda/pyanaconda/constants_text.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# pylint: disable-msg=W0401
+# pylint: disable=wildcard-import
 from pyanaconda.constants import *
 from pyanaconda.i18n import _, N_
 
diff --git a/anaconda/pyanaconda/desktop.py b/anaconda/pyanaconda/desktop.py
index 3976485..7428a71 100644
--- a/anaconda/pyanaconda/desktop.py
+++ b/anaconda/pyanaconda/desktop.py
@@ -21,7 +21,8 @@
 #
 
 import os
-from pyanaconda.constants import ROOT_PATH, RUNLEVELS
+from pyanaconda.constants import RUNLEVELS
+from pyanaconda import iutil
 
 import logging
 log = logging.getLogger("anaconda")
@@ -44,14 +45,14 @@ class Desktop(object):
 
     def write(self):
         if self.desktop:
-            with open(ROOT_PATH + "/etc/sysconfig/desktop", "w") as f:
+            with open(iutil.getSysroot() + "/etc/sysconfig/desktop", "w") as f:
                 f.write("DESKTOP=%s\n" % self.desktop)
 
-        if not os.path.isdir(ROOT_PATH + '/etc/systemd/system'):
+        if not os.path.isdir(iutil.getSysroot() + '/etc/systemd/system'):
             log.warning("there is no /etc/systemd/system directory, cannot update default.target!")
             return
 
-        default_target = ROOT_PATH + '/etc/systemd/system/default.target'
+        default_target = iutil.getSysroot() + '/etc/systemd/system/default.target'
         if os.path.islink(default_target):
             os.unlink(default_target)
         os.symlink('/lib/systemd/system/%s' % RUNLEVELS[self.runlevel],
diff --git a/anaconda/pyanaconda/errors.py b/anaconda/pyanaconda/errors.py
index cea7141..02704f9 100644
--- a/anaconda/pyanaconda/errors.py
+++ b/anaconda/pyanaconda/errors.py
@@ -21,29 +21,43 @@
 from pyanaconda.i18n import _
 
 __all__ = ["ERROR_RAISE", "ERROR_CONTINUE", "ERROR_RETRY",
-           "ErrorHandler",
            "InvalidImageSizeError", "MissingImageError", "MediaUnmountError",
-           "MediaMountError", "ScriptError",
+           "MediaMountError", "ScriptError", "CmdlineError",
            "errorHandler"]
 
 class InvalidImageSizeError(Exception):
-    pass
+    def __init__(self, message, filename):
+        Exception.__init__(self, message)
+        self.filename = filename
 
 class MissingImageError(Exception):
     pass
 
 class MediaMountError(Exception):
-    pass
+    def __init__(self, device):
+        Exception.__init__(self)
+        self.device = device
 
 class MediaUnmountError(Exception):
-    pass
+    def __init__(self, device):
+        Exception.__init__(self)
+        self.device = device
 
 class ScriptError(Exception):
+    def __init__(self, lineno, details):
+        Exception.__init__(self)
+        self.lineno = lineno
+        self.details = details
+
+class CmdlineError(Exception):
     pass
 
 class RemovedModuleError(ImportError):
     pass
 
+class ZIPLError(Exception):
+    pass
+
 # These constants are returned by the callback in the ErrorHandler class.
 # Each represents a different kind of action the caller can take:
 #
@@ -86,54 +100,46 @@ class ErrorHandler(object):
     def __init__(self, ui=None):
         self.ui = ui
 
-    def _kickstartErrorHandler(self, *args, **kwargs):
-        message = _("The following error was found while parsing the kickstart "
-                    "configuration file:\n\n%s") % args[0]
-        self.ui.showError(message)
-        return ERROR_RAISE
-
-    def _partitionErrorHandler(self, *args, **kwargs):
+    def _partitionErrorHandler(self, exn):
         message = _("The following errors occurred with your partitioning:\n\n%(errortxt)s\n\n"
-                    "The installation will now terminate.") % {"errortxt": str(kwargs["exception"])}
+                    "The installation will now terminate.") % {"errortxt": exn}
         self.ui.showError(message)
         return ERROR_RAISE
 
-    def _fsResizeHandler(self, *args, **kwargs):
-        message = _("An error occurred while resizing the device %s.") % args[0]
+    def _fsResizeHandler(self, exn):
+        message = _("An error occurred while resizing the device %s.") % exn
 
-        if "details" in kwargs:
-            message += "\n\n%s" % kwargs["details"]
+        if exn.details:
+            message += "\n\n%s" % exn.details
 
         self.ui.showError(message)
         return ERROR_RAISE
 
-    def _noDisksHandler(self, *args, **kwargs):
+    def _noDisksHandler(self, exn):
         message = _("An error has occurred - no valid devices were found on "
                     "which to create new file systems.  Please check your "
                     "hardware for the cause of this problem.")
         self.ui.showError(message)
         return ERROR_RAISE
 
-    def _dirtyFSHandler(self, *args, **kwargs):
-        devs = kwargs.pop("devices")
+    def _dirtyFSHandler(self, exn):
         message = _("The following file systems for your Linux system were "
                     "not unmounted cleanly.  Would you like to mount them "
-                    "anyway?\n%s") % "\n".join(devs)
+                    "anyway?\n%s") % exn.devices
         if self.ui.showYesNoQuestion(message):
             return ERROR_CONTINUE
         else:
             return ERROR_RAISE
 
-    def _fstabTypeMismatchHandler(self, *args, **kwargs):
+    def _fstabTypeMismatchHandler(self, exn):
         # 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")
-        message += " " + str(kwargs["exception"])
+        message += " " + str(exn)
         self.ui.showError(message)
 
-    def _invalidImageSizeHandler(self, *args, **kwargs):
-        filename = args[0]
+    def _invalidImageSizeHandler(self, exn):
         message = _("The ISO image %s has a size which is not "
                     "a multiple of 2048 bytes.  This may mean "
                     "it was corrupted on transfer to this computer."
@@ -141,13 +147,13 @@ class ErrorHandler(object):
                     "It is recommended that you exit and abort your "
                     "installation, but you can choose to continue if "
                     "you think this is in error. Would you like to "
-                    "continue using this image?") % filename
+                    "continue using this image?") % exn.filename
         if self.ui.showYesNoQuestion(message):
             return ERROR_CONTINUE
         else:
             return ERROR_RAISE
 
-    def _missingImageHandler(self, *args, **kwargs):
+    def _missingImageHandler(self, exn):
         message = _("The installer has tried to mount the "
                     "installation image, but cannot find it on "
                     "the hard drive.\n\n"
@@ -157,78 +163,109 @@ class ErrorHandler(object):
         else:
             return ERROR_RAISE
 
-    def _mediaMountHandler(self, *args, **kwargs):
-        device = args[0]
+    def _mediaMountHandler(self, exn):
         message = _("An error occurred mounting the source "
-                    "device %s. Retry?") % device.name
+                    "device %s. Retry?") % exn.device.name
         if self.ui.showYesNoQuestion(message):
             return ERROR_RETRY
         else:
             return ERROR_RAISE
 
-    def _mediaUnmountHandler(self, *args, **kwargs):
-        device = args[0]
+    def _mediaUnmountHandler(self, exn):
         message = _("An error occurred unmounting the disc.  "
                     "Please make sure you're not accessing "
                     "%s from the shell on tty2 "
-                    "and then click OK to retry.") % device.path
+                    "and then click OK to retry.") % exn.device.path
         self.ui.showError(message)
 
-    def _noSuchGroupHandler(self, *args, **kwargs):
-        group = args[0]
-        message = _("You have specified that the group '%s' should be "
-                    "installed.  This group does not exist.  Would you like "
-                    "to skip this group and continue with "
-                    "installation?") % group
+    def _noSuchGroupHandler(self, exn):
+        if exn.required:
+            message = _("The group '%s' is required for this installation. "
+                        "This group does not exist. This is a fatal error and "
+                        "installation will be aborted.") % exn.group
+            self.ui.showError(message)
+            return ERROR_RAISE
+        elif exn.adding:
+            message = _("You have specified that the group '%s' should be "
+                        "installed.  This group does not exist.  Would you like "
+                        "to ignore this group and continue with "
+                        "installation?") % exn.group
+        else:
+            message = _("You have specified that the group '%s' should be "
+                        "excluded from installation.  This group does not exist.  "
+                        "Would you like to ignore this group and continue with "
+                        "installation?") % exn.group
+
         if self.ui.showYesNoQuestion(message):
             return ERROR_CONTINUE
         else:
             return ERROR_RAISE
 
-    def _noSuchPackageHandler(self, *args, **kwargs):
-        package = args[0]
-        message = _("You have specified that the package '%s' should be "
-                    "installed.  This package does not exist.  Would you "
-                    "like to skip this package and continue with "
-                    "installation?") % package
-        if self.ui.showYesNoQuestion(message):
-            return ERROR_CONTINUE
-        else:
+    def _noSuchPackageHandler(self, exn):
+        if exn.required:
+            message = _("The package '%s' is required for this installation. "
+                        "This package does not exist. This is a fatal error and "
+                        "installation will be aborted.") % exn.package
+            self.ui.showError(message)
             return ERROR_RAISE
 
-    def _scriptErrorHandler(self, *args, **kwargs):
-        lineno = args[0]
-        details = args[1]
+        else:
+            message = _("You have specified that the package '%s' should be "
+                        "installed.  This package does not exist.  Would you "
+                        "like to ignore this package and continue with "
+                        "installation?") % exn.package
+
+            if self.ui.showYesNoQuestion(message):
+                return ERROR_CONTINUE
+            else:
+                return ERROR_RAISE
+
+    def _scriptErrorHandler(self, exn):
         message = _("There was an error running the kickstart script at line "
-                    "%s.  This is a fatal error and installation will be "
-                    "aborted.  The details of this error are:\n\n%s") % \
-                   (lineno, details)
+                    "%(lineno)s.  This is a fatal error and installation will be "
+                    "aborted.  The details of this error are:\n\n%(details)s") % \
+                   {"lineno": exn.lineno, "details" : exn.details}
         self.ui.showError(message)
         return ERROR_RAISE
 
-    def _payloadInstallHandler(self, *args, **kwargs):
-        package = kwargs.pop("package", None)
-        if package:
-            message = _("There was an error installing the %s package.  This is "
-                        "a fatal error and installation will be aborted.") % \
-                       package
-        else:
-            message = _("The following error occurred while installing.  This is "
-                        "a fatal error and installation will be aborted.")
-        message += "\n\n" + str(kwargs["exception"])
+    def _payloadInstallHandler(self, exn):
+        message = _("The following error occurred while installing.  This is "
+                    "a fatal error and installation will be aborted.")
+        message += "\n\n" + str(exn)
 
         self.ui.showError(message)
         return ERROR_RAISE
 
-    def _dependencyErrorHandler(self, *args, **kwargs):
+    def _dependencyErrorHandler(self, exn):
         message = _("The following software marked for installation has errors.  "
                     "This is likely caused by an error with\nyour installation source.")
-        details = "\n".join(sorted(kwargs["exception"].message))
+        details = "\n".join(sorted(exn.message))
 
         self.ui.showDetailedError(message, details)
         return ERROR_RAISE
 
-    def cb(self, exn, *args, **kwargs):
+    def _bootLoaderErrorHandler(self, exn):
+        message = _("The following error occurred while installing the bootloader. "
+                    "The system will not be bootable. "
+                    "Would you like to ignore this and continue with "
+                    "installation?")
+        message += "\n\n" + str(exn)
+
+        if self.ui.showYesNoQuestion(message):
+            return ERROR_CONTINUE
+        else:
+            return ERROR_RAISE
+
+    def _ziplErrorHandler(self, *args, **kwargs):
+        details = kwargs["exception"]
+        message = _("Installation was stopped due to an error installing the "
+                    "boot loader. The exact error message is:\n\n%s\n\n"
+                    "The installer will now terminate.") % details
+
+        self.ui.showError(message)
+        return ERROR_RAISE
+
+    def cb(self, exn):
         """This method is the callback that all error handling should pass
            through.  The return value is one of the ERROR_* constants defined
            in this module, though the exact constant returned depends on the
@@ -237,17 +274,13 @@ class ErrorHandler(object):
            Arguments:
 
            exn      -- An instance of some Exception.
-           args     -- A tuple of positional arguments, unused in this code.
-           kwargs   -- A dict of keyword arguments.  The arguments expected
-                       depends on the exception being handled.
         """
         rc = ERROR_RAISE
 
         if not self.ui:
             raise
 
-        _map = {"KickstartError": self._kickstartErrorHandler,
-                "PartitioningError": self._partitionErrorHandler,
+        _map = {"PartitioningError": self._partitionErrorHandler,
                 "FSResizeError": self._fsResizeHandler,
                 "NoDisksError": self._noDisksHandler,
                 "DirtyFSError": self._dirtyFSHandler,
@@ -260,11 +293,12 @@ class ErrorHandler(object):
                 "NoSuchPackage": self._noSuchPackageHandler,
                 "ScriptError": self._scriptErrorHandler,
                 "PayloadInstallError": self._payloadInstallHandler,
-                "DependencyError": self._dependencyErrorHandler}
+                "DependencyError": self._dependencyErrorHandler,
+                "BootLoaderError": self._bootLoaderErrorHandler,
+                "ZIPLError": self._ziplErrorHandler}
 
         if exn.__class__.__name__ in _map:
-            kwargs["exception"] = exn
-            rc = _map[exn.__class__.__name__](*args, **kwargs)
+            rc = _map[exn.__class__.__name__](exn)
 
         return rc
 
diff --git a/anaconda/pyanaconda/exception.py b/anaconda/pyanaconda/exception.py
index e61cce0..b18c6cc 100644
--- a/anaconda/pyanaconda/exception.py
+++ b/anaconda/pyanaconda/exception.py
@@ -24,7 +24,7 @@
 from meh import Config
 from meh.handler import ExceptionHandler
 from meh.dump import ReverseExceptionDump
-from pyanaconda import isys, iutil, kickstart
+from pyanaconda import iutil, kickstart
 import sys
 import os
 import shutil
@@ -32,12 +32,16 @@ import signal
 import time
 import re
 import errno
+import glob
+import traceback
 import blivet.errors
+from pyanaconda.errors import CmdlineError
 from pyanaconda.ui.communication import hubQ
-from pyanaconda.constants import ROOT_PATH, THREAD_EXCEPTION_HANDLING_TEST
+from pyanaconda.constants import THREAD_EXCEPTION_HANDLING_TEST
 from pyanaconda.threads import threadMgr
 from pyanaconda.i18n import _
 from pyanaconda import flags
+from pyanaconda import startup_utils
 
 from gi.repository import GLib
 
@@ -46,7 +50,7 @@ log = logging.getLogger("anaconda")
 
 class AnacondaExceptionHandler(ExceptionHandler):
 
-    def __init__(self, confObj, intfClass, exnClass, tty_num):
+    def __init__(self, confObj, intfClass, exnClass, tty_num, gui_lock):
         """
         :see: python-meh's ExceptionHandler
         :param tty_num: the number of tty the interface is running on
@@ -54,6 +58,7 @@ class AnacondaExceptionHandler(ExceptionHandler):
         """
 
         ExceptionHandler.__init__(self, confObj, intfClass, exnClass)
+        self._gui_lock = gui_lock
         self._intf_tty_num = tty_num
 
     def run_handleException(self, dump_info):
@@ -79,6 +84,8 @@ class AnacondaExceptionHandler(ExceptionHandler):
         """
 
         log.debug("running handleException")
+        exception_lines = traceback.format_exception(*dump_info.exc_info)
+        log.critical("\n".join(exception_lines))
 
         ty = dump_info.exc_info.type
         value = dump_info.exc_info.value
@@ -104,9 +111,10 @@ class AnacondaExceptionHandler(ExceptionHandler):
                 if not initialized:
                     raise RuntimeError()
 
-                if Gtk.main_level() > 0:
-                    # main loop is running, don't crash it by running another one
-                    # potentially from a different thread
+                # Attempt to grab the GUI initializing lock, do not block
+                if not self._gui_lock.acquire(False):
+                    # the graphical interface is running, don't crash it by
+                    # running another one potentially from a different thread
                     log.debug("Gtk running, queuing exception handler to the "
                              "main loop")
                     GLib.idle_add(self.run_handleException, dump_info)
@@ -116,16 +124,34 @@ class AnacondaExceptionHandler(ExceptionHandler):
                     super(AnacondaExceptionHandler, self).handleException(
                                                             dump_info)
 
-            except RuntimeError:
+            except (RuntimeError, ImportError):
                 log.debug("Gtk cannot be initialized")
                 # X not running (Gtk cannot be initialized)
                 if threadMgr.in_main_thread():
                     log.debug("In the main thread, running exception handler")
-                    print "An unknown error has occured, look at the "\
-                        "/tmp/anaconda-tb* file(s) for more details"
-                    # in the main thread, run exception handler
-                    super(AnacondaExceptionHandler, self).handleException(
-                                                            dump_info)
+                    if (issubclass (ty, CmdlineError)):
+
+                        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, "
+                                              "edit your kickstart file and retry "
+                                              "installation.\nThe exact error message is: "
+                                              "\n\n%s.\n\nThe installer will now terminate.") % str(value)
+
+                        # since there is no UI in cmdline mode and it is completely
+                        # non-interactive, we can't show a message window asking the user
+                        # to acknowledge the error; instead, print the error out and sleep
+                        # for a few seconds before exiting the installer
+                        print(cmdline_error_msg)
+                        time.sleep(10)
+                        sys.exit(0)
+                    else:
+                        print("\nAn unknown error has occured, look at the "
+                               "/tmp/anaconda-tb* file(s) for more details")
+                        # in the main thread, run exception handler
+                        super(AnacondaExceptionHandler, self).handleException(
+                                                                dump_info)
                 else:
                     log.debug("In a non-main thread, sending a message with "
                              "exception data")
@@ -140,18 +166,18 @@ class AnacondaExceptionHandler(ExceptionHandler):
     def postWriteHook(self, dump_info):
         anaconda = dump_info.object
 
-        # See if /mnt/sysimage is present and put exception there as well
-        if os.access("/mnt/sysimage/root", os.X_OK):
+        # See if there is a /root present in the root path and put exception there as well
+        if os.access(iutil.getSysroot() + "/root", os.X_OK):
             try:
-                dest = "/mnt/sysimage/root/%s" % os.path.basename(self.exnFile)
+                dest = iutil.getSysroot() + "/root/%s" % os.path.basename(self.exnFile)
                 shutil.copyfile(self.exnFile, dest)
             except (shutil.Error, IOError):
-                log.error("Failed to copy %s to /mnt/sysimage/root", self.exnFile)
+                log.error("Failed to copy %s to %s/root", self.exnFile, iutil.getSysroot())
 
         # run kickstart traceback scripts (if necessary)
         try:
             kickstart.runTracebackScripts(anaconda.ksdata.scripts)
-        # pylint: disable-msg=W0702
+        # pylint: disable=bare-except
         except:
             pass
 
@@ -168,12 +194,12 @@ class AnacondaExceptionHandler(ExceptionHandler):
                     os.kill(int(pid), signal.SIGKILL)
             pf.close()
 
-        os.open("/dev/console", os.O_RDWR)   # reclaim stdin
-        os.dup2(0, 1)                        # reclaim stdout
-        os.dup2(0, 2)                        # reclaim stderr
-        #   ^
-        #   |
-        #   +------ dup2 is magic, I tells ya!
+        iutil.eintr_retry_call(os.open, "/dev/console", os.O_RDWR)   # reclaim stdin
+        iutil.eintr_retry_call(os.dup2, 0, 1)                        # reclaim stdout
+        iutil.eintr_retry_call(os.dup2, 0, 2)                        # reclaim stderr
+        #                          ^
+        #                          |
+        #                          +------ dup2 is magic, I tells ya!
 
         # bring back the echo
         import termios
@@ -195,7 +221,8 @@ class AnacondaExceptionHandler(ExceptionHandler):
 def initExceptionHandling(anaconda):
     fileList = [ "/tmp/anaconda.log", "/tmp/packaging.log",
                  "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",
-                 "/tmp/yum.log", ROOT_PATH + "/root/install.log",
+                 "/tmp/dnf.log", "/tmp/dnf.rpm.log",
+                 "/tmp/yum.log", iutil.getSysroot() + "/root/install.log",
                  "/proc/cmdline" ]
 
     if os.path.exists("/tmp/syslog"):
@@ -205,11 +232,13 @@ def initExceptionHandling(anaconda):
         fileList.extend([anaconda.opts.ksfile])
 
     conf = Config(programName="anaconda",
-                  programVersion=isys.getAnacondaVersion(),
+                  programVersion=startup_utils.get_anaconda_version_string(),
                   programArch=os.uname()[4],
                   attrSkipList=["_intf._actions",
                                 "_intf._currentAction._xklwrapper",
                                 "_intf._currentAction._spokes[\"KeyboardSpoke\"]._xkl_wrapper",
+                                "_intf._currentAction._storage_playground",
+                                "_intf._currentAction._spokes[\"CustomPartitioningSpoke\"]._storage_playground",
                                 "_intf._currentAction.language.translations",
                                 "_intf._currentAction.language.locales",
                                 "_intf._currentAction._spokes[\"PasswordSpoke\"]._oldweak",
@@ -230,6 +259,7 @@ def initExceptionHandling(anaconda):
     conf.register_callback("nmcli_dev_list", nmcli_dev_list_callback,
                            attchmnt_only=True)
     conf.register_callback("type", lambda: "anaconda", attchmnt_only=True)
+    conf.register_callback("addons", list_addons_callback, attchmnt_only=False)
 
     if "/tmp/syslog" not in fileList:
         # no syslog, grab output from journalctl and put it also to the
@@ -237,7 +267,8 @@ def initExceptionHandling(anaconda):
         conf.register_callback("journalctl", journalctl_callback, attchmnt_only=False)
 
     handler = AnacondaExceptionHandler(conf, anaconda.intf.meh_interface,
-                                       ReverseExceptionDump, anaconda.intf.tty_num)
+                                       ReverseExceptionDump, anaconda.intf.tty_num,
+                                       anaconda.gui_initialized)
     handler.install(anaconda)
 
     return conf
@@ -266,6 +297,17 @@ def journalctl_callback():
 
     return ret
 
+def list_addons_callback():
+    """
+    Callback to get info about the addons potentially affecting Anaconda's
+    behaviour.
+
+    """
+
+    # list available addons and take their package names
+    addon_pkgs = glob.glob("/usr/share/anaconda/addons/*")
+    return ", ".join(addon.rsplit("/", 1)[1] for addon in addon_pkgs)
+
 def test_exception_handling():
     """
     Function that can be used for testing exception handling in anaconda. It
diff --git a/anaconda/pyanaconda/flags.py b/anaconda/pyanaconda/flags.py
index 7489c0f..55b4944 100644
--- a/anaconda/pyanaconda/flags.py
+++ b/anaconda/pyanaconda/flags.py
@@ -20,7 +20,7 @@
 import selinux
 import shlex
 import glob
-from pyanaconda.constants import SELINUX_DEFAULT
+from pyanaconda.constants import SELINUX_DEFAULT, CMDLINE_APPEND
 from collections import OrderedDict
 
 import logging
@@ -29,7 +29,7 @@ log = logging.getLogger("anaconda")
 # A lot of effort, but it only allows a limited set of flags to be referenced
 class Flags(object):
     def __setattr__(self, attr, val):
-        # pylint: disable-msg=E1101
+        # pylint: disable=no-member
         if attr not in self.__dict__ and not self._in_init:
             raise AttributeError(attr)
         else:
@@ -44,19 +44,14 @@ class Flags(object):
 
     def __init__(self, read_cmdline=True):
         self.__dict__['_in_init'] = True
-        self.livecdInstall = 0
-        self.dlabel = 0
-        self.ibft = 1
-        self.iscsi = 0
-        self.usevnc = 0
+        self.livecdInstall = False
+        self.ibft = True
+        self.usevnc = False
         self.vncquestion = True
-        self.mpath = 1
-        self.dmraid = 1
+        self.mpath = True
+        self.dmraid = True
         self.selinux = SELINUX_DEFAULT
-        self.debug = 0
-        self.targetarch = None
-        self.useIPv4 = True
-        self.useIPv6 = True
+        self.debug = False
         self.armPlatform = None
         self.preexisting_x11 = False
         self.noverifyssl = False
@@ -66,12 +61,15 @@ class Flags(object):
         self.askmethod = False
         self.eject = True
         self.extlinux = False
+        self.nombr = False
         self.gpt = False
         self.leavebootorder = False
         self.testing = False
         self.dnf = False
+        self.mpathFriendlyNames = True
         # ksprompt is whether or not to prompt for missing ksdata
         self.ksprompt = True
+        self.rescue_mode = False
         # parse the boot commandline
         self.cmdline = BootArgs()
         # Lock it down: no more creating new flags!
@@ -80,24 +78,13 @@ class Flags(object):
             self.read_cmdline()
 
     def read_cmdline(self):
-        for f in ("selinux", "debug", "leavebootorder", "testing"):
+        for f in ("selinux", "debug", "leavebootorder", "testing", "extlinux",
+                  "nombr", "gpt", "dnf"):
             self.set_cmdline_bool(f)
 
-        if "rpmarch" in self.cmdline:
-            self.targetarch = self.cmdline.get("rpmarch")
-
         if not selinux.is_selinux_enabled():
             self.selinux = 0
 
-        if "extlinux" in self.cmdline:
-            self.extlinux = True
-
-        if "gpt" in self.cmdline:
-            self.gpt = True
-
-        if "dnf" in self.cmdline:
-            self.dnf = True
-
 cmdline_files = ['/proc/cmdline', '/run/install/cmdline',
                  '/run/install/cmdline.d/*.conf', '/etc/cmdline']
 class BootArgs(OrderedDict):
@@ -154,14 +141,28 @@ class BootArgs(OrderedDict):
 
         lst = shlex.split(cmdline)
 
+        # options might have the inst. prefix (used to differentiate
+        # boot options for the installer from other boot options)
+        inst_prefix = "inst."
+
         for i in lst:
+            # drop the inst. prefix (if found), so that getbool() works
+            # consistently for both "foo=0" and "inst.foo=0"
+            if i.startswith(inst_prefix):
+                i = i[len(inst_prefix):]
+
             if "=" in i:
                 (key, val) = i.split("=", 1)
             else:
                 key = i
                 val = None
 
-            self[key] = val
+            # Some duplicate args create a space separated string
+            if key in CMDLINE_APPEND and self.get(key, None):
+                if val:
+                    self[key] = self[key] + " " + val
+            else:
+                self[key] = val
 
     def getbool(self, arg, default=False):
         """
@@ -210,6 +211,5 @@ def can_touch_runtime_system(msg, touch_live=False):
 
     return True
 
-global flags
 flags = Flags()
 
diff --git a/anaconda/pyanaconda/geoloc.py b/anaconda/pyanaconda/geoloc.py
index 76771ff..7b8dc0d 100644
--- a/anaconda/pyanaconda/geoloc.py
+++ b/anaconda/pyanaconda/geoloc.py
@@ -863,30 +863,30 @@ class WiFiAccessPoint(object):
                "(signal strength): %d" % (self.bssid, self.ssid, self.rssi)
 
 if __name__ == "__main__":
-    print "GeoIP directly started"
+    print("GeoIP directly started")
 
-    print "trying the default backend"
+    print("trying the default backend")
     location_info = LocationInfo()
     location_info.refresh()
-    print "  provider used: %s" % location_info._provider
-    print "  territory code: %s" % location_info.get_territory_code()
+    print("  provider used: %s" % location_info._provider)
+    print("  territory code: %s" % location_info.get_territory_code())
 
-    print "trying the Fedora GeoIP backend"
+    print("trying the Fedora GeoIP backend")
     location_info = LocationInfo(provider_id=
                                  constants.GEOLOC_PROVIDER_FEDORA_GEOIP)
     location_info.refresh()
-    print "  provider used: %s" % location_info._provider
-    print "  territory code: %s" % location_info.get_territory_code()
+    print("  provider used: %s" % location_info._provider)
+    print("  territory code: %s" % location_info.get_territory_code())
 
-    print "trying the Google WiFi location backend"
+    print("trying the Google WiFi location backend")
     location_info = LocationInfo(provider_id=
                                  constants.GEOLOC_PROVIDER_GOOGLE_WIFI)
     location_info.refresh()
-    print "  provider used: %s" % location_info._provider
-    print "  territory code: %s" % location_info.get_territory_code()
+    print("  provider used: %s" % location_info._provider)
+    print("  territory code: %s" % location_info.get_territory_code())
 
-    print "trying the Hostip backend"
+    print("trying the Hostip backend")
     location_info = LocationInfo(provider_id=constants.GEOLOC_PROVIDER_HOSTIP)
     location_info.refresh()
-    print "  provider used: %s" % location_info._provider
-    print "  territory code: %s" % location_info.get_territory_code()
+    print("  provider used: %s" % location_info._provider)
+    print("  territory code: %s" % location_info.get_territory_code())
diff --git a/anaconda/pyanaconda/i18n.py b/anaconda/pyanaconda/i18n.py
index 96cfef6..3e6c248 100644
--- a/anaconda/pyanaconda/i18n.py
+++ b/anaconda/pyanaconda/i18n.py
@@ -19,10 +19,40 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
-__all__ = ["_", "N_", "P_"]
+__all__ = ["_", "N_", "P_", "C_", "CN_", "CP_"]
 
 import gettext
 
-_ = lambda x: gettext.ldgettext("anaconda", x)
+_ = lambda x: gettext.ldgettext("anaconda", x) if x else ""
 N_ = lambda x: x
 P_ = lambda x, y, z: gettext.ldngettext("anaconda", x, y, z)
+
+# This is equivalent to "pgettext" in GNU gettext. The pgettext functions
+# are not exported by Python, but all they really do is a stick a EOT
+# character between msgctxt and msgid and check that msgctxt isn't part
+# of the return value.
+def C_(msgctxt, msgid):
+    ctxid = "%s\x04%s" % (msgctxt, msgid)
+    translation = _(ctxid)
+
+    # If there is no translation for msgctxt<EOT>msgid, return only msgid
+    if translation == ctxid:
+        return msgid
+    else:
+        return translation
+
+# Mark as translatable with context
+CN_ = lambda c, x: x
+
+# npgettext; i.e., gettext with plural form and context
+def CP_(msgctxt, msgid, msgid_plural, n):
+    ctxid = "%s\x04%s" % (msgctxt, msgid)
+    translation = P_(ctxid, msgid_plural, n)
+
+    # If the returned value is msgctxt<EOT>msgid, ngettext was trying to
+    # fallback to msgid. We don't add msgctxt to msgid_plural, so any other
+    # return value is correct.
+    if translation == ctxid:
+        return msgid
+    else:
+        return translation
diff --git a/anaconda/pyanaconda/ihelp.py b/anaconda/pyanaconda/ihelp.py
new file mode 100644
index 0000000..cb02a84
--- /dev/null
+++ b/anaconda/pyanaconda/ihelp.py
@@ -0,0 +1,140 @@
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Martin Kolman <mkolman@redhat.com>
+#
+"""
+Anaconda built-in help module
+"""
+import os
+import subprocess
+
+from pyanaconda.flags import flags
+from pyanaconda.localization import find_best_locale_match
+from pyanaconda.constants import DEFAULT_LANG
+
+import logging
+log = logging.getLogger("anaconda")
+
+yelp_process = None
+
+def _get_best_help_file(help_folder, help_file):
+    """Return the path to the best help file for the current language and available
+    help content
+
+    :param str help_folder: a path to folder where we should look for the help files
+    :param str help_file: name of the requested help file
+    :return: path to the best help file or None is no match is found
+    :rtype: str or NoneType
+
+    """
+    current_lang = os.environ["LANG"]
+    # list all available languages for the Anaconda help
+    # * content is stored in folders named after the given language code
+    #   (en-US, cs-CZ, jp-JP, etc.)
+    # * we check if the given folder contains the currently needed help file
+    #   and only consider it fit to use if it does have the file
+    if not os.path.exists(help_folder):
+        log.warning("help folder %s for help file %s does not exist", help_folder, help_file)
+        return None
+
+    help_langs = [l for l in os.listdir(help_folder) if os.path.isfile(os.path.join(help_folder, l, help_file))]
+
+    best_lang = find_best_locale_match(current_lang, help_langs)
+    if not best_lang and current_lang != DEFAULT_LANG:
+        # nothing found for current language, fallback to the default language,
+        # if available & different from current language
+        log.warning("help file %s not found in lang %s, falling back to default lang (%s)",
+                    help_file, current_lang, DEFAULT_LANG)
+        best_lang = find_best_locale_match(DEFAULT_LANG, help_langs)
+
+    # did we get something usable ?
+    if best_lang:
+        # we already checked that the full path exists when enumerating suitable
+        # help content above, so we can just return the part here without
+        # checking it again
+        return os.path.join(help_folder, best_lang, help_file)
+    else:
+        log.warning("no help content found for file %s", help_file)
+        return None
+
+def get_help_path(help_file, instclass):
+    """Return the full path for the given help file name,
+    if the help file path does not exist a fallback path is returned.
+    There are actually two possible fallback paths that might be returned:
+    * first we try to return path to the main page of the installation guide
+      (if it exists)
+    * if we can't find the main page of the installation page, path to a
+      "no help found" placeholder bundled with Anaconda is returned
+
+    Regarding help l10n, we try to respect the current locale as defined by the
+    "LANG" environmental variable, but fallback to English if localized content
+    is not available.
+
+    :param help_file: help file name
+    :type help_file: str or NoneType
+    :param instclass: current install class instance
+    :return str: full path to the help file requested or to a placeholder
+    """
+    # help l10n handling
+
+    if help_file:
+        help_path = _get_best_help_file(instclass.help_folder, help_file)
+        if help_path is not None:
+            return help_path
+
+    # the screen did not have a helpFile defined or the defined help file
+    # does not exist, so next try to check if we can find the main page
+    # of the installation guide and use it instead
+    help_path = _get_best_help_file(instclass.help_folder, instclass.help_main_page)
+    if help_path is not None:
+        return help_path
+
+    # looks like the installation guide is not available, so just return
+    # a placeholder page, which should be always present
+    if flags.livecdInstall:
+        return _get_best_help_file(instclass.help_folder, instclass.help_placeholder_with_links)
+    else:
+        return _get_best_help_file(instclass.help_folder, instclass.help_placeholder)
+
+def start_yelp(help_path):
+    """Start a new yelp process and make sure to kill any existing ones
+
+    :param help_path: path to the help file yelp should load
+    :type help_path: str or NoneType
+    """
+
+    kill_yelp()
+    log.debug("starting yelp")
+    global yelp_process
+    # under some extreme circumstances (placeholders missing)
+    # the help path can be None and we need to prevent Popen
+    # receiving None as an argument instead of a string
+    yelp_process = subprocess.Popen(["yelp", help_path or ""])
+
+def kill_yelp():
+    """Try to kill any existing yelp processes"""
+
+    global yelp_process
+    if not yelp_process:
+        return False
+
+    log.debug("killing yelp")
+    yelp_process.kill()
+    yelp_process = None
+    return True
+
diff --git a/anaconda/pyanaconda/image.py b/anaconda/pyanaconda/image.py
index 150fb85..9662832 100644
--- a/anaconda/pyanaconda/image.py
+++ b/anaconda/pyanaconda/image.py
@@ -92,7 +92,7 @@ def findFirstIsoImage(path):
         # warn user if images appears to be wrong size
         if os.stat(what)[stat.ST_SIZE] % 2048:
             log.warning("%s appears to be corrupted", what)
-            exn = InvalidImageSizeError("size is not a multiple of 2048 bytes")
+            exn = InvalidImageSizeError("size is not a multiple of 2048 bytes", what)
             if errorHandler.cb(exn) == ERROR_RAISE:
                 raise exn
 
@@ -134,7 +134,7 @@ def mountImageDirectory(method, storage):
                 device.format.setup(mountpoint=ISO_DIR)
             except StorageError as e:
                 log.error("couldn't mount ISO source directory: %s", e)
-                exn = MediaMountError(str(e))
+                exn = MediaMountError(str(e), device)
                 if errorHandler.cb(exn) == ERROR_RAISE:
                     raise exn
     elif method.method.startswith("nfsiso:"):
@@ -153,7 +153,7 @@ def mountImageDirectory(method, storage):
                 blivet.util.mount(url, ISO_DIR, fstype="nfs", options=method.options)
             except OSError as e:
                 log.error("couldn't mount ISO source directory: %s", e)
-                exn = MediaMountError(str(e))
+                exn = MediaMountError(str(e), device)
                 if errorHandler.cb(exn) == ERROR_RAISE:
                     raise exn
 
@@ -208,11 +208,11 @@ def opticalInstallMedia(devicetree):
             except FSError:
                 continue
 
-            if not verifyMedia(mountpoint):
+            try:
+                if not verifyMedia(mountpoint):
+                    continue
+            finally:
                 dev.format.unmount()
-                continue
-
-            dev.format.unmount()
         finally:
             os.rmdir(mountpoint)
 
@@ -239,8 +239,8 @@ def unmountCD(dev):
             dev.format.unmount()
         except FSError as e:
             log.error("exception in _unmountCD: %s", e)
-            exn = MediaUnmountError()
-            errorHandler.cb(exn, dev)
+            exn = MediaUnmountError(dev)
+            errorHandler.cb(exn)
         else:
             break
 
diff --git a/anaconda/pyanaconda/install.py b/anaconda/pyanaconda/install.py
index 0742d6f..9c2d724 100644
--- a/anaconda/pyanaconda/install.py
+++ b/anaconda/pyanaconda/install.py
@@ -20,22 +20,24 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
-from pyanaconda.constants import ROOT_PATH
-from blivet import turnOnFilesystems
+from blivet import turnOnFilesystems, callbacks
 from pyanaconda.bootloader import writeBootLoader
-from pyanaconda.progress import progress_report, progressQ
+from pyanaconda.progress import progress_report, progress_message, progress_step, progress_complete, progress_init
 from pyanaconda.users import createLuserConf, getPassAlgo, Users
 from pyanaconda import flags
+from pyanaconda import iutil
 from pyanaconda import timezone
 from pyanaconda.i18n import _
 from pyanaconda.threads import threadMgr
+from pyanaconda.ui.lib.entropy import wait_for_entropy
 import logging
+import blivet
 log = logging.getLogger("anaconda")
 
 def _writeKS(ksdata):
     import os
 
-    path = ROOT_PATH + "/root/anaconda-ks.cfg"
+    path = iutil.getSysroot() + "/root/anaconda-ks.cfg"
 
     # Clear out certain sensitive information that kickstart doesn't have a
     # way of representing encrypted.
@@ -47,18 +49,28 @@ def _writeKS(ksdata):
         f.write(str(ksdata))
 
     # Make it so only root can read - could have passwords
-    os.chmod(path, 0600)
+    iutil.eintr_retry_call(os.chmod, path, 0o600)
 
 def doConfiguration(storage, payload, ksdata, instClass):
     from pyanaconda.kickstart import runPostScripts
 
-    step_count = 6
+    willWriteNetwork = not flags.flags.imageInstall and not flags.flags.dirInstall
+    willRunRealmd = ksdata.realm.discovered
+
+    # configure base, create users, configure addons, initramfs, post-install
+    step_count = 5
+
+    # network, maybe
+    if willWriteNetwork:
+        step_count += 1
+
     # if a realm was discovered,
     # increment the counter as the
     # real joining step will be executed
-    if ksdata.realm.discovered:
+    if willRunRealmd:
         step_count += 1
-    progressQ.send_init(step_count)
+
+    progress_init(step_count)
 
     # Now run the execute methods of ksdata that require an installed system
     # to be present first.
@@ -72,14 +84,15 @@ def doConfiguration(storage, payload, ksdata, instClass):
         ksdata.lang.execute(storage, ksdata, instClass)
         ksdata.firewall.execute(storage, ksdata, instClass)
         ksdata.xconfig.execute(storage, ksdata, instClass)
+        ksdata.skipx.execute(storage, ksdata, instClass)
 
-    if not flags.flags.imageInstall and not flags.flags.dirInstall:
+    if willWriteNetwork:
         with progress_report(_("Writing network configuration")):
             ksdata.network.execute(storage, ksdata, instClass)
 
     # Creating users and groups requires some pre-configuration.
     with progress_report(_("Creating users")):
-        createLuserConf(ROOT_PATH, algoname=getPassAlgo(ksdata.authconfig.authconfig))
+        createLuserConf(iutil.getSysroot(), algoname=getPassAlgo(ksdata.authconfig.authconfig))
         u = Users()
         ksdata.rootpw.execute(storage, ksdata, instClass, u)
         ksdata.group.execute(storage, ksdata, instClass, u)
@@ -87,12 +100,11 @@ def doConfiguration(storage, payload, ksdata, instClass):
 
     with progress_report(_("Configuring addons")):
         ksdata.addons.execute(storage, ksdata, instClass, u)
-        ksdata.configured_spokes.execute(storage, ksdata, instClass, u)
 
     with progress_report(_("Generating initramfs")):
         payload.recreateInitrds(force=True)
 
-    if ksdata.realm.discovered:
+    if willRunRealmd:
         with progress_report(_("Joining realm: %s") % ksdata.realm.discovered):
             ksdata.realm.execute(storage, ksdata, instClass)
 
@@ -103,7 +115,18 @@ def doConfiguration(storage, payload, ksdata, instClass):
     # kickstart file over if one exists).
     _writeKS(ksdata)
 
-    progressQ.send_complete()
+    progress_complete()
+
+def moveBootMntToPhysical(storage):
+    """Move the /boot mount to /mnt/sysimage/boot."""
+    if iutil.getSysroot() == iutil.getTargetPhysicalRoot():
+        return
+    bootmnt = storage.mountpoints.get('/boot')
+    if bootmnt is None:
+        return
+    bootmnt.format.teardown()
+    bootmnt.teardown()
+    bootmnt.format.setup(options=bootmnt.format.options, chroot=iutil.getTargetPhysicalRoot())
 
 def doInstall(storage, payload, ksdata, instClass):
     """Perform an installation.  This method takes the ksdata as prepared by
@@ -111,24 +134,39 @@ def doInstall(storage, payload, ksdata, instClass):
        The two main tasks for this are putting filesystems onto disks and
        installing packages onto those filesystems.
     """
+    willRunRealmd = ksdata.realm.join_realm
+    willInstallBootloader = not flags.flags.dirInstall and (not ksdata.bootloader.disabled
+                                                            and ksdata.bootloader != "none")
+
     # First save system time to HW clock.
     if flags.can_touch_runtime_system("save system time to HW clock"):
         timezone.save_hw_clock(ksdata.timezone)
 
     # We really only care about actions that affect filesystems, since
     # those are the ones that take the most time.
-    steps = len(storage.devicetree.findActions(type="create", object="format")) + \
-            len(storage.devicetree.findActions(type="resize", object="format"))
-    steps += 6
-    # pre setup phase, packages setup, packages, bootloader, realmd,
-    # post install
-    progressQ.send_init(steps)
+    steps = len(storage.devicetree.findActions(action_type="create", object_type="format")) + \
+            len(storage.devicetree.findActions(action_type="resize", object_type="format"))
+
+    # pre setup phase, post install
+    steps += 2
+
+    # realmd, maybe
+    if willRunRealmd:
+        steps += 1
+
+    # bootloader, maybe
+    if willInstallBootloader:
+        steps += 1
 
     # This should be the only thread running, wait for the others to finish if not.
     if threadMgr.running > 1:
+        progress_init(steps+1)
+
         with progress_report(_("Waiting for %s threads to finish") % (threadMgr.running-1)):
             map(log.debug, ("Thread %s is running" % n for n in threadMgr.names))
             threadMgr.wait_all()
+    else:
+        progress_init(steps)
 
     with progress_report(_("Setting up the installation environment")):
         ksdata.firstboot.setup(storage, ksdata, instClass)
@@ -139,37 +177,87 @@ def doInstall(storage, payload, ksdata, instClass):
     # Do partitioning.
     payload.preStorage()
 
-    turnOnFilesystems(storage, mountOnly=flags.flags.dirInstall)
-    if not flags.flags.livecdInstall and not flags.flags.dirInstall:
+    # callbacks for blivet
+    message_clbk = lambda clbk_data: progress_message(clbk_data.msg)
+    step_clbk = lambda clbk_data: progress_step(clbk_data.msg)
+    entropy_wait_clbk = lambda clbk_data: wait_for_entropy(clbk_data.msg,
+                                                           clbk_data.min_entropy, ksdata)
+    callbacks_reg = callbacks.create_new_callbacks_register(create_format_pre=message_clbk,
+                                                            create_format_post=step_clbk,
+                                                            resize_format_pre=message_clbk,
+                                                            resize_format_post=step_clbk,
+                                                            wait_for_entropy=entropy_wait_clbk)
+
+    turnOnFilesystems(storage, mountOnly=flags.flags.dirInstall, callbacks=callbacks_reg)
+    write_storage_late = (flags.flags.livecdInstall or ksdata.ostreesetup.seen
+                          or ksdata.method.method == "liveimg"
+                          and not flags.flags.dirInstall)
+    if not write_storage_late:
         storage.write()
 
     # Do packaging.
 
     # Discover information about realms to join,
     # to determine additional packages
-    if ksdata.realm.join_realm:
+    if willRunRealmd:
         with progress_report(_("Discovering realm to join")):
             ksdata.realm.setup()
 
+    # Check for additional packages
+    ksdata.authconfig.setup()
+    ksdata.firewall.setup()
+
     # anaconda requires storage packages in order to make sure the target
     # system is bootable and configurable, and some other packages in order
     # to finish setting up the system.
-    packages = storage.packages + ["authconfig", "firewalld"] + ksdata.realm.packages
+    packages = storage.packages + ksdata.realm.packages
+    packages += ksdata.authconfig.packages + ksdata.firewall.packages
 
-    # don't try to install packages from the install class' ignored list
-    packages = [p for p in packages if p not in instClass.ignoredPackages]
+    if willInstallBootloader:
+        packages += storage.bootloader.packages
+
+    # don't try to install packages from the install class' ignored list and the
+    # explicitly excluded ones (user takes the responsibility)
+    packages = [p for p in packages
+                if p not in instClass.ignoredPackages and p not in ksdata.packages.excludedList]
     payload.preInstall(packages=packages, groups=payload.languageGroups())
     payload.install()
 
-    if flags.flags.livecdInstall:
-        storage.write()
+    if write_storage_late:
+        if iutil.getSysroot() != iutil.getTargetPhysicalRoot():
+            blivet.setSysroot(iutil.getTargetPhysicalRoot(),
+                              iutil.getSysroot())
+            storage.write()
 
-    with progress_report(_("Performing post-installation setup tasks")):
-        payload.postInstall()
+            # Now that we have the FS layout in the target, umount
+            # things that were in the legacy sysroot, and put them in
+            # the target root, except for the physical /.  First,
+            # unmount all target filesystems.
+            storage.umountFilesystems()
+
+            # Explicitly mount the root on the physical sysroot
+            rootmnt = storage.mountpoints.get('/')
+            rootmnt.setup()
+            rootmnt.format.setup(options=rootmnt.format.options, chroot=iutil.getTargetPhysicalRoot())
+
+            payload.prepareMountTargets(storage)
+
+            # Everything else goes in the target root, including /boot
+            # since the bootloader code will expect to find /boot
+            # inside the chroot.
+            storage.mountFilesystems(skipRoot=True)
+        else:
+            storage.write()
 
     # Do bootloader.
-    if not flags.flags.dirInstall:
+    if willInstallBootloader:
         with progress_report(_("Installing bootloader")):
             writeBootLoader(storage, payload, instClass, ksdata)
 
-    progressQ.send_complete()
+    with progress_report(_("Performing post-installation setup tasks")):
+        # Now, let's reset the state here so that the payload has
+        # /boot in the system root.
+        moveBootMntToPhysical(storage)
+        payload.postInstall()
+
+    progress_complete()
diff --git a/anaconda/pyanaconda/installclass.py b/anaconda/pyanaconda/installclass.py
index 6293a27..d6d0a8a 100644
--- a/anaconda/pyanaconda/installclass.py
+++ b/anaconda/pyanaconda/installclass.py
@@ -28,6 +28,7 @@ import imputil
 from blivet.partspec import PartSpec
 from blivet.devicelibs import swap
 from blivet.platform import platform
+from blivet.size import Size
 
 import logging
 log = logging.getLogger("anaconda")
@@ -60,6 +61,12 @@ class BaseInstallClass(object):
     # don't select this class by default
     default = 0
 
+    # help
+    help_folder = "/usr/share/anaconda/help"
+    help_main_page = "Installation_Guide.xml"
+    help_placeholder = None
+    help_placeholder_with_links = None
+
     @property
     def l10n_domain(self):
         if self._l10n_domain is None:
@@ -78,10 +85,14 @@ class BaseInstallClass(object):
 
     def setDefaultPartitioning(self, storage):
         autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
-                                 size=1024, maxSize=50*1024, grow=True,
+                                 size=Size("1GiB"),
+                                 maxSize=Size("50GiB"),
+                                 grow=True,
                                  btr=True, lv=True, thin=True, encrypted=True),
-                        PartSpec(mountpoint="/home", fstype=storage.defaultFSType,
-                                 size=500, grow=True, requiredSpace=50*1024,
+                        PartSpec(mountpoint="/home",
+                                 fstype=storage.defaultFSType,
+                                 size=Size("500MiB"), grow=True,
+                                 requiredSpace=Size("50GiB"),
                                  btr=True, lv=True, thin=True, encrypted=True)]
 
         bootreqs = platform.setDefaultPartitioning()
@@ -176,11 +187,10 @@ def availableClasses(showHidden=0):
         if fileName[-3:] != ".py" and fileName[-4:-1] != ".py":
             continue
         mainName = fileName.split(".")[0]
-        if done.has_key(mainName):
+        if mainName in done:
             continue
         done[mainName] = 1
 
-
         try:
             found = imputil.imp.find_module(mainName)
         except ImportError:
@@ -190,15 +200,12 @@ def availableClasses(showHidden=0):
         try:
             loaded = imputil.imp.load_module(mainName, found[0], found[1], found[2])
 
-            obj = loaded.InstallClass
-
-            if obj.__dict__.has_key('sortPriority'):
-                sortOrder = obj.sortPriority
-            else:
-                sortOrder = 0
-
-            if obj.hidden == 0 or showHidden == 1:
-                lst.append(((obj.name, obj), sortOrder))
+            for (_key, obj) in loaded.__dict__.items():
+                # If it's got these two methods, it's an InstallClass.
+                if hasattr(obj, "setDefaultPartitioning") and hasattr(obj, "setPackageSelection"):
+                    sortOrder = getattr(obj, "sortPriority", 0)
+                    if obj.hidden == 0 or showHidden == 1:
+                        lst.append(((obj.name, obj), sortOrder))
         except (ImportError, AttributeError):
             log.warning ("module import of %s failed: %s", mainName, sys.exc_type)
 
diff --git a/anaconda/pyanaconda/isys/Makefile.am b/anaconda/pyanaconda/isys/Makefile.am
index 9ed177e..c787f60 100644
--- a/anaconda/pyanaconda/isys/Makefile.am
+++ b/anaconda/pyanaconda/isys/Makefile.am
@@ -19,33 +19,16 @@
 
 pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
 
-ISYS_SRCS = devices.c lang.c \
-            isofs.c linkdetect.c vio.c ethtool.c eddsupport.c iface.c \
-            auditd.c log.c mem.c
-
 dist_noinst_HEADERS = $(srcdir)/*.h
 
-ISYS_CFLAGS = -DVERSION='"$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)"' \
-              $(NETWORKMANAGER_CFLAGS) $(LIBNL_CFLAGS) $(LIBNM_GLIB_CFLAGS) \
-              $(SELINUX_CFLAGS)
-ISYS_LIBS   = $(RESOLV_LIBS) $(ZLIB_LIBS) \
-              $(DEVMAPPER_LIBS) $(X11_LIBS) $(SELINUX_LIBS) \
-              $(LIBNL_LIBS) $(LIBNM_GLIB_LIBS)
-
 isysdir     = $(pkgpyexecdir)/isys
 isys_PYTHON = $(srcdir)/*.py
 
 pkgpyexec_LTLIBRARIES = _isys.la
-_isys_la_CFLAGS       = $(PYTHON_CFLAGS) $(ISYS_CFLAGS)
+_isys_la_CFLAGS       = $(PYTHON_CFLAGS)
 _isys_la_LDFLAGS      = -module -avoid-version
-_isys_la_LIBADD       = $(PYTHON_LIBS) $(ISYS_LIBS)
-_isys_la_SOURCES      = isys.c $(ISYS_SRCS)
-
-noinst_LTLIBRARIES    = libisys.la
-libisys_la_CFLAGS     = $(ISYS_CFLAGS)
-libisys_la_LDFLAGS    = -static
-libisys_la_LIBADD     = $(ISYS_LIBS)
-libisys_la_SOURCES    = $(ISYS_SRCS)
+_isys_la_LIBADD       = $(PYTHON_LIBS)
+_isys_la_SOURCES      = isys.c
 
 auditddir             = $(libexecdir)/$(PACKAGE_NAME)
 auditd_PROGRAMS       = auditd
diff --git a/anaconda/pyanaconda/isys/__init__.py b/anaconda/pyanaconda/isys/__init__.py
index fef0473..44f6144 100644
--- a/anaconda/pyanaconda/isys/__init__.py
+++ b/anaconda/pyanaconda/isys/__init__.py
@@ -33,7 +33,6 @@ import os
 import os.path
 import socket
 import stat
-import posix
 import sys
 from pyanaconda import iutil
 import blivet.arch
@@ -46,44 +45,38 @@ import datetime
 import logging
 log = logging.getLogger("anaconda")
 
-if blivet.arch.getArch() in ("ppc64"):
-    MIN_RAM = 768 * 1024
-    GUI_INSTALL_EXTRA_RAM = 512 * 1024
+if blivet.arch.getArch() in ["ppc64", "ppc64le"]:
+    MIN_RAM = 768
+    GUI_INSTALL_EXTRA_RAM = 512
 else:
-    MIN_RAM = 512 * 1024
-    GUI_INSTALL_EXTRA_RAM = 0
+    MIN_RAM = 320
+    GUI_INSTALL_EXTRA_RAM = 90
 
 MIN_GUI_RAM = MIN_RAM + GUI_INSTALL_EXTRA_RAM
-EARLY_SWAP_RAM = 896 * 1024
-
-## Get the amount of free space available under a directory path.
-# @param path The directory path to check.
-# @return The amount of free space available, in 
-def pathSpaceAvailable(path):
-    return _isys.devSpaceFree(path)
-
-def modulesWithPaths():
-    mods = []
-    for modline in open("/proc/modules", "r"):
-        modName = modline.split(" ", 1)[0]
-        modInfo = iutil.execWithCapture("modinfo",
-                ["-F", "filename", modName]).splitlines()
-        modPaths = [ line.strip() for line in modInfo if line!="" ]
-        mods.extend(modPaths)
-    return mods
-
-def isPseudoTTY (fd):
-    return _isys.isPseudoTTY (fd)
+SQUASHFS_EXTRA_RAM = 750
+NO_SWAP_EXTRA_RAM = 200
 
 ## Flush filesystem buffers.
 def sync ():
+    # TODO: This can be replaced with os.sync in Python 3.3
     return _isys.sync ()
 
+ISO_BLOCK_SIZE = 2048
+
 ## Determine if a file is an ISO image or not.
 # @param file The full path to a file to check.
 # @return True if ISO image, False otherwise.
 def isIsoImage(path):
-    return _isys.isisoimage(path)
+    try:
+        with open(path, "rb") as isoFile:
+            for blockNum in range(16, 100):
+                isoFile.seek(blockNum * ISO_BLOCK_SIZE + 1)
+                if isoFile.read(5) == "CD001":
+                    return True
+    except IOError:
+        pass
+
+    return False
 
 isPAE = None
 def isPaeAvailable():
@@ -114,9 +107,6 @@ def isLpaeAvailable():
 
     return False
 
-def getAnacondaVersion():
-    return _isys.getAnacondaVersion()
-
 def set_system_time(secs):
     """
     Set system time to time given as a number of seconds since the Epoch.
@@ -156,12 +146,38 @@ def set_system_date_time(year=None, month=None, day=None, hour=None, minute=None
     time_struct = time.struct_time((year, month, day, hour, minute, second, 0, 0, local))
     set_system_time(int(time.mktime(time_struct)))
 
-auditDaemon = _isys.auditdaemon
+def total_memory():
+    """Returns total system memory in kB (given to us by /proc/meminfo)"""
+
+    with open("/proc/meminfo", "r") as fobj:
+        for line in fobj:
+            if not line.startswith("MemTotal"):
+                # we are only interested in the MemTotal: line
+                continue
+
+            fields = line.split()
+            if len(fields) != 3:
+                log.error("unknown format for MemTotal line in /proc/meminfo: %s", line.rstrip())
+                raise RuntimeError("unknown format for MemTotal line in /proc/meminfo: %s" % line.rstrip())
+
+            try:
+                memsize = int(fields[1])
+            except ValueError:
+                log.error("ivalid value of MemTotal /proc/meminfo: %s", fields[1])
+                raise RuntimeError("ivalid value of MemTotal /proc/meminfo: %s" % fields[1])
+
+            # Because /proc/meminfo only gives us the MemTotal (total physical
+            # RAM minus the kernel binary code), we need to round this
+            # up. Assuming every machine has the total RAM MB number divisible
+            # by 128.
+            memsize /= 1024
+            memsize = (memsize / 128 + 1) * 128
+            memsize *= 1024
+
+            log.info("%d kB (%d MB) are available", memsize, memsize / 1024)
+            return memsize
+
+        log.error("MemTotal: line not found in /proc/meminfo")
+        raise RuntimeError("MemTotal: line not found in /proc/meminfo")
 
 handleSegv = _isys.handleSegv
-
-printObject = _isys.printObject
-bind_textdomain_codeset = _isys.bind_textdomain_codeset
-isVioConsole = _isys.isVioConsole
-initLog = _isys.initLog
-total_memory = _isys.total_memory
diff --git a/anaconda/pyanaconda/isys/auditd.c b/anaconda/pyanaconda/isys/auditd.c
index 0d72dd9..24cefa8 100644
--- a/anaconda/pyanaconda/isys/auditd.c
+++ b/anaconda/pyanaconda/isys/auditd.c
@@ -21,6 +21,8 @@
 
 #define _GNU_SOURCE 1
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/syscall.h>
 #include <sys/poll.h>
@@ -29,6 +31,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 
 #include <libaudit.h>
@@ -98,6 +101,9 @@ int audit_daemonize(void) {
     if ((child = fork()) > 0)
         return 0;
 
+    if (child < 0)
+        return -1;
+
 #ifndef STANDALONE 
     for (fd = 0; fd < getdtablesize(); fd++)
         close(fd);
@@ -124,7 +130,13 @@ int audit_daemonize(void) {
 
 #ifdef STANDALONE
 int main(void) {
-    return audit_daemonize();
+    if (audit_daemonize() < 0)
+    {
+        perror("fork");
+        return 1;
+    }
+
+    return 0;
 }
 #endif /* STANDALONE */
 
diff --git a/anaconda/pyanaconda/isys/devices.c b/anaconda/pyanaconda/isys/devices.c
deleted file mode 100644
index f9dc0a5..0000000
--- a/anaconda/pyanaconda/isys/devices.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * devices.c - various hardware probing functionality
- *
- * Copyright (C) 2007  Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): Bill Nottingham <notting@redhat.com>
- */
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <net/if_arp.h>
-
-#include "devices.h"
-
-/* for 'disks', to filter out weird stuff */
-#define MINIMUM_INTERESTING_SIZE	32*1024 	/* 32MB */
-
-/* from genhd.h, kernel side */
-#define GENHD_FL_REMOVABLE                      1
-#define GENHD_FL_DRIVERFS                       2
-#define GENHD_FL_MEDIA_CHANGE_NOTIFY            4
-#define GENHD_FL_CD                             8
-#define GENHD_FL_UP                             16
-#define GENHD_FL_SUPPRESS_PARTITION_INFO        32
-#define GENHD_FL_FAIL                           64
-
-
-struct device **getDevices(enum deviceType type) {
-    struct device **ret = NULL;
-    struct device *new;
-    int numdevices = 0;
-
-    if (type & (DEVICE_DISK | DEVICE_CDROM)) {
-        DIR *dir;
-        struct dirent *ent;
-
-        dir = opendir("/sys/block");
-
-        if (!dir) goto storagedone;
-
-        while ((ent = readdir(dir))) {
-            char path[64];
-            char buf[64];
-            int fd, caps, devtype;
-
-            snprintf(path, 64, "/sys/block/%s/capability", ent->d_name);
-            fd = open(path, O_RDONLY);
-            if (fd == -1)
-                continue;
-            if (read(fd, buf, 63) <= 0) {
-                close(fd);
-                continue;
-            }
-
-            close(fd);
-            errno = 0;
-            caps = strtol(buf, NULL, 16);
-
-            if ((errno == ERANGE && (caps == LONG_MIN || caps == LONG_MAX)) ||
-                (errno != 0 && caps == 0)) {
-                return NULL;
-            }
-
-            if (caps & GENHD_FL_CD)
-                devtype = DEVICE_CDROM;
-            else
-                devtype = DEVICE_DISK;
-            if (!(devtype & type))
-                continue;
-
-            if (devtype == DEVICE_DISK && !(caps & GENHD_FL_REMOVABLE)) {
-                long long int size;
-
-                snprintf(path, 64, "/sys/block/%s/size", ent->d_name);
-                fd = open(path, O_RDONLY);
-
-                if (fd == -1)
-                    continue;
-                if (read(fd, buf, 63) <= 0) {
-                    close(fd);
-                    continue;
-                }
-
-                close(fd);
-                errno = 0;
-                size = strtoll(buf, NULL, 10);
-
-                if ((errno == ERANGE && (size == LLONG_MIN ||
-                                         size == LLONG_MAX)) ||
-                    (errno != 0 && size == 0)) {
-                    return NULL;
-                }
-
-                if (size < MINIMUM_INTERESTING_SIZE)
-                    continue;
-            }
-
-            new = calloc(1, sizeof(struct device));
-            new->device = strdup(ent->d_name);
-            /* FIXME */
-            if (asprintf(&new->description, "Storage device %s",
-                         new->device) == -1) {
-                fprintf(stderr, "%s: %d: %s\n", __func__, __LINE__,
-                        strerror(errno));
-                fflush(stderr);
-                abort();
-            }
-            new->type = devtype;
-            if (caps & GENHD_FL_REMOVABLE) {
-                new->priv.removable = 1;
-            }
-            ret = realloc(ret, (numdevices+2) * sizeof(struct device));
-            ret[numdevices] = new;
-            ret[numdevices+1] = NULL;
-            numdevices++;
-        }
-
-        closedir(dir);
-    }
-storagedone:
-
-    if (type & DEVICE_NETWORK) {
-        DIR *dir;
-        struct dirent *ent;
-
-        dir = opendir("/sys/class/net");
-
-        if (!dir) goto netdone;
-
-        while ((ent = readdir(dir))) {
-            char path[64];
-            int fd, type;
-            char buf[64];
-
-            snprintf(path, 64, "/sys/class/net/%s/type", ent->d_name);
-            fd = open(path, O_RDONLY);
-            if (fd == -1)
-                continue;
-            if (read(fd, buf, 63) <= 0) {
-                close(fd);
-                continue;
-            }
-
-            close(fd);
-            errno = 0;
-            type = strtol(buf, NULL, 10);
-
-            if ((errno == ERANGE && (type == LONG_MIN || type == LONG_MAX)) ||
-                (errno != 0 && type == 0)) {
-                return NULL;
-            }
-
-            /* S390 channel-to-channnel devices have type 256 */
-            if ((type != ARPHRD_ETHER) &&
-                !((type == ARPHRD_SLIP) && !strncmp(ent->d_name, "ctc", 3)))
-                continue;
-
-            new = calloc(1, sizeof(struct device));
-            new->device = strdup(ent->d_name);
-            /* FIXME */
-            snprintf(path, 64, "/sys/class/net/%s/address", ent->d_name);
-            fd = open(path, O_RDONLY);
-            if (fd != -1) {
-                memset(buf, '\0', 64);
-                if (read(fd, buf, 63) > 0) {
-                    int i;
-                    for (i = (strlen(buf)-1); isspace(buf[i]); i--)
-                        buf[i] = '\0';
-                    new->priv.hwaddr = strdup(buf);
-                }
-                close(fd);
-            }
-
-            if (new->priv.hwaddr) {
-                if (asprintf(&new->description, "Ethernet device %s - %s",
-                             new->device, new->priv.hwaddr) == -1) {
-                    fprintf(stderr, "%s: %d: %s\n", __func__, __LINE__,
-                            strerror(errno));
-                    fflush(stderr);
-                    abort();
-                }
-            } else {
-                if (asprintf(&new->description, "Ethernet device %s",
-                             new->device) == -1) {
-                    fprintf(stderr, "%s: %d: %s\n", __func__, __LINE__,
-                            strerror(errno));
-                    fflush(stderr);
-                    abort();
-                }
-            }
-
-            ret = realloc(ret, (numdevices+2) * sizeof(struct device));
-            ret[numdevices] = new;
-            ret[numdevices+1] = NULL;
-            numdevices++;
-        }
-
-        closedir(dir);
-    }
-netdone:
-    return ret;
-}
-
diff --git a/anaconda/pyanaconda/isys/devices.h b/anaconda/pyanaconda/isys/devices.h
deleted file mode 100644
index 9428a77..0000000
--- a/anaconda/pyanaconda/isys/devices.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * devices.h
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DEVICES_H
-#define DEVICES_H
-
-enum deviceType {
-    DEVICE_ANY = ~0,
-    DEVICE_NETWORK = (1 << 0),
-    DEVICE_DISK = (1 << 1),
-    DEVICE_CDROM = (1 << 2)
-};
-
-struct device {
-    char *device;
-    char *description;
-    enum deviceType type;
-    union {
-        char *hwaddr;
-        int removable;
-    } priv;
-};
-
-struct device **getDevices(enum deviceType type);
-
-#endif
diff --git a/anaconda/pyanaconda/isys/eddsupport.c b/anaconda/pyanaconda/isys/eddsupport.c
deleted file mode 100644
index 1585c84..0000000
--- a/anaconda/pyanaconda/isys/eddsupport.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * eddsupport.c - handling of mapping disk drives in Linux to disk drives
- * according to the BIOS using the edd kernel module
- *
- * Copyright (C) 2004  Dell, Inc.  All rights reserved.
- * Copyright (C) 2004  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): Rezwanul_Kabir@Dell.com
- *            Jeremy Katz <katzj@redhat.com>
- */
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/reboot.h>
-#include <sys/types.h>
-#include <linux/types.h>
-
-
-#include "eddsupport.h"
-#include "devices.h"
-#include "isys.h"
-
-#define EDD_DIR "/sys/firmware/edd"
-#define SIG_FILE "mbr_signature"
-#define MBRSIG_OFFSET 0x1b8
-
-#define HASH_TABLE_SIZE 17
-
-
-struct diskMapEntry{
-    uint32_t key;
-    char *diskname;
-    struct diskMapEntry *next;
-};
-
-struct diskMapTable {
-    struct diskMapEntry **table;
-    int tableSize;
-};
-
-static struct diskMapTable *mbrSigToName = NULL;
-static int diskHashInit = 0;
-
-
-
-static struct diskMapTable*  initializeHashTable(int);
-static int insertHashItem(struct diskMapTable *, struct diskMapEntry *);
-static struct diskMapEntry* lookupHashItem(struct diskMapTable *, uint32_t);
-static int addToHashTable(struct diskMapTable *, uint32_t , char *);
-static struct device ** createDiskList();
-static int mapBiosDisks(struct device ** , const char *);
-static int readDiskSig(char *,  uint32_t *);
-static int readMbrSig(char *, uint32_t *);
-
-/* This is the top level function that creates a disk list present in the
- * system, checks to see if unique signatures exist on the disks at offset 
- * 0x1b8.  If a unique signature exists then it will map BIOS disks to their 
- * corresponding hd/sd device names.  Otherwise, we'll avoid mapping drives.
- */
-
-int probeBiosDisks() {
-    struct device ** devices = NULL;
-
-    devices = createDiskList();
-    if(!devices){
-#ifdef STANDALONE
-        fprintf(stderr, "No disks!\n");
-#endif
-        return -1;
-    }
-
-    if(!mapBiosDisks(devices, EDD_DIR)){
-#ifdef STANDALONE
-            fprintf(stderr, "WARNING: couldn't map BIOS disks\n");
-#endif
-            return -1;
-    }
-    return 0;
-}
-
-
-static struct device ** createDiskList(){
-    return getDevices (DEVICE_DISK);
-}
-
-static int readDiskSig(char *device, uint32_t *disksig) {
-    int fd, rc;
-    char devnodeName[64];
-
-    snprintf(devnodeName, sizeof(devnodeName), "/dev/%s", device);
-    fd = open(devnodeName, O_RDONLY);
-    if (fd < 0) {
-#ifdef STANDALONE 
-        fprintf(stderr, "Error opening device %s: %s\n ", device, 
-                strerror(errno));
-#endif 
-        return -errno;
-    }
-
-    rc = lseek(fd, MBRSIG_OFFSET, SEEK_SET);
-    if (rc < 0){
-        close(fd);
-
-#ifdef STANDALONE
-        fprintf(stderr, "Error seeking to MBRSIG_OFFSET in %s: %s\n", 
-                device, strerror(errno));
-#endif
-        return -1;
-    }
-
-    rc = read(fd, disksig, sizeof(uint32_t));
-    if (rc < sizeof(uint32_t)) {
-        close(fd);
-
-#ifdef STANDALONE
-        fprintf(stderr, "Failed to read signature from %s\n", device); 
-#endif
-        return -1;
-    }
-
-    close(fd);
-    return 0;
-}
-
-static int mapBiosDisks(struct device** devices,const char *path) {
-    DIR *dirHandle;
-    struct dirent *entry;
-    char * sigFileName;
-    uint32_t mbrSig, biosNum, currentSig;
-    struct device **currentDev, **foundDisk;
-    int i, rc, dm_nr, highest_dm;
-
-    dirHandle = opendir(path);
-    if(!dirHandle){
-#ifdef STANDALONE
-        fprintf(stderr, "Failed to open directory %s: %s\n", path, 
-                strerror(errno));
-#endif
-        return 0;
-    }
-
-    mbrSigToName = initializeHashTable(HASH_TABLE_SIZE);
-    if(!mbrSigToName){
-#ifdef STANDALONE
-        fprintf(stderr, "Error initializing mbrSigToName table\n");
-#endif
-        closedir(dirHandle);
-        return 0;
-    }
-
-    while ((entry = readdir(dirHandle)) != NULL) {
-        if(!strncmp(entry->d_name,".",1) || !strncmp(entry->d_name,"..",2)) {
-            continue;
-        }
-        sscanf((entry->d_name+9), "%x", &biosNum);
-        
-        sigFileName = malloc(strlen(path) + strlen(entry->d_name) + 20);
-        sprintf(sigFileName, "%s/%s/%s", path, entry->d_name, SIG_FILE);
-        if (readMbrSig(sigFileName, &mbrSig) == 0) {
-            for (currentDev = devices, i = 0, foundDisk=NULL, highest_dm=-1;
-                    (*currentDev) != NULL;
-                    currentDev++) {
-                if (!(*currentDev)->device)
-                    continue;
-
-                if ((rc=readDiskSig((*currentDev)->device, &currentSig)) < 0) {
-                    if (rc == -ENOMEDIUM || rc == -ENXIO)
-                        continue;
-                    closedir(dirHandle);
-                    return 0;
-                } 
-
-                if (mbrSig == currentSig) {
-                    /* When we have a fakeraid setup we will find multiple hits
-                       a number for the raw disks (1 when striping, 2 when
-                       mirroring, more with raid on raid like raid 01 or 10)
-                       and a number for the dm devices (normally only one dm
-                       device will match, but more with raid on raid).
-                       Since with raid on raid the last dm device created
-                       will be the top layer raid, we want the highest matching
-                       dm device. */
-                    if (!strncmp((*currentDev)->device, "dm-", 3) &&
-                         sscanf((*currentDev)->device+3, "%d", &dm_nr) == 1) {
-                        if (dm_nr > highest_dm) {
-                            highest_dm = dm_nr;
-                            foundDisk=currentDev;
-                            i = 1;
-                        }
-                    } else if (!foundDisk ||
-                               strncmp((*foundDisk)->device, "dm-", 3)) {
-                        foundDisk=currentDev;
-                        i++;
-                    }
-                }
-            }
-
-            if (i==1) {
-                if(!addToHashTable(mbrSigToName, (uint32_t)biosNum, 
-                               (*foundDisk)->device)) {
-                    closedir(dirHandle);
-                    return 0;
-                }
-            }
-        } 
-    }
-    closedir(dirHandle);
-    return 1;
-} 
-
-
-static int readMbrSig(char *filename, uint32_t *int_sig){
-    FILE* fh;
-
-    fh = fopen(filename,"r");
-    if(fh == NULL) {
-#ifdef STANDALONE
-        fprintf(stderr, "Error opening mbr_signature file %s: %s\n", filename,
-                strerror(errno));
-#endif
-        return -1;
-    }
-    fseek(fh, 0, SEEK_SET);
-    if (fscanf(fh, "%x", int_sig) != 1) {
-#ifdef STANDALONE
-        fprintf(stderr, "Error reading %s\n", filename);
-#endif
-        fclose(fh);
-        return -1;
-    }
-
-    fclose(fh);
-    return 0;
-}                                                   
-
-
-static struct diskMapTable* initializeHashTable(int size) {
-    struct diskMapTable *hashTable;
-
-    hashTable = malloc(sizeof(struct diskMapTable));
-    hashTable->tableSize = size;
-    hashTable->table = malloc(sizeof(struct diskMapEntry *) * size);
-    memset(hashTable->table,0,(sizeof(struct diskMapEntry *) * size));
-    return hashTable;
-}
-
-
-static int insertHashItem(struct diskMapTable *hashTable,
-                          struct diskMapEntry *hashItem) {
-    int index;
-
-    index = (hashItem->key) % (hashTable->tableSize);
-
-    if(hashTable->table[index] == NULL){
-        hashTable->table[index] = hashItem;
-        return index;
-    } else {
-        hashItem->next = hashTable->table[index];
-        hashTable->table[index] = hashItem;
-        return index;
-    }
-}
-
-
-static struct diskMapEntry * lookupHashItem(struct diskMapTable *hashTable,
-                                            uint32_t itemKey) {
-    int index;
-    struct diskMapEntry *hashItem;
-
-    index = itemKey % (hashTable->tableSize);
-    for (hashItem = hashTable->table[index]; 
-         (hashItem != NULL) && (hashItem->key != itemKey); 
-         hashItem = hashItem->next) { 
-        ;
-    }
-    return hashItem;
-}
-
-
-static int addToHashTable(struct diskMapTable *hashTable, 
-                          uint32_t itemKey, char *diskName) {
-    int index;
-    struct diskMapEntry *diskSigToNameEntry;
-
-    diskSigToNameEntry = malloc(sizeof(struct diskMapEntry));
-    diskSigToNameEntry->next = NULL;
-    diskSigToNameEntry->key = itemKey;
-    diskSigToNameEntry->diskname = diskName;
-
-    if ((index = insertHashItem(hashTable, diskSigToNameEntry)) < 0){
-#ifdef STANDALONE
-        fprintf(stderr, "Unable to insert item\n");
-#endif
-        return 0;
-    } else {
-        return 1;
-    }
-}
-
-
-char * getBiosDisk(char *biosStr) {
-    uint32_t biosNum;
-    struct diskMapEntry * disk;
-
-    if (diskHashInit == 0) {
-        probeBiosDisks();
-        diskHashInit = 1;
-    }
-
-    if (mbrSigToName == NULL)
-        return NULL;
-
-    sscanf(biosStr,"%x",&biosNum);
-    disk = lookupHashItem(mbrSigToName, biosNum);
-    if (disk) return disk->diskname;
-
-    return NULL;
-}
diff --git a/anaconda/pyanaconda/isys/ethtool.c b/anaconda/pyanaconda/isys/ethtool.c
deleted file mode 100644
index 871f1d4..0000000
--- a/anaconda/pyanaconda/isys/ethtool.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * ethtool.c - setting of basic ethtool options
- *
- * Copyright (C) 2003  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): Jeremy Katz <katzj@redhat.com>
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <net/if.h>
-
-#include <linux/sockios.h>
-#include "ethtool.h"
-
-static int set_intf_up(struct ifreq ifr, int sock) {
-    if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
-        return (-1);
-    }
-    ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-    if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
-        fprintf(stderr, "failed to bring up interface %s: %s", ifr.ifr_name,
-                strerror(errno));
-        return -1;
-    }
-    return (0);
-}
-
-int setEthtoolSettings(char * dev, ethtool_speed speed, 
-                       ethtool_duplex duplex) {
-    int sock, err;
-    struct ethtool_cmd ecmd;
-    struct ifreq ifr;
-
-    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-        perror("Unable to create socket");
-        return -1;
-    }
-
-    /* Setup our control structures. */
-    memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, dev);
-
-    if (set_intf_up(ifr, sock) == -1) {
-        fprintf(stderr, "unable to bring up interface %s: %s", dev, 
-                strerror(errno));
-        return -1;
-    }
-
-    ecmd.cmd = ETHTOOL_GSET;
-    ifr.ifr_data = (caddr_t)&ecmd;
-    err = ioctl(sock, SIOCETHTOOL, &ifr);
-    if (err < 0) {
-        perror("Unable to get settings via ethtool.  Not setting");
-        return -1;
-    }
-
-    if (speed != ETHTOOL_SPEED_UNSPEC)
-        ecmd.speed = speed;
-    if (duplex != ETHTOOL_DUPLEX_UNSPEC)
-        ecmd.duplex = duplex;
-    if ((duplex != ETHTOOL_DUPLEX_UNSPEC) || (speed != ETHTOOL_SPEED_UNSPEC))
-        ecmd.autoneg = AUTONEG_DISABLE;
-
-    ecmd.cmd = ETHTOOL_SSET;
-    ifr.ifr_data = (caddr_t)&ecmd;
-    err = ioctl(sock, SIOCETHTOOL, &ifr);
-    if (err < 0) {
-        //        perror("Unable to set settings via ethtool.  Not setting");
-        return -1;
-    }
-
-    return 0;
-}
-
-int identifyNIC(char *iface, int seconds) {
-    int sock;
-    struct ethtool_value edata;
-    struct ifreq ifr;
-
-    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-        perror("Unable to create socket");
-        return -1;
-    }
-
-    memset(&ifr, 0, sizeof(ifr));
-    memset(&edata, 0, sizeof(edata));
-
-    strcpy(ifr.ifr_name, iface);
-    edata.cmd = ETHTOOL_PHYS_ID;
-    edata.data = seconds;
-    ifr.ifr_data = (caddr_t) &edata;
-
-    if (ioctl(sock, SIOCETHTOOL, &ifr) < 0) {
-        perror("Unable to identify NIC");
-    }
-
-    return 0;
-}
diff --git a/anaconda/pyanaconda/isys/ethtool.h b/anaconda/pyanaconda/isys/ethtool.h
deleted file mode 100644
index 57b4ffc..0000000
--- a/anaconda/pyanaconda/isys/ethtool.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * net.h
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ISYSNET_H
-#define ISYSNET_H
-
-#include <linux/types.h>
-#include <linux/ethtool.h>
-
-/* returns 1 for link, 0 for no link, -1 for unknown */
-int get_link_status(char *ifname);
-
-typedef enum ethtool_speed_t { ETHTOOL_SPEED_UNSPEC = -1, 
-                               ETHTOOL_SPEED_10 = SPEED_10, 
-                               ETHTOOL_SPEED_100 = SPEED_100,
-                               ETHTOOL_SPEED_1000 = SPEED_1000 } ethtool_speed;
-typedef enum ethtool_duplex_t { ETHTOOL_DUPLEX_UNSPEC = -1, 
-                                ETHTOOL_DUPLEX_HALF = DUPLEX_HALF,
-                                ETHTOOL_DUPLEX_FULL = DUPLEX_FULL } ethtool_duplex;
-
-/* set ethtool settings */
-int setEthtoolSettings(char * dev, ethtool_speed speed, ethtool_duplex duplex);
-int identifyNIC(char *iface, int seconds);
-
-#endif
diff --git a/anaconda/pyanaconda/isys/iface.c b/anaconda/pyanaconda/isys/iface.c
deleted file mode 100644
index a37237c..0000000
--- a/anaconda/pyanaconda/isys/iface.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * iface.c - Network interface configuration API
- *
- * Copyright (C) 2006, 2007, 2008  Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): David Cantrell <dcantrell@redhat.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/utsname.h>
-#include <arpa/inet.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <signal.h>
-#include <netinet/in.h>
-
-#include <netlink/netlink.h>
-#include <netlink/socket.h>
-#include <netlink/route/rtnl.h>
-#include <netlink/route/route.h>
-#include <netlink/route/addr.h>
-#include <netlink/route/link.h>
-
-#include <glib.h>
-#include <NetworkManager.h>
-#include <nm-client.h>
-#include <nm-device.h>
-#include <nm-ip4-config.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-device-wifi.h>
-
-#include "isys.h"
-#include "iface.h"
-#include "log.h"
-
-/* Internal-only function prototypes. */
-static struct nl_handle *_iface_get_handle(void);
-static struct nl_cache *_iface_get_link_cache(struct nl_handle **);
-static int _iface_have_valid_addr(void *addr, int family, int length);
-static int _iface_redirect_io(char *device, int fd, int mode);
-
-/*
- * Return a libnl handle for NETLINK_ROUTE.
- */
-static struct nl_handle *_iface_get_handle(void) {
-    struct nl_handle *handle = NULL;
-
-    if ((handle = nl_handle_alloc()) == NULL) {
-        return NULL;
-    }
-
-    if (nl_connect(handle, NETLINK_ROUTE)) {
-        nl_handle_destroy(handle);
-        return NULL;
-    }
-
-    return handle;
-}
-
-/*
- * Return an NETLINK_ROUTE cache.
- */
-static struct nl_cache *_iface_get_link_cache(struct nl_handle **handle) {
-    struct nl_cache *cache = NULL;
-
-    if ((*handle = _iface_get_handle()) == NULL) {
-        return NULL;
-    }
-
-    if ((cache = rtnl_link_alloc_cache(*handle)) == NULL) {
-        nl_close(*handle);
-        nl_handle_destroy(*handle);
-        return NULL;
-    }
-
-    return cache;
-}
-
-/*
- * Determine if a struct in_addr or struct in6_addr contains a valid address.
- */
-static int _iface_have_valid_addr(void *addr, int family, int length) {
-    char buf[length+1];
-
-    if ((addr == NULL) || (family != AF_INET && family != AF_INET6)) {
-        return 0;
-    }
-
-    memset(buf, '\0', sizeof(buf));
-
-    if (inet_ntop(family, addr, buf, length) == NULL) {
-        return 0;
-    } else {
-        /* check for unknown addresses */
-        if (family == AF_INET) {
-            if (!strncmp(buf, "0.0.0.0", 7)) {
-                return 0;
-            }
-        } else if (family == AF_INET6) {
-            if (!strncmp(buf, "::", 2)) {
-                return 0;
-            }
-        }
-    }
-
-    return 1;
-}
-
-/*
- * Redirect I/O to another device (e.g., stdout to /dev/tty5)
- */
-int _iface_redirect_io(char *device, int fd, int mode) {
-    int io = -1;
-
-    if ((io = open(device, mode)) == -1) {
-        return 1;
-    }
-
-    if (close(fd) == -1) {
-        return 2;
-    }
-
-    if (dup2(io, fd) == -1) {
-        return 3;
-    }
-
-    if (close(io) == -1) {
-        return 4;
-    }
-
-    return 0;
-}
-
-/*
- * Given an interface name (e.g., eth0) and address family (e.g., AF_INET),
- * return the IP address in human readable format (i.e., the output from
- * inet_ntop()).  Return NULL for no match or error.
- */
-char *iface_ip2str(char *ifname, int family) {
-    int i;
-    NMClient *client = NULL;
-    NMIP4Config *ip4config = NULL;
-    NMIP4Address *ipaddr = NULL;
-    NMDevice *candidate = NULL;
-    struct in_addr tmp_addr;
-    const GPtrArray *devices;
-    const char *iface;
-    char ipstr[INET_ADDRSTRLEN+1];
-
-    if (ifname == NULL) {
-        return NULL;
-    }
-
-    /* DCFIXME: add IPv6 once NM gains support */
-    if (family != AF_INET) {
-        return NULL;
-    }
-
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init();
-#endif
-
-    client = nm_client_new();
-    if (!client) {
-        return NULL;
-    }
-
-    if (! is_connected_state(nm_client_get_state(client))) {
-        g_object_unref(client);
-        return NULL;
-    }
-
-    devices = nm_client_get_devices(client);
-    for (i=0; i < devices->len; i++) {
-        candidate = g_ptr_array_index(devices, i);
-        iface = nm_device_get_iface(candidate);
-
-        if (nm_device_get_state(candidate) != NM_DEVICE_STATE_ACTIVATED)
-            continue;
-
-        if (!iface || strcmp(iface, ifname))
-            continue;
-
-        if (!(ip4config = nm_device_get_ip4_config(candidate)))
-            continue;
-
-        if (!(ipaddr = nm_ip4_config_get_addresses(ip4config)->data))
-            continue;
-
-        memset(&ipstr, '\0', sizeof(ipstr));
-        tmp_addr.s_addr = nm_ip4_address_get_address(ipaddr);
-
-        if (inet_ntop(AF_INET, &tmp_addr, ipstr, INET_ADDRSTRLEN) == NULL) {
-            g_object_unref(client);
-            return NULL;
-        }
-
-        g_object_unref(client);
-        return g_strdup(ipstr);
-    }
-
-    g_object_unref(client);
-    return NULL;
-}
-
-/* Given an interface's MAC address, return the name (e.g., eth0) in human
- * readable format.  Return NULL for no match
- */
-char *iface_mac2device(char *mac) {
-    struct nl_handle *handle = NULL;
-    struct nl_cache *cache = NULL;
-    struct rtnl_link *link = NULL;
-    struct nl_addr *mac_as_nl_addr = NULL;
-    char *retval = NULL;
-    int i, n;
-
-    if (mac == NULL) {
-        return NULL;
-    }
-
-    if ((mac_as_nl_addr = nl_addr_parse(mac, AF_LLC)) == NULL) {
-        return NULL;
-    }
-
-    if ((cache = _iface_get_link_cache(&handle)) == NULL) {
-        return NULL;
-    }
-
-    n = nl_cache_nitems(cache);
-    for (i = 0; i <= n; i++) {
-        struct nl_addr *addr;
-
-        if ((link = rtnl_link_get(cache, i)) == NULL) {
-            continue;
-        }
-
-        addr = rtnl_link_get_addr(link);
-
-        if (!nl_addr_cmp(mac_as_nl_addr, addr)) {
-            retval = strdup(rtnl_link_get_name(link));
-            rtnl_link_put(link);
-            break;
-        }
-
-        rtnl_link_put(link);
-    }
-
-    nl_close(handle);
-    nl_handle_destroy(handle);
-
-    return retval;
-}
-
-/*
- * Given an interface name (e.g., eth0), return the MAC address in human
- * readable format (e.g., 00:11:52:12:D9:A0).  Return NULL for no match.
- */
-char *iface_mac2str(char *ifname) {
-    int buflen = 20;
-    char *buf = NULL;
-    struct nl_handle *handle = NULL;
-    struct nl_cache *cache = NULL;
-    struct rtnl_link *link = NULL;
-    struct nl_addr *addr = NULL;
-
-    if (ifname == NULL) {
-        return NULL;
-    }
-
-    if ((cache = _iface_get_link_cache(&handle)) == NULL) {
-        return NULL;
-    }
-
-    if ((link = rtnl_link_get_by_name(cache, ifname)) == NULL) {
-        goto mac2str_error2;
-    }
-
-    if ((addr = rtnl_link_get_addr(link)) == NULL) {
-        goto mac2str_error3;
-    }
-
-    if ((buf = calloc(sizeof(char *), buflen)) == NULL) {
-        goto mac2str_error4;
-    }
-
-    if ((buf = nl_addr2str(addr, buf, buflen)) != NULL) {
-        char *oldbuf = buf;
-        buf = g_ascii_strup(buf, -1);
-        free(oldbuf);
-    }
-
-mac2str_error4:
-    nl_addr_destroy(addr);
-mac2str_error3:
-    rtnl_link_put(link);
-mac2str_error2:
-    nl_close(handle);
-    nl_handle_destroy(handle);
-
-    return buf;
-}
-
-/*
- * Convert an IPv4 CIDR prefix to a dotted-quad netmask.  Return NULL on
- * failure.
- */
-struct in_addr *iface_prefix2netmask(int prefix) {
-    int mask = 0;
-    char *buf = NULL;
-    struct in_addr *ret;
-
-    if ((buf = calloc(sizeof(char *), INET_ADDRSTRLEN + 1)) == NULL) {
-        return NULL;
-    }
-
-    mask = htonl(~((1 << (32 - prefix)) - 1));
-
-    if (inet_ntop(AF_INET, (struct in_addr *) &mask, buf,
-                  INET_ADDRSTRLEN) == NULL) {
-        return NULL;
-    }
-
-    if ((ret = calloc(sizeof(struct in_addr), 1)) == NULL) {
-        return NULL;
-    }
-
-    memcpy(ret, (struct in_addr *) &mask, sizeof(struct in_addr));
-    return ret;
-}
-
-/*
- * Initialize a new iface_t structure to default values.
- */
-void iface_init_iface_t(iface_t *iface) {
-    int i;
-
-    memset(&iface->device, '\0', sizeof(iface->device));
-    memset(&iface->ipaddr, 0, sizeof(iface->ipaddr));
-    memset(&iface->netmask, 0, sizeof(iface->netmask));
-    memset(&iface->broadcast, 0, sizeof(iface->broadcast));
-    memset(&iface->ip6addr, 0, sizeof(iface->ip6addr));
-    memset(&iface->gateway, 0, sizeof(iface->gateway));
-    memset(&iface->gateway6, 0, sizeof(iface->gateway6));
-
-    for (i = 0; i < MAXNS; i++) {
-        iface->dns[i] = NULL;
-    }
-
-    iface->macaddr = NULL;
-    iface->ip6prefix = 0;
-    iface->nextserver = NULL;
-    iface->bootfile = NULL;
-    iface->numdns = 0;
-    iface->hostname = NULL;
-    iface->domain = NULL;
-    iface->search = NULL;
-    iface->dhcptimeout = 0;
-    iface->vendorclass = NULL;
-    iface->ssid = NULL;
-    iface->wepkey = NULL;
-    iface->mtu = 0;
-    iface->subchannels = NULL;
-    iface->portname = NULL;
-    iface->peerid = NULL;
-    iface->nettype = NULL;
-    iface->ctcprot = NULL;
-    iface->options = NULL;
-    iface->flags = 0;
-    iface->ipv4method = IPV4_UNUSED_METHOD;
-    iface->ipv6method = IPV6_UNUSED_METHOD;
-    iface->defroute = 1;
-
-    return;
-}
-
-/*
- * Given a pointer to a struct in_addr, return 1 if it contains a valid
- * address, 0 otherwise.
- */
-int iface_have_in_addr(struct in_addr *addr) {
-    return _iface_have_valid_addr(addr, AF_INET, INET_ADDRSTRLEN);
-}
-
-/*
- * Given a pointer to a struct in6_addr, return 1 if it contains a valid
- * address, 0 otherwise.
- */
-int iface_have_in6_addr(struct in6_addr *addr6) {
-    return _iface_have_valid_addr(addr6, AF_INET6, INET6_ADDRSTRLEN);
-}
-
-int is_connected_state(NMState state) {
-    return (state == NM_STATE_CONNECTED_LOCAL ||
-            state == NM_STATE_CONNECTED_SITE ||
-            state == NM_STATE_CONNECTED_GLOBAL);
-}
-
-/* Check if NM has an active connection */
-gboolean is_nm_connected(void) {
-    NMState state;
-    NMClient *client = NULL;
-
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init();
-#endif
-
-    client = nm_client_new();
-    if (!client)
-        return FALSE;
-
-    state = nm_client_get_state(client);
-    g_object_unref(client);
-
-    if (is_connected_state(state))
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/* Check if NM is already running */
-gboolean is_nm_running(void) {
-    gboolean running;
-    NMClient *client = NULL;
-
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init();
-#endif
-
-    client = nm_client_new();
-    if (!client)
-        return FALSE;
-
-    running = nm_client_get_manager_running(client);
-    g_object_unref(client);
-    return running;
-}
-
-gboolean is_iface_activated(char * ifname) {
-    int i, state;
-    NMClient *client = NULL;
-    const GPtrArray *devices;
-
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init();
-#endif
-
-    client = nm_client_new();
-    if (!client)
-        return FALSE;
-
-    devices = nm_client_get_devices(client);
-    for (i = 0; i < devices->len; i++) {
-        NMDevice *candidate = g_ptr_array_index(devices, i);
-        const char *devname = nm_device_get_iface(candidate);
-        if (strcmp(ifname, devname))
-            continue;
-        state = nm_device_get_state(candidate);
-        g_object_unref(client);
-        if (state == NM_DEVICE_STATE_ACTIVATED)
-            return TRUE;
-        else
-            return FALSE;
-    }
-
-    g_object_unref(client);
-    return FALSE;
-}
-
-/*
- * Wait for NetworkManager to appear on the system bus
- */
-int wait_for_nm(void) {
-    int count = 0;
-
-    /* send message and block until a reply or error comes back */
-    while (count < 45) {
-        if (is_nm_running())
-            return 0;
-
-        sleep(1);
-        count++;
-    }
-
-    return 1;
-}
-
-/*
- * Start NetworkManager -- requires that you have already written out the
- * control files in /etc/sysconfig for the interface.
- */
-int iface_restart_NetworkManager(void) {
-    int child, status;
-
-    if (!(child = fork())) {
-
-        if (_iface_redirect_io("/dev/null", STDIN_FILENO, O_RDONLY) ||
-            _iface_redirect_io("/dev/tty3", STDOUT_FILENO, O_WRONLY) ||
-            _iface_redirect_io("/dev/tty3", STDERR_FILENO, O_WRONLY)) {
-            exit(253);
-        }
-
-        execl("/bin/systemctl", "/bin/systemctl", "restart", "NetworkManager.service", NULL);
-        exit(254);
-    } else if (child < 0) {
-        logMessage(ERROR, "%s (%d): %m", __func__, __LINE__);
-        return 1;
-    }
-
-    if (waitpid(child, &status, 0) == -1) {
-        logMessage(ERROR, "%s (%d): %m", __func__, __LINE__);
-        return 1;
-    }
-
-    if (!WIFEXITED(status)) {
-        logMessage(ERROR, "%s (%d): %m", __func__, __LINE__);
-        return 1;
-    }
-
-    if (WEXITSTATUS(status)) {
-        logMessage(ERROR, "failed to restart NetworkManager with status %d", WEXITSTATUS(status));
-        return 1;
-    } else {
-        return wait_for_nm();
-    }
-}
-
-/*
- * Start NetworkManager -- requires that you have already written out the
- * control files in /etc/sysconfig for the interface.
- * This is needed on s390 until we have systemd init doing it as for other archs.
- */
-int iface_start_NetworkManager(void) {
-    pid_t pid;
-
-    if (is_nm_running())
-        return 0;  /* already running */
-
-    /* Start NetworkManager */
-    pid = fork();
-    if (pid == 0) {
-        if (setpgrp() == -1) {
-            exit(1);
-        }
-
-        if (_iface_redirect_io("/dev/null", STDIN_FILENO, O_RDONLY) ||
-            _iface_redirect_io(OUTPUT_TERMINAL, STDOUT_FILENO, O_WRONLY) ||
-            _iface_redirect_io(OUTPUT_TERMINAL, STDERR_FILENO, O_WRONLY)) {
-            exit(2);
-        }
-
-        if (execl(NETWORKMANAGER, NETWORKMANAGER,
-                  "--pid-file=/var/run/NetworkManager/NetworkManager.pid",
-                  NULL) == -1) {
-            exit(3);
-        }
-    } else if (pid == -1) {
-        return 1;
-    } else {
-        return wait_for_nm();
-    }
-
-    return 0;
-}
-
-/*
- * Set the MTU on the specified device.
- */
-int iface_set_interface_mtu(char *ifname, int mtu) {
-    int ret = 0;
-    struct nl_handle *handle = NULL;
-    struct nl_cache *cache = NULL;
-    struct rtnl_link *link = NULL;
-    struct rtnl_link *request = NULL;
-
-    if (ifname == NULL) {
-        return -1;
-    }
-
-    if (mtu <= 0) {
-        return -2;
-    }
-
-    if ((cache = _iface_get_link_cache(&handle)) == NULL) {
-        return -3;
-    }
-
-    if ((link = rtnl_link_get_by_name(cache, ifname)) == NULL) {
-        ret = -4;
-        goto ifacemtu_error1;
-    }
-
-    request = rtnl_link_alloc();
-    rtnl_link_set_mtu(request, mtu);
-
-    if (rtnl_link_change(handle, link, request, 0)) {
-        ret = -5;
-        goto ifacemtu_error2;
-    }
-
-ifacemtu_error2:
-    rtnl_link_put(link);
-ifacemtu_error1:
-    nl_close(handle);
-    nl_handle_destroy(handle);
-
-    return ret;
-}
-
diff --git a/anaconda/pyanaconda/isys/iface.h b/anaconda/pyanaconda/isys/iface.h
deleted file mode 100644
index c4167b0..0000000
--- a/anaconda/pyanaconda/isys/iface.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * iface.h - Network interface configuration API
- *
- * Copyright (C) 2006, 2007, 2008  Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): David Cantrell <dcantrell@redhat.com>
- */
-
-#ifndef ISYSIFACE_H
-#define ISYSIFACE_H
-
-#include <resolv.h>
-#include <net/if.h>
-#include <netlink/cache.h>
-#include <netlink/socket.h>
-#include <glib.h>
-#include <NetworkManager.h>
-
-/* Enumerated types used in iface.c */
-enum { IPUNUSED = -1, IPV4, IPV6 };
-
-enum { IPV4_UNUSED_METHOD, IPV4_DHCP_METHOD, IPV4_MANUAL_METHOD, IPV4_IBFT_METHOD, IPV4_IBFT_DHCP_METHOD };
-enum { IPV6_UNUSED_METHOD, IPV6_AUTO_METHOD, IPV6_DHCP_METHOD,
-       IPV6_MANUAL_METHOD };
-
-#define IPV4_FIRST_METHOD IPV4_DHCP_METHOD
-#define IPV4_LAST_METHOD  IPV4_MANUAL_METHOD
-
-#define IPV6_FIRST_METHOD IPV6_AUTO_METHOD
-#define IPV6_LAST_METHOD  IPV6_MANUAL_METHOD
-
-/* Flags for the iface_t (do we need these?) */
-#define IFACE_FLAGS_NO_WRITE_RESOLV_CONF (((uint64_t) 1) << 0)
-#define IFACE_NO_WRITE_RESOLV_CONF(a)    ((a) & IFACE_FLAGS_NO_WRITE_RESOLV_CONF)
-
-/* Macros for starting NetworkManager */
-#define NETWORKMANAGER  "/usr/sbin/NetworkManager"
-
-/* Per-interface configuration information */
-typedef struct _iface_t {
-    /* device name (e.g., eth0) */
-    char device[IF_NAMESIZE];
-
-    /* MAC address as xx:xx:xx:xx:xx:xx */
-    char *macaddr;
-
-    /* IPv4 (store addresses in in_addr format, use inet_pton() to display) */
-    struct in_addr ipaddr;
-    struct in_addr netmask;
-    struct in_addr broadcast;
-
-    /* IPv6 (store addresses in in6_addr format, prefix is just an int) */
-    struct in6_addr ip6addr;
-    int ip6prefix;
-
-    /* Gateway settings */
-    struct in_addr gateway;
-    struct in6_addr gateway6;
-    int defroute;
-
-    /* BOOTP (these can be IPv4 or IPv6, store human-readable version as str) */
-    char *nextserver;
-    char *bootfile;
-
-    /* DNS (these can be IPv4 or IPv6, store human-readable version as str) */
-    char *dns[MAXNS];
-    int numdns;
-    char *hostname;
-    char *domain;
-    char *search;
-
-    /* Misc DHCP settings */
-    int dhcptimeout;
-    char *vendorclass;
-
-    /* Wireless settings */
-    char *ssid;
-    char *wepkey;
-
-    /* s390 specifics */
-    int mtu;
-    char *subchannels;
-    char *portname;
-    char *peerid;
-    char *nettype;
-    char *ctcprot;
-    char *options;
-
-    /* flags */
-    uint64_t flags;
-    int ipv4method;
-    int ipv6method;
-} iface_t;
-
-/* Function prototypes */
-
-/*
- * Given an interface name (e.g., eth0) and address family (e.g., AF_INET),
- * return the IP address in human readable format (i.e., the output from
- * inet_ntop()).  Return NULL for no match or error.
- */
-char *iface_ip2str(char *, int);
-
-/*
- * Given an interface name (e.g., eth0), return the MAC address in human
- * readable format (e.g., 00:11:52:12:D9:A0).  Return NULL for no match.
- */
-char *iface_mac2str(char *);
-
-/* Given an interface's MAC address, return the name (e.g., eth0) in human
- * readable format.  Return NULL for no match
- */
-char *iface_mac2device(char *);
-
-/*
- * Convert an IPv4 CIDR prefix to a dotted-quad netmask.  Return NULL on
- * failure.
- */
-struct in_addr *iface_prefix2netmask(int);
-
-/*
- * Initialize a new iface_t structure to default values.
- */
-void iface_init_iface_t(iface_t *);
-
-/*
- * Given a pointer to a struct in_addr, return 1 if it contains a valid
- * address, 0 otherwise.
- */
-int iface_have_in_addr(struct in_addr *addr);
-
-/*
- * Given a pointer to a struct in6_addr, return 1 if it contains a valid
- * address, 0 otherwise.
- */
-int iface_have_in6_addr(struct in6_addr *addr6);
-
-/*
- * Checks if NetworkManager has an active connection.
- */
-gboolean is_nm_connected(void);
-
-gboolean is_iface_activated(char * ifname);
-
-/*
- * Start NetworkManager
- */
-int iface_start_NetworkManager(void);
-
-/*
- * Restart NetworkManager
- */
-int iface_restart_NetworkManager(void);
-
-/*
- * Set Maximum Transfer Unit (MTU) on specified interface
- */
-int iface_set_interface_mtu(char *ifname, int mtu);
-
-/*
- * Checks if the state means nm is connected
- */
-int is_connected_state(NMState state);
-
-#endif /* ISYSIFACE_H */
diff --git a/anaconda/pyanaconda/isys/isofs.c b/anaconda/pyanaconda/isys/isofs.c
deleted file mode 100644
index bb5a44a..0000000
--- a/anaconda/pyanaconda/isys/isofs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * isofs.c
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-
-#define BLOCK_SIZE 2048
- 
-/* returns 1 if file is an ISO, 0 otherwise */
-int fileIsIso(const char * file) {
-    int blkNum;
-    char magic[5];
-    int fd;
-
-    fd = open(file, O_RDONLY);
-    if (fd < 0)
-	return 0;
-
-    for (blkNum = 16; blkNum < 100; blkNum++) {
-	if (lseek(fd, blkNum * BLOCK_SIZE + 1, SEEK_SET) < 0) {
-	    close(fd);
-	    return 0;
-	}
-
-	if (read(fd, magic, sizeof(magic)) != sizeof(magic)) {
-	    close(fd);
-	    return 0;
-	}
-
-	if (!strncmp(magic, "CD001", 5)) {
-	    close(fd);
-	    return 1;
-	}
-    }
-
-    close(fd); 
-    return 0;
-}
diff --git a/anaconda/pyanaconda/isys/isys.c b/anaconda/pyanaconda/isys/isys.c
index 6ed8bd1..23fb77f 100644
--- a/anaconda/pyanaconda/isys/isys.c
+++ b/anaconda/pyanaconda/isys/isys.c
@@ -17,153 +17,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <Python.h>
 
 #include <stdio.h>
-#include <dirent.h>
-#include <errno.h>
-#define u32 __u32
-#include <fcntl.h>
-/* Need to tell loop.h what the actual dev_t type is. */
-#undef dev_t
-#if defined(__alpha)
-#define dev_t unsigned int
-#else
-#if defined(__x86_64__)
-#define dev_t unsigned long
-#else
-#define dev_t unsigned short
-#endif
-#endif
-#include <linux/loop.h>
-#undef dev_t
-#define dev_t dev_t
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <sys/time.h>
-#include <sys/utsname.h>
-#include <sys/vfs.h>
 #include <unistd.h>
-#include <resolv.h>
-#include <sys/vt.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <linux/fb.h>
-#include <libintl.h>
-#include <libgen.h>
-#include <linux/cdrom.h>
-#include <linux/major.h>
 #include <signal.h>
 #include <execinfo.h>
+#include <stdlib.h>
 
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/keysym.h>
-
-#include "iface.h"
-#include "isys.h"
-#include "ethtool.h"
-#include "lang.h"
-#include "eddsupport.h"
-#include "auditd.h"
-#include "log.h"
-#include "mem.h"
-
-#ifndef CDROMEJECT
-#define CDROMEJECT 0x5309
-#endif
-
-static PyObject * doDevSpaceFree(PyObject * s, PyObject * args);
-static PyObject * doisPseudoTTY(PyObject * s, PyObject * args);
-static PyObject * doisVioConsole(PyObject * s);
 static PyObject * doSync(PyObject * s, PyObject * args);
-static PyObject * doisIsoImage(PyObject * s, PyObject * args);
-static PyObject * printObject(PyObject * s, PyObject * args);
-static PyObject * py_bind_textdomain_codeset(PyObject * o, PyObject * args);
 static PyObject * doSegvHandler(PyObject *s, PyObject *args);
-static PyObject * doAuditDaemon(PyObject *s);
-static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args);
-static PyObject * doGetAnacondaVersion(PyObject * s, PyObject * args);
-static PyObject * doInitLog(PyObject * s);
-static PyObject * doTotalMemory(PyObject * s);
 static PyObject * doSetSystemTime(PyObject *s, PyObject *args);
 
 static PyMethodDef isysModuleMethods[] = {
-    { "devSpaceFree", (PyCFunction) doDevSpaceFree, METH_VARARGS, NULL },
-    { "isPseudoTTY", (PyCFunction) doisPseudoTTY, METH_VARARGS, NULL},
-    { "isVioConsole", (PyCFunction) doisVioConsole, METH_NOARGS, NULL},
     { "sync", (PyCFunction) doSync, METH_VARARGS, NULL},
-    { "isisoimage", (PyCFunction) doisIsoImage, METH_VARARGS, NULL},
-    { "printObject", (PyCFunction) printObject, METH_VARARGS, NULL},
-    { "bind_textdomain_codeset", (PyCFunction) py_bind_textdomain_codeset, METH_VARARGS, NULL},
     { "handleSegv", (PyCFunction) doSegvHandler, METH_VARARGS, NULL },
-    { "auditdaemon", (PyCFunction) doAuditDaemon, METH_NOARGS, NULL },
-    { "isCapsLockEnabled", (PyCFunction) doIsCapsLockEnabled, METH_VARARGS, NULL },
-    { "getAnacondaVersion", (PyCFunction) doGetAnacondaVersion, METH_VARARGS, NULL },
-    { "initLog", (PyCFunction) doInitLog, METH_VARARGS, NULL },
-    { "total_memory", (PyCFunction) doTotalMemory, METH_NOARGS, NULL },
     { "set_system_time", (PyCFunction) doSetSystemTime, METH_VARARGS, NULL},
     { NULL, NULL, 0, NULL }
 } ;
 
-#define BOOT_SIGNATURE	0xaa55	/* boot signature */
-#define BOOT_SIG_OFFSET	510	/* boot signature offset */
-
+/* cppcheck-suppress unusedFunction */
 void init_isys(void) {
     Py_InitModule("_isys", isysModuleMethods);
 }
 
-static int get_bits(unsigned long long v) {
-    int  b = 0;
-    
-    if ( v & 0xffffffff00000000LLU ) { b += 32; v >>= 32; }
-    if ( v & 0xffff0000LLU ) { b += 16; v >>= 16; }
-    if ( v & 0xff00LLU ) { b += 8; v >>= 8; }
-    if ( v & 0xf0LLU ) { b += 4; v >>= 4; }
-    if ( v & 0xcLLU ) { b += 2; v >>= 2; }
-    if ( v & 0x2LLU ) b++;
-    
-    return v ? b + 1 : b;
-}
-
-static PyObject * doDevSpaceFree(PyObject * s, PyObject * args) {
-    char * path;
-    struct statfs sb;
-    unsigned long long size;
-
-    if (!PyArg_ParseTuple(args, "s", &path)) return NULL;
-
-    if (statfs(path, &sb)) {
-	PyErr_SetFromErrno(PyExc_SystemError);
-	return NULL;
-    }
-
-    /* Calculate a saturated addition to prevent oveflow. */
-    if ( get_bits(sb.f_bfree) + get_bits(sb.f_bsize) <= 64 )
-        size = (unsigned long long)sb.f_bfree * sb.f_bsize;
-    else
-        size = ~0LLU;
-
-    return PyLong_FromUnsignedLongLong(size>>20);
-}
-
-static PyObject * doisPseudoTTY(PyObject * s, PyObject * args) {
-    int fd;
-    struct stat sb;
-
-    if (!PyArg_ParseTuple(args, "i", &fd)) return NULL;
-    fstat(fd, &sb);
-
-    /* XXX close enough for now */
-    return Py_BuildValue("i", ((major(sb.st_rdev) >= 136) && (major(sb.st_rdev) <= 143)));
-}
-
-static PyObject * doisVioConsole(PyObject * s) {
-    return Py_BuildValue("i", isVioConsole());
-}
-
 static PyObject * doSync(PyObject * s, PyObject * args) {
     int fd;
 
@@ -174,48 +55,6 @@ static PyObject * doSync(PyObject * s, PyObject * args) {
     return Py_None;
 }
 
-int fileIsIso(const char * file);
-
-static PyObject * doisIsoImage(PyObject * s, PyObject * args) {
-    char * fn;
-    int rc;
-
-    if (!PyArg_ParseTuple(args, "s", &fn)) return NULL;
-
-    rc = fileIsIso(fn);
-    
-    return Py_BuildValue("i", rc);
-}
-
-static PyObject * printObject (PyObject * o, PyObject * args) {
-    PyObject * obj;
-    char buf[256];
-
-    if (!PyArg_ParseTuple(args, "O", &obj))
-	return NULL;
-    
-    snprintf(buf, 256, "<%s object at %lx>", obj->ob_type->tp_name,
-	     (long) obj);
-
-    return PyString_FromString(buf);
-}
-
-static PyObject *
-py_bind_textdomain_codeset(PyObject * o, PyObject * args) {
-    char *domain, *codeset, *ret;
-	
-    if (!PyArg_ParseTuple(args, "ss", &domain, &codeset))
-	return NULL;
-
-    ret = bind_textdomain_codeset(domain, codeset);
-
-    if (ret)
-	return PyString_FromString(ret);
-
-    PyErr_SetFromErrno(PyExc_SystemError);
-    return NULL;
-}
-
 static PyObject * doSegvHandler(PyObject *s, PyObject *args) {
     void *array[20];
     size_t size;
@@ -235,47 +74,6 @@ static PyObject * doSegvHandler(PyObject *s, PyObject *args) {
     exit(1);
 }
 
-static PyObject * doAuditDaemon(PyObject *s) {
-    audit_daemonize();
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args) {
-    Display *d = NULL;
-    XkbStateRec state;
-
-    if ((d = XOpenDisplay(NULL)) == NULL) {
-        PyErr_SetString(PyExc_RuntimeError, "XOpenDisplay failed");
-        return NULL;
-    }
-
-    memset(&state, 0, sizeof(state));
-    XkbGetState(d, XkbUseCoreKbd, &state);
-
-    if (XCloseDisplay(d)) {
-        PyErr_SetString(PyExc_RuntimeError, "XCloseDisplay failed");
-        return NULL;
-    }
-
-    return PyBool_FromLong(state.locked_mods & LockMask);
-}
-
-static PyObject * doGetAnacondaVersion(PyObject * s, PyObject * args) {
-    return Py_BuildValue("s", VERSION);
-}
-
-static PyObject * doInitLog(PyObject * s) {
-    openLog();
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject * doTotalMemory(PyObject * s) {
-    unsigned long long tm = totalMemory();
-    return PyLong_FromUnsignedLongLong(tm);
-}
-
 static PyObject * doSetSystemTime(PyObject *s, PyObject  *args) {
     struct timeval tv;
     tv.tv_usec = 0;
diff --git a/anaconda/pyanaconda/isys/isys.h b/anaconda/pyanaconda/isys/isys.h
deleted file mode 100644
index 980a872..0000000
--- a/anaconda/pyanaconda/isys/isys.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * isys.h
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef H_ISYS
-#define H_ISYS
-
-#define OUTPUT_TERMINAL "/dev/tty5"
-
-int insmod(char * modName, char * path, char ** args);
-int rmmod(char * modName);
-
-/* returns 0 for true, !0 for false */
-int fileIsIso(const char * file);
-
-/* returns 1 if on an iSeries vio console, 0 otherwise */
-int isVioConsole(void);
-
-#endif
diff --git a/anaconda/pyanaconda/isys/lang.c b/anaconda/pyanaconda/isys/lang.c
deleted file mode 100644
index c38b1bb..0000000
--- a/anaconda/pyanaconda/isys/lang.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * lang.c
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <alloca.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <linux/keyboard.h>
-#ifdef NR_KEYS
-#undef NR_KEYS
-#define NR_KEYS 128
-#endif
-
-#include <zlib.h>
-
-#include "linux/kd.h"
-
-#include "isys.h"
-#include "lang.h"
-
-int isysSetUnicodeKeymap(void) {
-    int console;
-
-#if defined (__s390__) || defined (__s390x__)
-    return 0;
-#endif
-    console = open("/dev/console", O_RDWR);
-    if (console < 0)
-	return -EACCES;
-
-    /* place keyboard in unicode mode */
-    ioctl(console, KDSKBMODE, K_UNICODE);
-    close(console);
-    return 0;
-}
-
diff --git a/anaconda/pyanaconda/isys/lang.h b/anaconda/pyanaconda/isys/lang.h
deleted file mode 100644
index aac821a..0000000
--- a/anaconda/pyanaconda/isys/lang.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * lang.h
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ISYS_LANG_H
-#define ISYS_LANG_H
-
-int isysSetUnicodeKeymap(void);
-
-#endif
diff --git a/anaconda/pyanaconda/isys/linkdetect.c b/anaconda/pyanaconda/isys/linkdetect.c
deleted file mode 100644
index f97a291..0000000
--- a/anaconda/pyanaconda/isys/linkdetect.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * linkdetect.c - simple link detection
- *
- * pulls code from mii-tool.c in net-toools and ethtool so
- * that we can do everything that jgarzik says we should check
- *
- * Copyright (C) 2002, 2003  Red Hat, Inc.  All rights reserved.
- * Portions Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): Jeremy Katz <katzj@redhat.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <net/if.h>
-
-#include <linux/sockios.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include "ethtool.h"
-
-static struct ifreq ifr;
-
-static int mdio_read(int skfd, uint16_t location)
-{
-    struct mii_ioctl_data mii;
-
-    memset(&mii, 0, sizeof(mii));
-    memcpy(&mii, &ifr.ifr_data, sizeof(mii));
-    mii.reg_num = location;
-    memcpy(&ifr.ifr_data, &mii, sizeof(mii));
-
-    if (ioctl(skfd, SIOCGMIIREG, &ifr) < 0) {
-#ifdef STANDALONE
-        fprintf(stderr, "SIOCGMIIREG on %s failed: %s\n", ifr.ifr_name,
-                strerror(errno));
-#endif
-        return -1;
-    } else {
-        memcpy(&mii, &ifr.ifr_data, sizeof(mii));
-    }
-
-    return mii.val_out;
-}
-
-/* we don't need writing right now */
-#if 0
-static void mdio_write(int skfd, int location, int value)
-{
-    struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data;
-    mii->reg_num = location;
-    mii->val_in = value;
-    if (ioctl(skfd, SIOCSMIIREG, &ifr) < 0) {
-#ifdef STANDALONE
-	fprintf(stderr, "SIOCSMIIREG on %s failed: %s\n", ifr.ifr_name,
-		strerror(errno));
-#endif
-    }
-}
-#endif
-
-
-
-static int get_mii_link_status(int sock) {
-    int i, mii_val[32];
-
-    if (ioctl(sock, SIOCGMIIPHY, &ifr) < 0) {
-	if (errno != ENODEV)
-#ifdef STANDALONE
-	    fprintf(stderr, "SIOCGMIIPHY on '%s' failed: %s\n",
-		    ifr.ifr_name, strerror(errno));
-#endif
-	return -1;
-    }
-
-    /* Some bits in the BMSR are latched, but we can't rely on being
-       the only reader, so only the current values are meaningful */
-    mdio_read(sock, MII_BMSR);
-    for (i = 0; i < 8; i++)
-	mii_val[i] = mdio_read(sock, i);
-
-    if (mii_val[MII_BMCR] == 0xffff) {
-#ifdef STANDALONE
-	fprintf(stderr, "  No MII transceiver present!.\n");
-#endif
-	return -1;
-    }
-
-    if (mii_val[MII_BMSR] & BMSR_LSTATUS)
-        return 1;
-    else
-        return 0;
-}
-
-static int get_ethtool_link_status(int sock) {
-    struct ethtool_value edata;
-    int rc;
-
-    edata.cmd = ETHTOOL_GLINK;
-    ifr.ifr_data = (caddr_t)&edata;
-    rc = ioctl(sock, SIOCETHTOOL, &ifr);
-    if (rc == 0) {
-        return edata.data;
-    } else if (errno != EOPNOTSUPP) {
-#ifdef STANDALONE
-        fprintf(stderr, "Cannot get link status (%d): %s\n", errno, strerror(errno));
-#endif
-    }
-
-    return -1;
-}
-
-
-
-int get_link_status(char * devname) {
-    int sock, rc;
-
-    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-#ifdef STANDALONE
-        fprintf(stderr, "Error creating socket: %s\n", strerror(errno));
-#endif
-        return -1;
-    }
-
-    /* make sure interface is up and activated */
-    memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, devname);
-
-    if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
-        return -1;
-    }
-
-    ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-
-    if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
-        return -1;
-    }
-
-    /* Setup our control structures. */
-    memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, devname);
-
-    /* check for link with both ethtool and mii registers.  ethtool is
-     * supposed to be the One True Way (tm), but it seems to not work
-     * with much yet :/ */
-
-    rc = get_ethtool_link_status(sock);
-#ifdef STANDALONE
-    printf("ethtool link status of %s is: %d\n", devname, rc);
-#endif
-    if (rc == 1) {
-        close(sock);
-        return 1;
-    }
-
-    rc = get_mii_link_status(sock);
-#ifdef STANDALONE
-    printf("MII link status of %s is: %d\n", devname, rc);
-#endif
-    if (rc == 1) {
-        close(sock);
-        return 1;
-    }
-
-    return 0;
-}
-
-#ifdef STANDALONE
-/* hooray for stupid test programs! */
-int main(int argc, char **argv) {
-    char * dev;
-
-    if (argc >= 2) 
-        dev = argv[1];
-    else
-        dev = strdup("eth0");
-
-    printf("link status of %s is %d\n", dev, get_link_status(dev));
-    return 0;
-}
-#endif
diff --git a/anaconda/pyanaconda/isys/log.c b/anaconda/pyanaconda/isys/log.c
deleted file mode 100644
index c0e8ca4..0000000
--- a/anaconda/pyanaconda/isys/log.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * log.c - logging functionality
- *
- * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): Erik Troan <ewt@redhat.com>
- *            Matt Wilson <msw@redhat.com>
- *            Michael Fulbright <msf@redhat.com>
- *            Jeremy Katz <katzj@redhat.com>
- */
-
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <syslog.h>
-
-#include "log.h"
-
-static FILE * main_log_tty = NULL;
-static FILE * main_log_file = NULL;
-static FILE * program_log_file = NULL;
-static loglevel_t minLevel = INFO;
-static const char * main_tag = "anaconda";
-static const char * program_tag = "program";
-static const int syslog_facility = LOG_LOCAL1;
-
-/* maps our loglevel to syslog loglevel */
-static int mapLogLevel(loglevel_t level)
-{
-    switch (level) {
-    case DEBUGLVL:
-        return LOG_DEBUG;
-    case INFO:
-        return LOG_INFO;
-    case WARNING:
-        return LOG_WARNING;
-    case CRITICAL:
-        return LOG_CRIT;
-    case ERROR:
-    default:
-        /* if someone called us with an invalid level value, log it as an error
-           too. */
-        return LOG_ERR;
-    }
-}
-
-const char *log_level_to_str[] = {
-    [DEBUGLVL] = "DEBUG",
-    [INFO] = "INFO",
-    [WARNING] = "WARN",
-    [ERROR] = "ERR",
-    [CRITICAL] = "CRIT"
-};
-
-static void printLogHeader(loglevel_t level, const char *tag, FILE *outfile) {
-    struct timeval current_time;
-    struct tm *t;
-    int msecs;
-    const char *level_name;
-
-    gettimeofday(&current_time, NULL);
-    t = gmtime(&current_time.tv_sec);
-    msecs = current_time.tv_usec / 1000;
-    level_name = log_level_to_str[level];
-    fprintf(outfile, "%02d:%02d:%02d,%03d %s %s: ", t->tm_hour,
-            t->tm_min, t->tm_sec, msecs, level_name, tag);
-}
-
-static void printLogMessage(loglevel_t level, const char *tag, FILE *outfile, const char *s, va_list ap)
-{
-    printLogHeader(level, tag, outfile);
-
-    va_list apc;
-    va_copy(apc, ap);
-    vfprintf(outfile, s, apc);
-    va_end(apc);
-
-    fprintf(outfile, "\n");
-    fflush(outfile);
-}
-
-static void retagSyslog(const char* new_tag)
-{
-    closelog();
-    openlog(new_tag, 0, syslog_facility);
-}
-
-void logMessageV(enum logger_t logger, loglevel_t level, const char * s, va_list ap) {
-    FILE *log_tty = main_log_tty;
-    FILE *log_file = main_log_file;
-    const char *tag = main_tag;
-    if (logger == PROGRAM_LOG) {
-        /* tty output is done directly for programs */
-        log_tty = NULL;
-        log_file = program_log_file;
-        tag = program_tag;
-        /* close and reopen syslog so we get the tagging right */
-        retagSyslog(tag);
-    }
-
-    va_list apc;
-    /* Log everything into syslog */
-    va_copy(apc, ap);
-    vsyslog(mapLogLevel(level), s, apc);
-    va_end(apc);
-
-    /* Only log to the screen things that are above the minimum level. */
-    if (main_log_tty && level >= minLevel && log_tty) {
-        printLogMessage(level, tag, log_tty, s, ap);
-    }
-
-    /* But log everything to the file. */
-    if (main_log_file) {
-        printLogMessage(level, tag, log_file, s, ap);
-    }
-
-    /* change the syslog tag back to the default again */
-    if (logger == PROGRAM_LOG)
-        retagSyslog(main_tag);
-}
-
-void logMessage(loglevel_t level, const char * s, ...) {
-    va_list args;
-
-    va_start(args, s);
-    logMessageV(MAIN_LOG, level, s, args);
-    va_end(args);
-}
-
-void logProgramMessage(loglevel_t level, const char * s, ...) {
-    va_list args;
-
-    va_start(args, s);
-    logMessageV(PROGRAM_LOG, level, s, args);
-    va_end(args);
-}
-
-int tty_logfd = -1;
-int file_logfd = -1;
-
-void openLog() {
-    /* init syslog logging (so log messages can also be forwarded to a remote
-       syslog daemon */
-    openlog(main_tag, 0, syslog_facility);
-
-    int flags;
-    main_log_tty = fopen("/dev/tty3", "a");
-    main_log_file = fopen("/tmp/anaconda.log", "a");
-    program_log_file = fopen("/tmp/program.log", "a");
-
-    if (main_log_tty) {
-        tty_logfd = fileno(main_log_tty);
-        flags = fcntl(tty_logfd, F_GETFD, 0) | FD_CLOEXEC;
-        fcntl(tty_logfd, F_SETFD, flags);
-    }
-
-    if (main_log_file) {
-        file_logfd = fileno(main_log_file);
-        flags = fcntl(file_logfd, F_GETFD, 0) | FD_CLOEXEC;
-        fcntl(file_logfd, F_SETFD, flags);
-    }
-    
-    if (program_log_file) {
-        int fd;
-        fd = fileno(program_log_file);
-        flags = fcntl(fd, F_GETFD, 0) | FD_CLOEXEC;
-        fcntl(file_logfd, F_SETFD, flags);
-    }
-}
-
-void closeLog(void) {
-    if (main_log_tty)
-        fclose(main_log_tty);
-    if (main_log_file)
-        fclose(main_log_file);
-    if (program_log_file)
-        fclose(program_log_file);
-    main_log_tty = main_log_file = program_log_file = NULL;
-    
-    /* close syslog logger */
-    closelog();
-}
-
-/* set the level.  higher means you see more verbosity */
-void setLogLevel(loglevel_t level) {
-    minLevel = level;
-}
-
-loglevel_t getLogLevel(void) {
-    return minLevel;
-}
-
-/* returns non-null if logging has been initialized */
-int loggingReady(void)
-{
-    return main_log_tty != NULL;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4: */
diff --git a/anaconda/pyanaconda/isys/log.h b/anaconda/pyanaconda/isys/log.h
deleted file mode 100644
index 2ff0d53..0000000
--- a/anaconda/pyanaconda/isys/log.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * log.h
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _LOG_H_
-#define _LOG_H_
-
-#include <stdio.h>
-#include <stdarg.h>
-
-typedef enum {
-    DEBUGLVL,
-    INFO,
-    WARNING,
-    ERROR,
-    CRITICAL
-} loglevel_t;
-
-enum logger_t {
-    MAIN_LOG = 1,
-    PROGRAM_LOG = 2
-};
-
-void logMessageV(enum logger_t logger, loglevel_t level, const char * s, va_list ap)
-    __attribute__ ((format (printf, 3, 0)));
-void logMessage(loglevel_t level, const char * s, ...)
-    __attribute__ ((format (printf, 2, 3)));
-void logProgramMessage(loglevel_t level, const char * s, ...)
-    __attribute__ ((format (printf, 2, 3)));
-void openLog();
-void closeLog(void);
-void setLogLevel(loglevel_t minLevel);
-loglevel_t getLogLevel(void);
-int loggingReady(void);
-
-extern int tty_logfd;
-extern int file_logfd;
-
-#endif /* _LOG_H_ */
diff --git a/anaconda/pyanaconda/isys/mem.c b/anaconda/pyanaconda/isys/mem.c
deleted file mode 100644
index 8b32d9f..0000000
--- a/anaconda/pyanaconda/isys/mem.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * mem.c - memory checking
- *
- * Copyright (C) 2010-2011  Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author(s): Ales Kozumplik <akozumpl@redhat.com>
- *                    David Cantrell <dcantrell@redhat.com>
- */
-
-#include <errno.h>
-#include <glib.h>
-#include <stdlib.h>
-
-#include "mem.h"
-#include "log.h"
-
-/* report total system memory in kB (given to us by /proc/meminfo) */
-guint64 totalMemory(void) {
-    int i = 0, len = 0;
-    guint64 total = 0;
-    unsigned long long int dtotal = 0;
-    gchar *contents = NULL;
-    gchar **lines = NULL, **fields = NULL;
-    GError *fileErr = NULL;
-
-    if (!g_file_get_contents(MEMINFO, &contents, NULL, &fileErr)) {
-        logMessage(ERROR, "error reading %s: %s", MEMINFO, fileErr->message);
-        g_error_free(fileErr);
-        return total;
-    }
-
-    lines = g_strsplit(contents, "\n", 0);
-    g_free(contents);
-
-    for (i = 0; i < g_strv_length(lines); i++) {
-        if (g_str_has_prefix(lines[i], "MemTotal:")) {
-            fields = g_strsplit(lines[i], " ", 0);
-            len = g_strv_length(fields);
-
-            if (len < 3) {
-                logMessage(ERROR, "unknown format for MemTotal line in %s", MEMINFO);
-                g_strfreev(fields);
-                g_strfreev(lines);
-                return total;
-            }
-
-            errno = 0;
-            total = g_ascii_strtoull(fields[len - 2], NULL, 10);
-
-            if ((errno == ERANGE && total == G_MAXUINT64) ||
-                (errno == EINVAL && total == 0)) {
-                logMessage(ERROR, "%s: %d: %m", __func__, __LINE__);
-                abort();
-            }
-
-            g_strfreev(fields);
-            break;
-        }
-    }
-
-    /* Because /proc/meminfo only gives us the MemTotal (total physical RAM
-     * minus the kernel binary code), we need to round this up. Assuming
-     * every machine has the total RAM MB number divisible by 128. */
-    total /= 1024;
-    total = (total / 128 + 1) * 128;
-    total *= 1024;
-
-    dtotal = total;
-    logMessage(INFO, "%lld kB (%lld MB) are available", dtotal, dtotal / 1024);
-
-    return total;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4: */
diff --git a/anaconda/pyanaconda/isys/mem.h b/anaconda/pyanaconda/isys/mem.h
deleted file mode 100644
index 9a5eaa3..0000000
--- a/anaconda/pyanaconda/isys/mem.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * mem.h
- *
- * Copyright (C) 2010-2011  Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author(s): Ales Kozumplik <akozumpl@redhat.com>
- *                    David Cantrell <dcantrell@redhat.com>
- */
-
-#ifndef _MEM_H_
-#define _MEM_H_
-
-#include <glib.h>
-
-#define MEMINFO "/proc/meminfo"
-
-guint64 totalMemory(void);
-
-#endif /* _MEM_H_ */
diff --git a/anaconda/pyanaconda/isys/vio.c b/anaconda/pyanaconda/isys/vio.c
deleted file mode 100644
index 9b06a3e..0000000
--- a/anaconda/pyanaconda/isys/vio.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * vio.c - probing for vio devices on the iSeries (viocd and viodasd)
- *
- * Copyright (C) 2003  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author(s): Jeremy Katz <katzj@redhat.com>
- */
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if defined(__powerpc__)
-static int readFD (int fd, char **buf)
-{
-    char *p;
-    size_t size = 4096;
-    int s, filesize;
-
-    *buf = malloc (size);
-    if (*buf == 0)
-	return -1;
-
-    filesize = 0;
-    do {
-	p = &(*buf) [filesize];
-	s = read (fd, p, 4096);
-	if (s < 0)
-	    break;
-	filesize += s;
-	if (s == 0)
-	    break;
-	size += 4096;
-	*buf = realloc (*buf, size);
-    } while (1);
-
-    if (filesize == 0 && s < 0) {
-	free (*buf);
-	*buf = NULL;
-	return -1;
-    }
-
-    return filesize;
-}
-#endif
-
-int isVioConsole(void) {
-#if !defined(__powerpc__)
-    return 0;
-#else
-    int fd, i;
-    char *buf, *start;
-    char driver[50], device[50];
-    static int isviocons = -1;
-
-    if (isviocons != -1)
-	return isviocons;
-    
-    fd = open("/proc/tty/drivers", O_RDONLY);
-    if (fd < 0) {
-	fprintf(stderr, "failed to open /proc/tty/drivers!\n");
-	return 0;
-    }
-    i = readFD(fd, &buf);
-    if (i < 1) {
-        close(fd);
-	fprintf(stderr, "error reading /proc/tty/drivers!\n");
-        return 0;
-    }
-    close(fd);
-    buf[i] = '\0';
-
-    isviocons = 0;
-    start = buf;
-    while (start && *start) {
-	if (sscanf(start, "%s %s", (char *) &driver, (char *) &device) == 2) {
-	    if (!strcmp(driver, "vioconsole") && !strcmp(device, "/dev/tty")) {
-		isviocons = 1;
-		break;
-	    }
-	}		
-        start = strchr(start, '\n');
-        if (start)
-	    start++;
-    }
-    free(buf);
-    return isviocons;
-#endif
-}
diff --git a/anaconda/pyanaconda/iutil.py b/anaconda/pyanaconda/iutil.py
index 4df02bd..1b04c18 100644
--- a/anaconda/pyanaconda/iutil.py
+++ b/anaconda/pyanaconda/iutil.py
@@ -29,12 +29,16 @@ import subprocess
 import unicodedata
 import string
 import types
+import re
 from threading import Thread
 from Queue import Queue, Empty
+from urllib import quote, unquote
 
 from pyanaconda.flags import flags
-from pyanaconda.constants import DRACUT_SHUTDOWN_EJECT, ROOT_PATH, TRANSLATIONS_UPDATE_DIR, UNSUPPORTED_HW
-from pyanaconda.regexes import PROXY_URL_PARSE
+from pyanaconda.constants import DRACUT_SHUTDOWN_EJECT, TRANSLATIONS_UPDATE_DIR, UNSUPPORTED_HW
+from pyanaconda.regexes import URL_PARSE
+
+from pyanaconda.i18n import _
 
 import logging
 log = logging.getLogger("anaconda")
@@ -45,25 +49,77 @@ from pyanaconda.anaconda_log import program_log_lock
 def augmentEnv():
     env = os.environ.copy()
     env.update({"LC_ALL": "C",
-                "ANA_INSTALL_PATH": ROOT_PATH
+                "ANA_INSTALL_PATH": getSysroot()
                })
     return env
 
-def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None):
+_root_path = "/mnt/sysimage"
+
+def getTargetPhysicalRoot():
+    """Returns the path to the "physical" storage root, traditionally /mnt/sysimage.
+
+    This may be distinct from the sysroot, which could be a
+    chroot-type subdirectory of the physical root.  This is used for
+    example by all OSTree-based installations.
+    """
+
+    # We always use the traditional /mnt/sysimage - the physical OS
+    # target is never mounted anywhere else.  This API call just
+    # allows us to have a clean "git grep ROOT_PATH" in other parts of
+    # the code.
+    return _root_path
+
+def setTargetPhysicalRoot(path):
+    """Change the physical root path
+
+    :param string path: Path to use instead of /mnt/sysimage/
+    """
+    global _root_path
+    _root_path = path
+
+_sysroot = _root_path
+
+def getSysroot():
+    """Returns the path to the target OS installation.
+
+    For ordinary package-based installations, this is the same as the
+    target root.
+    """
+    return _sysroot
+
+def setSysroot(path):
+    """Change the OS root path.
+       :param path: The new OS root path
+
+    This should only be used by Payload subclasses which install operating
+    systems to non-default roots.
+    """
+    global _sysroot
+    _sysroot = path
+
+def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None, log_output=True, binary_output=False):
     """ Run an external program, log the output and return it to the caller
         :param argv: The command to run and argument
         :param root: The directory to chroot to before running command.
         :param stdin: The file object to read stdin from.
         :param stdout: Optional file object to write stdout and stderr to.
         :param env_prune: environment variable to remove before execution
+        :param log_output: whether to log the output of command
+        :param binary_output: whether to treat the output of command as binary data
         :return: The return code of the command and the output
     """
     if env_prune is None:
         env_prune = []
 
+    # Transparently redirect callers requesting root=_root_path to the
+    # configured system root.
+    target_root = root
+    if target_root == _root_path:
+        target_root = getSysroot()
+
     def chroot():
-        if root and root != '/':
-            os.chroot(root)
+        if target_root and target_root != '/':
+            os.chroot(target_root)
             os.chdir("/")
 
     with program_log_lock:
@@ -80,13 +136,21 @@ def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None):
                                     stderr=subprocess.STDOUT,
                                     preexec_fn=chroot, cwd=root, env=env)
 
-            out = proc.communicate()[0]
-            if out:
-                for line in out.splitlines():
-                    program_log.info(line)
+            output_string = proc.communicate()[0]
+            if output_string:
+                if binary_output:
+                    output_lines = [output_string]
+                else:
+                    if output_string[-1] != "\n":
+                        output_string = output_string + "\n"
+                    output_lines = output_string.splitlines(True)
+
+                for line in output_lines:
+                    if log_output:
+                        program_log.info(line.strip())
+
                     if stdout:
                         stdout.write(line)
-                        stdout.write("\n")
 
         except OSError as e:
             program_log.error("Error running %s: %s", argv[0], e.strerror)
@@ -94,10 +158,20 @@ def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None):
 
         program_log.debug("Return code: %d", proc.returncode)
 
-    return (proc.returncode, out)
+    return (proc.returncode, output_string)
+
+def execInSysroot(command, argv, stdin=None):
+    """ Run an external program in the target root.
+        :param command: The command to run
+        :param argv: The argument list
+        :param stdin: The file object to read stdin from.
+        :return: The return code of the command
+    """
+
+    return execWithRedirect(command, argv, stdin=stdin, root=getSysroot())
 
 def execWithRedirect(command, argv, stdin=None, stdout=None,
-                     root='/', env_prune=None):
+                     root='/', env_prune=None, log_output=True, binary_output=False):
     """ Run an external program and redirect the output to a file.
         :param command: The command to run
         :param argv: The argument list
@@ -105,6 +179,8 @@ def execWithRedirect(command, argv, stdin=None, stdout=None,
         :param stdout: Optional file object to redirect stdout and stderr to.
         :param root: The directory to chroot to before running command.
         :param env_prune: environment variable to remove before execution
+        :param log_output: whether to log the output of command
+        :param binary_output: whether to treat the output of command as binary data
         :return: The return code of the command
     """
     if flags.testing:
@@ -113,14 +189,16 @@ def execWithRedirect(command, argv, stdin=None, stdout=None,
         return 0
 
     argv = [command] + argv
-    return _run_program(argv, stdin=stdin, stdout=stdout, root=root, env_prune=env_prune)[0]
+    return _run_program(argv, stdin=stdin, stdout=stdout, root=root, env_prune=env_prune,
+            log_output=log_output, binary_output=binary_output)[0]
 
-def execWithCapture(command, argv, stdin=None, root='/'):
+def execWithCapture(command, argv, stdin=None, root='/', log_output=True):
     """ Run an external program and capture standard out and err.
         :param command: The command to run
         :param argv: The argument list
         :param stdin: The file object to read stdin from.
         :param root: The directory to chroot to before running command.
+        :param log_output: Whether to log the output of command
         :return: The output of the command
     """
     if flags.testing:
@@ -129,7 +207,7 @@ def execWithCapture(command, argv, stdin=None, root='/'):
         return ""
 
     argv = [command] + argv
-    return _run_program(argv, stdin=stdin, root=root)[1]
+    return _run_program(argv, stdin=stdin, root=root, log_output=log_output)[1]
 
 def execReadlines(command, argv, stdin=None, root='/', env_prune=None):
     """ Execute an external command and return the line output of the command
@@ -190,6 +268,8 @@ def execReadlines(command, argv, stdin=None, root='/', env_prune=None):
             q.task_done()
         except Empty:
             if proc.poll() is not None:
+                if os.WIFSIGNALED(proc.returncode):
+                    raise OSError("process '%s' was killed" % argv)
                 break
     q.join()
 
@@ -249,7 +329,7 @@ def mkdirChain(directory):
     """
 
     try:
-        os.makedirs(directory, 0755)
+        os.makedirs(directory, 0o755)
     except OSError as e:
         try:
             if e.errno == errno.EEXIST and stat.S_ISDIR(os.stat(directory).st_mode):
@@ -280,22 +360,6 @@ def isConsoleOnVirtualTerminal(dev="console"):
     consoletype = console.rstrip('0123456789') # remove the number
     return consoletype == 'tty'
 
-def strip_markup(text):
-    if text.find("<") == -1:
-        return text
-    r = ""
-    inTag = False
-    for c in text:
-        if c == ">" and inTag:
-            inTag = False
-            continue
-        elif c == "<" and not inTag:
-            inTag = True
-            continue
-        elif not inTag:
-            r += c
-    return r.encode("utf-8")
-
 def reIPL(ipldev):
     try:
         rc = execWithRedirect("chreipl", ["node", "/dev/" + ipldev])
@@ -310,7 +374,7 @@ def reIPL(ipldev):
         log.info("reIPL configuration successful")
 
 def resetRpmDb():
-    for rpmfile in glob.glob("%s/var/lib/rpm/__db.*" % ROOT_PATH):
+    for rpmfile in glob.glob("%s/var/lib/rpm/__db.*" % getSysroot()):
         try:
             os.unlink(rpmfile)
         except OSError as e:
@@ -363,7 +427,7 @@ def fork_orphan():
             os._exit(0)
         return 0
     # the original process waits for the intermediate child
-    os.waitpid(intermediate, 0)
+    eintr_retry_call(os.waitpid, intermediate, 0)
     return 1
 
 def _run_systemctl(command, service):
@@ -413,7 +477,7 @@ def dracut_eject(device):
 
         f.write("eject %s\n" % (device,))
         f.close()
-        os.chmod(DRACUT_SHUTDOWN_EJECT, 0755)
+        eintr_retry_call(os.chmod, DRACUT_SHUTDOWN_EJECT, 0o755)
         log.info("Wrote dracut shutdown eject hook for %s", device)
     except (IOError, OSError) as e:
         log.error("Error writing dracut shutdown eject hook for %s: %s", device, e)
@@ -474,7 +538,7 @@ class ProxyString(object):
         if url:
             self.parse_url()
         elif not host:
-            raise ProxyStringError("No host url")
+            raise ProxyStringError(_("No host url"))
         else:
             self.parse_components()
 
@@ -483,39 +547,35 @@ class ProxyString(object):
         """
         # NOTE: If this changes, update tests/regex/proxy.py
         #
-        # proxy=[protocol://][username[:password]@]host[:port][path]
-        # groups
+        # proxy=[protocol://][username[:password]@]host[:port][path][?query][#fragment]
+        # groups (both named and numbered)
         # 1 = protocol
-        # 2 = username:password@
-        # 3 = username
-        # 4 = password
-        # 5 = hostname
-        # 6 = port
-        # 7 = extra
-        m = PROXY_URL_PARSE.match(self.url)
+        # 2 = username
+        # 3 = password
+        # 4 = host
+        # 5 = port
+        # 6 = path
+        # 7 = query
+        # 8 = fragment
+        m = URL_PARSE.match(self.url)
         if not m:
-            raise ProxyStringError("malformed url, cannot parse it.")
+            raise ProxyStringError(_("malformed URL, cannot parse it."))
 
         # If no protocol was given default to http.
-        if m.group(1):
-            self.protocol = m.group(1)
+        self.protocol = m.group("protocol") or "http://"
+
+        if m.group("username"):
+            self.username = unquote(m.group("username"))
+
+        if m.group("password"):
+            self.password = unquote(m.group("password"))
+
+        if m.group("host"):
+            self.host = m.group("host")
+            if m.group("port"):
+                self.port = m.group("port")
         else:
-            self.protocol = "http://"
-
-        if m.group(3):
-            self.username = m.group(3)
-
-        if m.group(4):
-            # Skip the leading colon
-            self.password = m.group(4)[1:]
-
-        if m.group(5):
-            self.host = m.group(5)
-            if m.group(6):
-                # Skip the leading colon
-                self.port = m.group(6)[1:]
-        else:
-            raise ProxyStringError("url has no host component")
+            raise ProxyStringError(_("URL has no host component"))
 
         self.parse_components()
 
@@ -523,8 +583,8 @@ class ProxyString(object):
         """ Parse the components of a proxy url into url and noauth_url
         """
         if self.username or self.password:
-            self.proxy_auth = "%s:%s@" % (self.username or "",
-                                          self.password or "")
+            self.proxy_auth = "%s:%s@" % (quote(self.username) or "",
+                                          quote(self.password) or "")
 
         self.url = self.protocol + self.proxy_auth + self.host + ":" + self.port
         self.noauth_url = self.protocol + self.host + ":" + self.port
@@ -678,11 +738,11 @@ def chown_dir_tree(root, uid, gid, from_uid_only=None, from_gid_only=None):
             return
 
         # UID and GID matching or not required
-        os.chown(path, uid, gid)
+        eintr_retry_call(os.chown, path, uid, gid)
 
     if not from_uid_only and not from_gid_only:
         # the easy way
-        dir_tree_map(root, lambda path: os.chown(path, uid, gid))
+        dir_tree_map(root, lambda path: eintr_retry_call(os.chown, path, uid, gid))
     else:
         # conditional chown
         dir_tree_map(root, lambda path: conditional_chown(path, uid, gid,
@@ -763,6 +823,13 @@ def upcase_first_letter(text):
     else:
         return text[0].upper() + text[1:]
 
+def get_mount_paths(devnode):
+    '''given a device node, return a list of all active mountpoints.'''
+    devno = os.stat(devnode).st_rdev
+    majmin = "%d:%d" % (os.major(devno),os.minor(devno))
+    mountinfo = (line.split() for line in open("/proc/self/mountinfo"))
+    return [info[4] for info in mountinfo if info[2] == majmin]
+
 def have_word_match(str1, str2):
     """Tells if all words from str1 exist in str2 or not."""
 
@@ -777,8 +844,70 @@ def have_word_match(str1, str2):
         # non-empty string cannot be found in an empty string
         return False
 
+    # Convert both arguments to unicode if not already
+    if isinstance(str1, str):
+        str1 = str1.decode('utf-8')
+    if isinstance(str2, str):
+        str2 = str2.decode('utf-8')
+
     str1 = str1.lower()
     str1_words = str1.split()
     str2 = str2.lower()
 
     return all(word in str2 for word in str1_words)
+
+class DataHolder(dict):
+    """ A dict that lets you also access keys using dot notation. """
+    def __init__(self, **kwargs):
+        """ kwargs are set as keys for the dict. """
+        dict.__init__(self)
+
+        for attr, value in kwargs.items():
+            self[attr] = value
+
+    def __getattr__(self, attr):
+        return self[attr]
+
+    def __setattr__(self, attr, value):
+        self[attr] = value
+
+    def copy(self):
+        return DataHolder(**dict.copy(self))
+
+def xprogressive_delay():
+    """ A delay generator, the delay starts short and gets longer
+        as the internal counter increases.
+        For example for 10 retries, the delay will increases from
+        0.5 to 256 seconds.
+
+        :param int retry_number: retry counter
+        :returns float: time to wait in seconds
+    """
+    counter = 1
+    while True:
+        yield 0.25*(2**counter)
+        counter += 1
+
+def persistent_root_image():
+    """:returns: whether we are running from a persistent (not in RAM) root.img"""
+
+    for line in execReadlines("losetup", ["--list"]):
+        # if there is an active loop device for a curl-fetched file that has
+        # been deleted, it means we run from a non-persistent root image
+        # EXAMPLE line:
+        # /dev/loop0  0 0 0 1 /tmp/curl_fetch_url0/my_comps_squashfs.img (deleted)
+        if re.match(r'.*curl_fetch_url.*\(deleted\)\s*$', line):
+            return False
+
+    return True
+
+# Copied from python's subprocess.py
+def eintr_retry_call(func, *args):
+    """Retry an interruptible system call if interrupted."""
+    while True:
+        try:
+            return func(*args)
+        except (OSError, IOError) as e:
+            if e.errno == errno.EINTR:
+                continue
+            raise
diff --git a/anaconda/pyanaconda/keyboard.py b/anaconda/pyanaconda/keyboard.py
index 21505a2..1f3e572 100644
--- a/anaconda/pyanaconda/keyboard.py
+++ b/anaconda/pyanaconda/keyboard.py
@@ -20,36 +20,22 @@
 #
 
 """
-This module include functions and classes for dealing with multiple layouts in
-Anaconda. It wraps the libxklavier functionality to protect Anaconda from
-dealing with its "nice" API that looks like a Lisp-influenced "good old C" and
-also systemd-localed functionality.
-
-It provides a XklWrapper class with several methods that can be used for listing
-and various modifications of keyboard layouts settings and LocaledWrapper class
-with methods for setting, getting and mutually converting X layouts and VConsole
-keymaps.
+This module provides functions for dealing with keyboard layouts/keymaps in
+Anaconda and the LocaledWrapper class with methods for setting, getting and
+mutually converting X layouts and VConsole keymaps.
 
 """
 
-import types
 import os
 import re
 import shutil
-import ctypes
-import gettext
-import threading
-
-from collections import namedtuple
 
 from pyanaconda import iutil
-from pyanaconda import flags
-from pyanaconda.safe_dbus import dbus_call_safe_sync, dbus_get_property_safe_sync
-from pyanaconda.safe_dbus import DBUS_SYSTEM_BUS_ADDR, DBusPropertyError
-from pyanaconda.constants import DEFAULT_VC_FONT, DEFAULT_KEYBOARD, THREAD_XKL_WRAPPER_INIT
-from pyanaconda.threads import threadMgr, AnacondaThread
+from pyanaconda import safe_dbus
+from pyanaconda.constants import DEFAULT_VC_FONT, DEFAULT_KEYBOARD
+from pyanaconda.flags import can_touch_runtime_system
 
-from gi.repository import Xkl, Gio, GLib
+from gi.repository import GLib
 
 import logging
 log = logging.getLogger("anaconda")
@@ -64,12 +50,6 @@ LAYOUT_VARIANT_RE = re.compile(r'^\s*(\w+)\s*' # layout plus
                                r'(?:(?:\(\s*([-\w]+)\s*\))' # variant in parentheses
                                r'|(?:$))\s*') # or nothing
 
-# namedtuple for information about a keyboard layout (its language and description)
-LayoutInfo = namedtuple("LayoutInfo", ["lang", "desc"])
-
-Xkb_ = lambda x: gettext.ldgettext("xkeyboard-config", x)
-iso_ = lambda x: gettext.ldgettext("iso_639", x)
-
 class KeyboardConfigError(Exception):
     """Exception class for keyboard configuration related problems"""
 
@@ -107,7 +87,7 @@ def parse_layout_variant(layout_variant_str):
     # groups may be (layout, None) if no variant was specified
     return (layout, variant or "")
 
-def _join_layout_variant(layout, variant=""):
+def join_layout_variant(layout, variant=""):
     """
     Join layout and variant to form the commonly used 'layout (variant)'
     or 'layout' (if variant is missing) format.
@@ -137,13 +117,13 @@ def normalize_layout_variant(layout_str):
     """
 
     layout, variant = parse_layout_variant(layout_str)
-    return _join_layout_variant(layout, variant)
+    return join_layout_variant(layout, variant)
 
 def populate_missing_items(keyboard):
     """
-    Function that populates keyboard.vc_keymap and keyboard.x_layouts if
-    they are missing. By invoking LocaledWrapper's methods this function
-    MODIFIES CONFIGURATION FILES.
+    Function that populates keyboard.vc_keymap and keyboard.x_layouts if they
+    are missing. By invoking LocaledWrapper's methods this function READS AND
+    WRITES CONFIGURATION FILES (but tries to keep their content unchanged).
 
     :type keyboard: ksdata.keyboard object
 
@@ -151,14 +131,18 @@ def populate_missing_items(keyboard):
 
     localed = LocaledWrapper()
 
+    if keyboard._keyboard and not (keyboard.vc_keymap or keyboard.x_layouts):
+        # we were given just a value in the old format, use it as a vc_keymap
+        keyboard.vc_keymap = keyboard._keyboard
+
     if keyboard.x_layouts and not keyboard.vc_keymap:
-        keyboard.vc_keymap = localed.set_and_convert_layout(keyboard.x_layouts[0])
+        keyboard.vc_keymap = localed.convert_layout(keyboard.x_layouts[0])
 
     if not keyboard.vc_keymap:
         keyboard.vc_keymap = DEFAULT_KEYBOARD
 
     if not keyboard.x_layouts:
-        c_lay_var = localed.set_and_convert_keymap(keyboard.vc_keymap)
+        c_lay_var = localed.convert_keymap(keyboard.vc_keymap)
         keyboard.x_layouts.append(c_lay_var)
 
 def write_keyboard_config(keyboard, root, convert=True):
@@ -255,14 +239,6 @@ def write_keyboard_config(keyboard, root, convert=True):
     if errors:
         raise KeyboardConfigError("\n".join(errors))
 
-def dracut_setup_args():
-    """Function returning dracut setup args."""
-
-    args = set()
-    args.add("vconsole.font=%s" % DEFAULT_VC_FONT)
-
-    return args
-
 def _try_to_load_keymap(keymap):
     """
     Method that tries to load keymap and returns boolean indicating if it was
@@ -300,7 +276,7 @@ def activate_keyboard(keyboard):
     """
 
     localed = LocaledWrapper()
-    c_lay_var = ""
+    c_lays_vars = []
     c_keymap = ""
 
     if keyboard._keyboard and not (keyboard.vc_keymap or keyboard.x_layouts):
@@ -321,13 +297,16 @@ def activate_keyboard(keyboard):
             keyboard.vc_keymap = None
         else:
             # activate VConsole keymap and get converted layout and variant
-            c_lay_var = localed.set_and_convert_keymap(keyboard.vc_keymap)
+            converted = localed.set_and_convert_keymap(keyboard.vc_keymap)
+
+            # localed may give us multiple comma-separated layouts+variants
+            c_lays_vars = converted.split(",")
 
     if not keyboard.x_layouts:
-        if c_lay_var:
+        if c_lays_vars:
             # suggested by systemd-localed for a requested VConsole keymap
-            keyboard.x_layouts.append(c_lay_var)
-        if keyboard.vc_keymap:
+            keyboard.x_layouts += c_lays_vars
+        elif keyboard.vc_keymap:
             # nothing suggested by systemd-localed, but we may try to use the
             # same string for both VConsole keymap and X layout (will fail
             # safely if it doesn't work)
@@ -342,360 +321,6 @@ def activate_keyboard(keyboard):
         # write out keyboard configuration for the X session
         write_keyboard_config(keyboard, root="/", convert=False)
 
-def background_XklWrapper_initialize():
-    """
-    Create the XklWrapper singleton instance in a separate thread to save time
-    when it's really needed.
-
-    """
-
-    threadMgr.add(AnacondaThread(name=THREAD_XKL_WRAPPER_INIT, target=XklWrapper.get_instance))
-
-def item_str(s):
-    """Convert a zero-terminated byte array to a proper str"""
-
-    # depending of version of libxklavier and the tools generating introspection
-    # data the value of 's' can be either byte string or list of integers
-    if type(s) == types.StringType:
-        i = s.find(b'\x00')
-        s = s[:i]
-    elif type(s) == types.ListType:
-        # XXX: this is the wrong case that should be fixed (rhbz#920595)
-        i = s.index(0)
-        s = "".join(chr(ctypes.c_uint8(char).value) for char in s[:i])
-
-    return s.decode("utf-8") #there are some non-ascii layout descriptions
-
-class XklWrapperError(KeyboardConfigError):
-    """Exception class for reporting libxklavier-related problems"""
-
-    pass
-
-class XklWrapper(object):
-    """
-    Class wrapping the libxklavier functionality
-
-    Use this class as a singleton class because it provides read-only data
-    and initialization (that takes quite a lot of time) reads always the
-    same data. It doesn't have sense to make multiple instances
-
-    """
-
-    _instance = None
-    _instance_lock = threading.Lock()
-
-    @staticmethod
-    def get_instance():
-        with XklWrapper._instance_lock:
-            if not XklWrapper._instance:
-                XklWrapper._instance = XklWrapper()
-
-        return XklWrapper._instance
-
-    def __init__(self):
-        from gi.repository import GdkX11
-
-        #initialize Xkl-related stuff
-        display = GdkX11.x11_get_default_xdisplay()
-        self._engine = Xkl.Engine.get_instance(display)
-
-        self._rec = Xkl.ConfigRec()
-        if not self._rec.get_from_server(self._engine):
-            raise XklWrapperError("Failed to get configuration from server")
-
-        #X is probably initialized to the 'us' layout without any variant and
-        #since we want to add layouts with variants we need the layouts and
-        #variants lists to have the same length. Add "" padding to variants.
-        #See docstring of the add_layout method for details.
-        diff = len(self._rec.layouts) - len(self._rec.variants)
-        if diff > 0 and flags.can_touch_runtime_system("activate layouts"):
-            self._rec.set_variants(self._rec.variants + (diff * [""]))
-            if not self._rec.activate(self._engine):
-                # failed to activate layouts given e.g. by a kickstart (may be
-                # invalid)
-                lay_var_str = ",".join(map(_join_layout_variant,
-                                           self._rec.layouts,
-                                           self._rec.variants))
-                log.error("Failed to activate layouts: '%s', "
-                          "falling back to default %s", lay_var_str, DEFAULT_KEYBOARD)
-                self._rec.set_layouts([DEFAULT_KEYBOARD])
-                self._rec.set_variants([""])
-
-                if not self._rec.activate(self._engine):
-                    # failed to activate even the default layout, something is
-                    # really wrong
-                    raise XklWrapperError("Failed to initialize layouts")
-
-        #needed also for Gkbd.KeyboardDrawingDialog
-        self.configreg = Xkl.ConfigRegistry.get_instance(self._engine)
-        self.configreg.load(False)
-
-        self._layout_infos = dict()
-        self._switch_opt_infos = dict()
-
-        #this might take quite a long time
-        self.configreg.foreach_language(self._get_language_variants, None)
-        self.configreg.foreach_country(self._get_country_variants, None)
-
-        #'grp' means that we want layout (group) switching options
-        self.configreg.foreach_option('grp', self._get_switch_option, None)
-
-    def _get_lang_variant(self, c_reg, item, subitem, lang):
-        if subitem:
-            name = item_str(item.name) + " (" + item_str(subitem.name) + ")"
-            description = item_str(subitem.description)
-        else:
-            name = item_str(item.name)
-            description = item_str(item.description)
-
-        #if this layout has already been added for some other language,
-        #do not add it again (would result in duplicates in our lists)
-        if name not in self._layout_infos:
-            self._layout_infos[name] = LayoutInfo(lang.encode("utf-8"),
-                                                  description.encode("utf-8"))
-
-    def _get_country_variant(self, c_reg, item, subitem, country):
-        if subitem:
-            name = item_str(item.name) + " (" + item_str(subitem.name) + ")"
-            description = item_str(subitem.description)
-        else:
-            name = item_str(item.name)
-            description = item_str(item.description)
-
-        # if the layout was not added with any language, add it with a country
-        if name not in self._layout_infos:
-            self._layout_infos[name] = LayoutInfo(country.encode("utf-8"),
-                                                  description.encode("utf-8"))
-
-    def _get_language_variants(self, c_reg, item, user_data=None):
-        lang_name, lang_desc = item_str(item.name), item_str(item.description)
-
-        c_reg.foreach_language_variant(lang_name, self._get_lang_variant, lang_desc)
-
-    def _get_country_variants(self, c_reg, item, user_data=None):
-        country_name, country_desc = item_str(item.name), item_str(item.description)
-
-        c_reg.foreach_country_variant(country_name, self._get_country_variant,
-                                      country_desc)
-
-    def _get_switch_option(self, c_reg, item, user_data=None):
-        """Helper function storing layout switching options in foreach cycle"""
-        desc = item_str(item.description)
-        name = item_str(item.name)
-
-        self._switch_opt_infos[name] = desc.encode("utf-8")
-
-    def get_current_layout(self):
-        """
-        Get current activated X layout and variant
-
-        :return: current activated X layout and variant (e.g. "cz (qwerty)")
-
-        """
-        # ported from the widgets/src/LayoutIndicator.c code
-
-        self._engine.start_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
-        state = self._engine.get_current_state()
-        cur_group = state.group
-        num_groups = self._engine.get_num_groups()
-
-        # BUG?: if the last layout in the list is activated and removed,
-        #       state.group may be equal to n_groups
-        if cur_group >= num_groups:
-            cur_group = num_groups - 1
-
-        layout = self._rec.layouts[cur_group]
-        try:
-            variant = self._rec.variants[cur_group]
-        except IndexError:
-            # X server may have forgotten to add the "" variant for its default layout
-            variant = ""
-
-        self._engine.stop_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
-
-        return _join_layout_variant(layout, variant)
-
-    def get_available_layouts(self):
-        """A generator yielding layouts (no need to store them as a bunch)"""
-
-        return self._layout_infos.iterkeys()
-
-    def get_switching_options(self):
-        """Method returning list of available layout switching options"""
-
-        return self._switch_opt_infos.iterkeys()
-
-    def get_layout_variant_description(self, layout_variant, with_lang=True, xlated=True):
-        """
-        Get description of the given layout-variant.
-
-        :param layout_variant: layout-variant specification (e.g. 'cz (qwerty)')
-        :type layout_variant: str
-        :param with_lang: whether to include language of the layout-variant (if defined)
-                          in the description or not
-        :type with_lang: bool
-        :param xlated: whethe to return translated or english version of the description
-        :type xlated: bool
-        :return: description of the layout-variant specification (e.g. 'Czech (qwerty)')
-        :rtype: str
-
-        """
-
-        layout_info = self._layout_infos[layout_variant]
-
-        # translate language and upcase its first letter, translate the
-        # layout-variant description
-        if xlated:
-            lang = iutil.upcase_first_letter(iso_(layout_info.lang).decode("utf-8"))
-            description = Xkb_(layout_info.desc).decode("utf-8")
-        else:
-            lang = iutil.upcase_first_letter(layout_info.lang)
-            description = layout_info.desc
-
-        if with_lang and lang and not description.startswith(lang):
-            return "%s (%s)" % (lang, description)
-        else:
-            return description
-
-    def get_switch_opt_description(self, switch_opt):
-        """
-        Get description of the given layout switching option.
-
-        :param switch_opt: switching option name/ID (e.g. 'grp:alt_shift_toggle')
-        :type switch_opt: str
-        :return: description of the layout switching option (e.g. 'Alt + Shift')
-        :rtype: str
-
-        """
-
-        # translate the description of the switching option
-        return Xkb_(self._switch_opt_infos[switch_opt])
-
-    def activate_default_layout(self):
-        """
-        Activates default layout (the first one in the list of configured
-        layouts).
-
-        """
-
-        self._engine.lock_group(0)
-
-    def is_valid_layout(self, layout):
-        """Return if given layout is valid layout or not"""
-
-        return layout in self._layout_infos
-
-    def add_layout(self, layout):
-        """
-        Method that tries to add a given layout to the current X configuration.
-
-        The X layouts configuration is handled by two lists. A list of layouts
-        and a list of variants. Index-matching items in these lists (as if they
-        were zipped) are used for the construction of real layouts (e.g.
-        'cz (qwerty)').
-
-        :param layout: either 'layout' or 'layout (variant)'
-        :raise XklWrapperError: if the given layout is invalid or cannot be added
-
-        """
-
-        try:
-            #we can get 'layout' or 'layout (variant)'
-            (layout, variant) = parse_layout_variant(layout)
-        except InvalidLayoutVariantSpec as ilverr:
-            raise XklWrapperError("Failed to add layout: %s" % ilverr)
-
-        #do not add the same layout-variant combinanion multiple times
-        if (layout, variant) in zip(self._rec.layouts, self._rec.variants):
-            return
-
-        self._rec.set_layouts(self._rec.layouts + [layout])
-        self._rec.set_variants(self._rec.variants + [variant])
-
-        if not self._rec.activate(self._engine):
-            raise XklWrapperError("Failed to add layout '%s (%s)'" % (layout,
-                                                                      variant))
-
-    def remove_layout(self, layout):
-        """
-        Method that tries to remove a given layout from the current X
-        configuration.
-
-        See also the documentation for the add_layout method.
-
-        :param layout: either 'layout' or 'layout (variant)'
-        :raise XklWrapperError: if the given layout cannot be removed
-
-        """
-
-        #we can get 'layout' or 'layout (variant)'
-        (layout, variant) = parse_layout_variant(layout)
-
-        layouts_variants = zip(self._rec.layouts, self._rec.variants)
-
-        if not (layout, variant) in layouts_variants:
-            msg = "'%s (%s)' not in the list of added layouts" % (layout,
-                                                                  variant)
-            raise XklWrapperError(msg)
-
-        idx = layouts_variants.index((layout, variant))
-        new_layouts = self._rec.layouts[:idx] + self._rec.layouts[(idx + 1):]
-        new_variants = self._rec.variants[:idx] + self._rec.variants[(idx + 1):]
-
-        self._rec.set_layouts(new_layouts)
-        self._rec.set_variants(new_variants)
-
-        if not self._rec.activate(self._engine):
-            raise XklWrapperError("Failed to remove layout '%s (%s)'" % (layout,
-                                                                       variant))
-    def replace_layouts(self, layouts_list):
-        """
-        Method that replaces the layouts defined in the current X configuration
-        with the new ones given.
-
-        :param layouts_list: list of layouts defined as either 'layout' or
-                             'layout (variant)'
-        :raise XklWrapperError: if layouts cannot be replaced with the new ones
-
-        """
-
-        new_layouts = list()
-        new_variants = list()
-
-        for layout_variant in layouts_list:
-            (layout, variant) = parse_layout_variant(layout_variant)
-            new_layouts.append(layout)
-            new_variants.append(variant)
-
-        self._rec.set_layouts(new_layouts)
-        self._rec.set_variants(new_variants)
-
-        if not self._rec.activate(self._engine):
-            msg = "Failed to replace layouts with: %s" % ",".join(layouts_list)
-            raise XklWrapperError(msg)
-
-    def set_switching_options(self, options):
-        """
-        Method that sets options for layout switching. It replaces the old
-        options with the new ones.
-
-        :param options: layout switching options to be set
-        :type options: list or generator
-        :raise XklWrapperError: if the old options cannot be replaced with the
-                                new ones
-
-        """
-
-        #preserve old "non-switching options"
-        new_options = [opt for opt in self._rec.options if "grp:" not in opt]
-        new_options += options
-
-        self._rec.set_options(new_options)
-
-        if not self._rec.activate(self._engine):
-            msg = "Failed to set switching options to: %s" % ",".join(options)
-            raise XklWrapperError(msg)
-
 class LocaledWrapperError(KeyboardConfigError):
     """Exception class for reporting Localed-related problems"""
     pass
@@ -708,21 +333,24 @@ class LocaledWrapper(object):
     """
 
     def __init__(self):
-        self._connection = Gio.DBusConnection.new_for_address_sync(
-                             DBUS_SYSTEM_BUS_ADDR,
-                             Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT|
-                             Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION,
-                             None, None)
+        try:
+            self._connection = safe_dbus.get_new_system_connection()
+        except GLib.GError as e:
+            if can_touch_runtime_system("raise GLib.GError", touch_live=True):
+                raise
+
+            log.error("Failed to get safe_dbus connection: %s", e)
+            self._connection = None
 
     @property
     def keymap(self):
         try:
-            keymap = dbus_get_property_safe_sync(LOCALED_SERVICE,
+            keymap = safe_dbus.get_property_sync(LOCALED_SERVICE,
                                                  LOCALED_OBJECT_PATH,
                                                  LOCALED_IFACE,
                                                  "VConsoleKeymap",
                                                  self._connection)
-        except DBusPropertyError:
+        except (safe_dbus.DBusPropertyError, safe_dbus.DBusCallError):
             # no value for the property
             log.error("Failed to get the value for the systemd-localed's "
                       "VConsoleKeymap property")
@@ -734,24 +362,24 @@ class LocaledWrapper(object):
     @property
     def layouts_variants(self):
         try:
-            layouts = dbus_get_property_safe_sync(LOCALED_SERVICE,
+            layouts = safe_dbus.get_property_sync(LOCALED_SERVICE,
                                                   LOCALED_OBJECT_PATH,
                                                   LOCALED_IFACE,
                                                   "X11Layout",
                                                   self._connection)
-        except DBusPropertyError:
+        except (safe_dbus.DBusPropertyError, safe_dbus.DBusCallError):
             # no value for the property
             log.error("Failed to get the value for the systemd-localed's "
                       "X11Layout property")
             return [""]
 
         try:
-            variants = dbus_get_property_safe_sync(LOCALED_SERVICE,
+            variants = safe_dbus.get_property_sync(LOCALED_SERVICE,
                                                    LOCALED_OBJECT_PATH,
                                                    LOCALED_IFACE,
                                                    "X11Variant",
                                                    self._connection)
-        except DBusPropertyError:
+        except (safe_dbus.DBusPropertyError, safe_dbus.DBusCallError):
             # no value for the property
             log.error("Failed to get the value for the systemd-localed's "
                       "X11Variant property")
@@ -768,18 +396,21 @@ class LocaledWrapper(object):
         diff = len(layouts) - len(variants)
         variants.extend(diff * [""])
 
+        # if there are more variants than layouts, throw the trailing ones away
+        variants = variants[:len(layouts)]
+
         # map can be used with multiple lists and works like zipWith (Haskell)
-        return map(_join_layout_variant, layouts, variants)
+        return map(join_layout_variant, layouts, variants)
 
     @property
     def options(self):
         try:
-            options = dbus_get_property_safe_sync(LOCALED_SERVICE,
+            options = safe_dbus.get_property_sync(LOCALED_SERVICE,
                                                   LOCALED_OBJECT_PATH,
                                                   LOCALED_IFACE,
                                                   "X11Options",
                                                   self._connection)
-        except DBusPropertyError:
+        except (safe_dbus.DBusPropertyError, safe_dbus.DBusCallError):
             # no value for the property
             log.error("Failed to get the value for the systemd-localed's "
                       "X11Options property")
@@ -806,8 +437,32 @@ class LocaledWrapper(object):
         # should ask for credentials or not
         args = GLib.Variant('(ssbb)', (keymap, "", convert, False))
 
-        dbus_call_safe_sync(LOCALED_SERVICE, LOCALED_OBJECT_PATH, LOCALED_IFACE,
-                            "SetVConsoleKeyboard", args, self._connection)
+        try:
+            safe_dbus.call_sync(LOCALED_SERVICE, LOCALED_OBJECT_PATH, LOCALED_IFACE,
+                                "SetVConsoleKeyboard", args, self._connection)
+        except safe_dbus.DBusCallError as e:
+            log.error("Failed to set keymap: %s", e)
+
+    def convert_keymap(self, keymap):
+        """
+        Method that returns X11 layouts and variants that (systemd-localed
+        thinks) match given keymap best.
+
+        :param keymap: VConsole keymap
+        :type keymap: str
+        :return: X11 layouts and variants that (systemd-localed thinks) match
+                 given keymap best
+        :rtype: str
+
+        """
+
+        # hack around systemd's lack of functionality -- no function to just
+        # convert without changing keyboard configuration
+        orig_keymap = self.keymap
+        ret = self.set_and_convert_keymap(keymap)
+        self.set_keymap(orig_keymap)
+
+        return ret
 
     def set_and_convert_keymap(self, keymap):
         """
@@ -843,7 +498,8 @@ class LocaledWrapper(object):
         layouts = []
         variants = []
 
-        for layout_variant in layouts_variants:
+        for layout_variant in (nonempty for nonempty in layouts_variants
+                               if nonempty):
             (layout, variant) = parse_layout_variant(layout_variant)
             layouts.append(layout)
             variants.append(variant)
@@ -861,8 +517,11 @@ class LocaledWrapper(object):
         # should ask for credentials or not
         args = GLib.Variant("(ssssbb)", (layouts_str, "", variants_str, opts_str,
                                          convert, False))
-        dbus_call_safe_sync(LOCALED_SERVICE, LOCALED_OBJECT_PATH, LOCALED_IFACE,
-                            "SetX11Keyboard", args, self._connection)
+        try:
+            safe_dbus.call_sync(LOCALED_SERVICE, LOCALED_OBJECT_PATH, LOCALED_IFACE,
+                                "SetX11Keyboard", args, self._connection)
+        except safe_dbus.DBusCallError as e:
+            log.error("Failed to set layouts: %s", e)
 
     def set_and_convert_layout(self, layout_variant):
         """
@@ -878,3 +537,24 @@ class LocaledWrapper(object):
         self.set_layouts([layout_variant], convert=True)
 
         return self.keymap
+
+    def convert_layout(self, layout_variant):
+        """
+        Method that returns VConsole keymap that (systemd-localed thinks)
+        matches given layout and variant best.
+
+        :param layout_variant: 'layout (variant)' or 'layout' specification
+        :type layout_variant: str
+        :return: a keymap matching layout and variant best
+        :rtype: string
+
+        """
+
+        # hack around systemd's lack of functionality -- no function to just
+        # convert without changing keyboard configuration
+        orig_layouts_variants = self.layouts_variants
+        ret = self.set_and_convert_layout(layout_variant)
+        self.set_layouts(orig_layouts_variants)
+
+        return ret
+
diff --git a/anaconda/pyanaconda/kickstart.py b/anaconda/pyanaconda/kickstart.py
index 5d8e9cc..21f4875 100644
--- a/anaconda/pyanaconda/kickstart.py
+++ b/anaconda/pyanaconda/kickstart.py
@@ -21,12 +21,16 @@
 from pyanaconda.errors import ScriptError, errorHandler
 from blivet.deviceaction import ActionCreateFormat, ActionDestroyFormat, ActionResizeDevice, ActionResizeFormat
 from blivet.devices import LUKSDevice
-from blivet.devicelibs.lvm import getPossiblePhysicalExtents
-from blivet.devicelibs import swap
+from blivet.devicelibs.lvm import getPossiblePhysicalExtents, LVM_PE_SIZE, KNOWN_THPOOL_PROFILES
+from blivet.devicelibs.crypto import MIN_CREATE_ENTROPY
+from blivet.devicelibs import swap as swap_lib
 from blivet.formats import getFormat
 from blivet.partitioning import doPartitioning
 from blivet.partitioning import growLVM
+from blivet.errors import PartitioningError
+from blivet.size import Size
 from blivet import udev
+from blivet.platform import platform
 import blivet.iscsi
 import blivet.fcoe
 import blivet.zfcp
@@ -39,7 +43,7 @@ import os.path
 import tempfile
 import subprocess
 from pyanaconda.flags import flags, can_touch_runtime_system
-from pyanaconda.constants import ADDON_PATHS, ROOT_PATH
+from pyanaconda.constants import ADDON_PATHS
 import shlex
 import sys
 import urlgrabber
@@ -57,6 +61,7 @@ from pyanaconda.desktop import Desktop
 from pyanaconda.i18n import _
 from pyanaconda.ui.common import collect
 from pyanaconda.addons import AddonSection, AddonData, AddonRegistry, collect_addon_paths
+from pyanaconda.bootloader import GRUB2, get_bootloader
 
 from pykickstart.constants import CLEARPART_TYPE_NONE, FIRSTBOOT_SKIP, FIRSTBOOT_RECONFIG, KS_SCRIPT_POST, KS_SCRIPT_PRE, \
                                   KS_SCRIPT_TRACEBACK, SELINUX_DISABLED, SELINUX_ENFORCING, SELINUX_PERMISSIVE
@@ -93,9 +98,9 @@ class AnacondaKSScript(KSScript):
 
         (fd, path) = tempfile.mkstemp("", "ks-script-", scriptRoot + "/tmp")
 
-        os.write(fd, self.script)
-        os.close(fd)
-        os.chmod(path, 0700)
+        iutil.eintr_retry_call(os.write, fd, self.script)
+        iutil.eintr_retry_call(os.close, fd)
+        iutil.eintr_retry_call(os.chmod, path, 0o700)
 
         # Always log stdout/stderr from scripts.  Using --log just lets you
         # pick where it goes.  The script will also be logged to program.log
@@ -126,7 +131,7 @@ class AnacondaKSScript(KSScript):
                 with open(messages, "r") as fp:
                     err = "".join(fp.readlines())
 
-                errorHandler.cb(ScriptError(), self.lineno, err)
+                errorHandler.cb(ScriptError(self.lineno, err))
                 sys.exit(0)
 
 class AnacondaInternalScript(AnacondaKSScript):
@@ -157,7 +162,7 @@ def getEscrowCertificate(escrowCerts, url):
     try:
         f = urlgrabber.urlopen(url)
     except urlgrabber.grabber.URLGrabError as e:
-        msg = _("The following error was encountered while downloading the escrow certificate:\n\n%s" % e)
+        msg = _("The following error was encountered while downloading the escrow certificate:\n\n%s") % e
         raise KickstartError(msg)
 
     try:
@@ -167,15 +172,35 @@ def getEscrowCertificate(escrowCerts, url):
 
     return escrowCerts[url]
 
-def deviceMatches(spec):
+def deviceMatches(spec, devicetree=None):
+    """ Return names of block devices matching the provided specification.
+
+        :param str spec: a device identifier (name, UUID=<uuid>, &c)
+        :keyword devicetree: device tree to look up devices in (optional)
+        :type devicetree: :class:`blivet.DeviceTree`
+        :returns: names of matching devices
+        :rtype: list of str
+
+        parse methods will not have access to a devicetree, while execute
+        methods will. The devicetree is superior in that it can resolve md
+        array names and in that it reflects scheduled device removals, but for
+        normal local disks udev.resolve_devspec should suffice.
+    """
     full_spec = spec
     if not full_spec.startswith("/dev/"):
         full_spec = os.path.normpath("/dev/" + full_spec)
 
     # the regular case
-    matches = udev.udev_resolve_glob(full_spec)
-    dev = udev.udev_resolve_devspec(full_spec)
-    # udev_resolve_devspec returns None if there's no match, but we don't
+    matches = udev.resolve_glob(full_spec)
+
+    # Use spec here instead of full_spec to preserve the spec and let the
+    # called code decide whether to treat the spec as a path instead of a name.
+    if devicetree is None:
+        dev = udev.resolve_devspec(spec)
+    else:
+        dev = getattr(devicetree.resolveDevice(spec), "name", None)
+
+    # udev.resolve_devspec returns None if there's no match, but we don't
     # want that ending up in the list.
     if dev and dev not in matches:
         matches.append(dev)
@@ -203,53 +228,98 @@ def removeExistingFormat(device, storage):
 
 def getAvailableDiskSpace(storage):
     """
-    Get overall disk space available on disks we may use (not free space on the
-    disks, but overall space on the disks).
+    Get overall disk space available on disks we may use.
 
     :param storage: blivet.Blivet instance
-    :return: overall disk space available in MB
-    :rtype: int
+    :return: overall disk space available
+    :rtype: :class:`blivet.size.Size`
 
     """
 
-    disk_space = 0
-    for disk in storage.disks:
-        if not storage.config.clearPartDisks or \
-                disk.name in storage.config.clearPartDisks:
-            disk_space += disk.size
+    free_space = storage.freeSpaceSnapshot
+    return sum(disk_free for disk_free, fs_free in free_space.values())
 
-    return disk_space
+def refreshAutoSwapSize(storage):
+    """
+    Refresh size of the auto partitioning request for swap device according to
+    the current state of the storage configuration.
+
+    :param storage: blivet.Blivet instance
+
+    """
+
+    for request in storage.autoPartitionRequests:
+        if request.fstype == "swap":
+            disk_space = getAvailableDiskSpace(storage)
+            request.size = swap_lib.swapSuggestion(disk_space=disk_space)
+            break
 
 ###
 ### SUBCLASSES OF PYKICKSTART COMMAND HANDLERS
 ###
 
 class Authconfig(commands.authconfig.FC3_Authconfig):
+    def __init__(self, *args, **kwargs):
+        commands.authconfig.FC3_Authconfig.__init__(self, *args, **kwargs)
+        self.packages = []
+
+    def setup(self):
+        if self.seen:
+            self.packages = ["authconfig"]
+
     def execute(self, *args):
+        cmd = "/usr/sbin/authconfig"
+        if not os.path.lexists(iutil.getSysroot()+cmd):
+            if self.seen:
+                msg = _("%s is missing. Cannot setup authentication.") % cmd
+                raise KickstartError(msg)
+            else:
+                return
+
         args = ["--update", "--nostart"] + shlex.split(self.authconfig)
 
         if not flags.automatedInstall and \
-           (os.path.exists(ROOT_PATH + "/lib64/security/pam_fprintd.so") or \
-            os.path.exists(ROOT_PATH + "/lib/security/pam_fprintd.so")):
+           (os.path.exists(iutil.getSysroot() + "/lib64/security/pam_fprintd.so") or \
+            os.path.exists(iutil.getSysroot() + "/lib/security/pam_fprintd.so")):
             args += ["--enablefingerprint"]
 
         try:
-            iutil.execWithRedirect("/usr/sbin/authconfig", args, root=ROOT_PATH)
+            iutil.execInSysroot(cmd, args)
         except RuntimeError as msg:
-            log.error("Error running /usr/sbin/authconfig %s: %s", args, msg)
+            log.error("Error running %s %s: %s", cmd, args, msg)
 
-class AutoPart(commands.autopart.F20_AutoPart):
+class AutoPart(commands.autopart.F21_AutoPart):
     def __init__(self, writePriority=100, *args, **kwargs):
         if 'encrypted' not in kwargs:
             kwargs['encrypted'] = True
         super(AutoPart, self).__init__(writePriority=writePriority, *args, **kwargs)
 
+    def parse(self, args):
+        retval = commands.autopart.F21_AutoPart.parse(self, args)
+
+        if self.fstype:
+            fmt = blivet.formats.getFormat(self.fstype)
+            if not fmt or fmt.type is None:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("autopart fstype of %s is invalid.") % self.fstype))
+
+        return retval
+
     def execute(self, storage, ksdata, instClass):
         from blivet.partitioning import doAutoPartition
+        from pyanaconda.storage_utils import sanity_check
 
         if not self.autopart:
             return
 
+        if self.fstype:
+            try:
+                storage.setDefaultFSType(self.fstype)
+                storage.setDefaultBootFSType(self.fstype)
+            except ValueError:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Settings default fstype to %s failed.") % self.fstype))
+
         # sets up default autopartitioning.  use clearpart separately
         # if you want it
         instClass.setDefaultPartitioning(storage)
@@ -265,14 +335,28 @@ class AutoPart(commands.autopart.F20_AutoPart):
         if self.type is not None:
             storage.autoPartType = self.type
 
-        doAutoPartition(storage, ksdata)
+        doAutoPartition(storage, ksdata, min_luks_entropy=MIN_CREATE_ENTROPY)
+        errors = sanity_check(storage)
+        if errors:
+            raise PartitioningError("autopart failed:\n" + "\n".join(error.message for error in errors))
 
-class Bootloader(commands.bootloader.F19_Bootloader):
+class Bootloader(commands.bootloader.F21_Bootloader):
     def __init__(self, *args, **kwargs):
-        commands.bootloader.F19_Bootloader.__init__(self, *args, **kwargs)
+        commands.bootloader.F21_Bootloader.__init__(self, *args, **kwargs)
         self.location = "mbr"
 
+    def parse(self, args):
+        commands.bootloader.F21_Bootloader.parse(self, args)
+        if self.location == "partition" and isinstance(get_bootloader(), GRUB2):
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("GRUB2 does not support installation to a partition.")))
+
+        return self
+
     def execute(self, storage, ksdata, instClass):
+        if flags.imageInstall and blivet.arch.isS390():
+            self.location = "none"
+
         if self.location == "none":
             location = None
         elif self.location == "partition":
@@ -300,30 +384,42 @@ class Bootloader(commands.bootloader.F19_Bootloader):
         if self.timeout is not None:
             storage.bootloader.timeout = self.timeout
 
-        # Throw out drives specified that don't exist.
+        # Throw out drives specified that don't exist or cannot be used (iSCSI
+        # device on an s390 machine)
         disk_names = [d.name for d in storage.disks
-                                if not d.format.hidden and not d.protected]
+                      if not d.format.hidden and not d.protected and
+                      (not blivet.arch.isS390() or not isinstance(d, blivet.devices.iScsiDiskDevice))]
+        diskSet = set(disk_names)
+
         for drive in self.driveorder[:]:
-            if drive not in disk_names:
-                log.warning("requested drive %s in boot drive order doesn't exist", drive)
+            matches = set(deviceMatches(drive, devicetree=storage.devicetree))
+            if matches.isdisjoint(diskSet):
+                log.warning("requested drive %s in boot drive order doesn't exist or cannot be used", drive)
                 self.driveorder.remove(drive)
 
         storage.bootloader.disk_order = self.driveorder
 
         if self.bootDrive:
-            if not self.bootDrive in disk_names:
+            matches = set(deviceMatches(self.bootDrive,
+                                        devicetree=storage.devicetree))
+            if len(matches) > 1:
                 raise KickstartValueError(formatErrorMsg(self.lineno,
-                        msg="Requested boot drive %s doesn't exist" % self.bootDrive))
+                        msg=_("More than one match found for given boot drive \"%s\".") % self.bootDrive))
+            elif matches.isdisjoint(diskSet):
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Requested boot drive \"%s\" doesn't exist or cannot be used.") % self.bootDrive))
         else:
             self.bootDrive = disk_names[0]
 
-        spec = udev.udev_resolve_devspec(self.bootDrive)
-        drive = storage.devicetree.getDeviceByName(spec)
+        drive = storage.devicetree.resolveDevice(self.bootDrive)
         storage.bootloader.stage1_disk = drive
 
         if self.leavebootorder:
             flags.leavebootorder = True
 
+        if self.nombr:
+            flags.nombr = True
+
 class BTRFS(commands.btrfs.F17_BTRFS):
     def execute(self, storage, ksdata, instClass):
         for b in self.btrfsList:
@@ -352,10 +448,13 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
                     dev = None
 
             if dev and dev.format.type != "btrfs":
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="BTRFS partition %s has incorrect format (%s)" % (member, dev.format.type)))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        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))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Tried to use undefined partition \"%s\" in BTRFS volume specification.") % member))
 
             members.append(dev)
 
@@ -367,7 +466,8 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
             name = None
 
         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."))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    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"):
@@ -375,7 +475,8 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
 
         # Sanity check mountpoint
         if self.mountpoint != "" and self.mountpoint[0] != '/':
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="The mount point \"%s\" is not valid." % (self.mountpoint,)))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The mount point \"%s\" is not valid.  It must start with a /.") % self.mountpoint))
 
         # If a previous device has claimed this mount point, delete the
         # old one.
@@ -387,12 +488,10 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
             pass
 
         if self.preexist:
-            device = devicetree.getDeviceByName(self.name)
+            device = devicetree.resolveDevice(self.name)
             if not device:
-                device = udev.udev_resolve_devspec(self.name)
-
-            if not device:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent BTRFS volume %s in btrfs command" % self.name))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("BTRFS volume \"%s\" specified with --useexisting does not exist.") % self.name))
 
             device.format.mountpoint = self.mountpoint
         else:
@@ -458,7 +557,7 @@ class Realm(commands.realm.F19_Realm):
             # no explicit password arg using implicit --no-password
             pw_args = ["--no-password"]
 
-        argv = ["realm", "join", "--install", ROOT_PATH, "--verbose"] + \
+        argv = ["realm", "join", "--install", iutil.getSysroot(), "--verbose"] + \
                pw_args + self.join_args
         rc = -1
         try:
@@ -479,13 +578,18 @@ class Realm(commands.realm.F19_Realm):
         log.info("Joined realm %s", self.join_realm)
 
 
-class ClearPart(commands.clearpart.F17_ClearPart):
+class ClearPart(commands.clearpart.F21_ClearPart):
     def parse(self, args):
-        retval = commands.clearpart.F17_ClearPart.parse(self, args)
+        retval = commands.clearpart.F21_ClearPart.parse(self, args)
 
         if self.type is None:
             self.type = CLEARPART_TYPE_NONE
 
+        if self.disklabel and self.disklabel not in platform.diskLabelTypes:
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("Disklabel \"%s\" given in clearpart command is not "
+                          "supported on this platform.") % self.disklabel))
+
         # Do any glob expansion now, since we need to have the real list of
         # disks available before the execute methods run.
         drives = []
@@ -494,7 +598,8 @@ class ClearPart(commands.clearpart.F17_ClearPart):
             if matched:
                 drives.extend(matched)
             else:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in clearpart command" % spec))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Disk \"%s\" given in clearpart command does not exist.") % spec))
 
         self.drives = drives
 
@@ -506,7 +611,8 @@ class ClearPart(commands.clearpart.F17_ClearPart):
             if matched:
                 devices.extend(matched)
             else:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent device %s in clearpart device list" % spec))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Device \"%s\" given in clearpart device list does not exist.") % spec))
 
         self.devices = devices
 
@@ -520,6 +626,11 @@ class ClearPart(commands.clearpart.F17_ClearPart):
         if self.initAll:
             storage.config.initializeDisks = self.initAll
 
+        if self.disklabel:
+            if not platform.setDefaultDiskLabelType(self.disklabel):
+                log.warn("%s is not a supported disklabel type on this platform. "
+                         "Using default disklabel %s instead.", self.disklabel, platform.defaultDiskLabelType)
+
         storage.clearPartitions()
 
 class Fcoe(commands.fcoe.F13_Fcoe):
@@ -527,13 +638,30 @@ class Fcoe(commands.fcoe.F13_Fcoe):
         fc = commands.fcoe.F13_Fcoe.parse(self, args)
 
         if fc.nic not in nm.nm_devices():
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent nic %s in fcoe command" % fc.nic))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("NIC \"%s\" given in fcoe command does not exist.") % fc.nic))
 
-        blivet.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=True)
+        if fc.nic in (info[0] for info in blivet.fcoe.fcoe().nics):
+            log.info("Kickstart fcoe device %s already added from EDD, ignoring", fc.nic)
+        else:
+            msg = blivet.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=True)
+            if not msg:
+                msg = "Succeeded."
+                blivet.fcoe.fcoe().added_nics.append(fc.nic)
+
+            log.info("adding FCoE SAN on %s: %s", fc.nic, msg)
 
         return fc
 
 class Firewall(commands.firewall.F20_Firewall):
+    def __init__(self, *args, **kwargs):
+        commands.firewall.F20_Firewall.__init__(self, *args, **kwargs)
+        self.packages = []
+
+    def setup(self):
+        if self.seen:
+            self.packages = ["firewalld"]
+
     def execute(self, storage, ksdata, instClass):
         args = []
         # enabled is None if neither --enable or --disable is passed
@@ -560,12 +688,12 @@ class Firewall(commands.firewall.F20_Firewall):
             args += [ "--service=%s" % (service,) ]
 
         cmd = "/usr/bin/firewall-offline-cmd"
-        if not os.path.exists(ROOT_PATH+cmd):
+        if not os.path.exists(iutil.getSysroot()+cmd):
             if self.enabled:
                 msg = _("%s is missing. Cannot setup firewall.") % (cmd,)
                 raise KickstartError(msg)
         else:
-            iutil.execWithRedirect(cmd, args, root=ROOT_PATH)
+            iutil.execInSysroot(cmd, args)
 
 class Firstboot(commands.firstboot.FC3_Firstboot):
     def setup(self, *args):
@@ -575,24 +703,31 @@ class Firstboot(commands.firstboot.FC3_Firstboot):
 
     def execute(self, *args):
         action = "enable"
+        services = ["initial-setup-graphical.service",
+                    "initial-setup-text.service"]
+
+        if not any(os.path.exists(iutil.getSysroot() + "/lib/systemd/system/" + path)
+                   for path in services):
+            # none of the first boot utilities installed, nothing to do here
+            return
 
         if self.firstboot == FIRSTBOOT_SKIP:
             action = "disable"
         elif self.firstboot == FIRSTBOOT_RECONFIG:
-            f = open(ROOT_PATH + "/etc/reconfigSys", "w+")
+            f = open(iutil.getSysroot() + "/etc/reconfigSys", "w+")
             f.close()
 
         for unit in [
                 "firstboot-graphical.service",
                 "initial-setup-graphical.service",
                 "initial-setup-text.service"]:
-            iutil.execWithRedirect("systemctl", [action, unit], root=ROOT_PATH)
+            iutil.execInSysroot("systemctl", [action, unit])
 
 class Group(commands.group.F12_Group):
     def execute(self, storage, ksdata, instClass, users):
         for grp in self.groupList:
             kwargs = grp.__dict__
-            kwargs.update({"root": ROOT_PATH})
+            kwargs.update({"root": iutil.getSysroot()})
             users.createGroup(grp.name, **kwargs)
 
 class IgnoreDisk(commands.ignoredisk.RHEL6_IgnoreDisk):
@@ -606,7 +741,8 @@ class IgnoreDisk(commands.ignoredisk.RHEL6_IgnoreDisk):
             if matched:
                 drives.extend(matched)
             else:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in ignoredisk command" % spec))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Disk \"%s\" given in ignoredisk command does not exist.") % spec))
 
         self.ignoredisk = drives
 
@@ -616,7 +752,8 @@ class IgnoreDisk(commands.ignoredisk.RHEL6_IgnoreDisk):
             if matched:
                 drives.extend(matched)
             else:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in ignoredisk command" % spec))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Disk \"%s\" given in ignoredisk command does not exist.") % spec))
 
         self.onlyuse = drives
 
@@ -628,7 +765,9 @@ class Iscsi(commands.iscsi.F17_Iscsi):
 
         if tg.iface:
             if not network.wait_for_network_devices([tg.iface]):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="network interface %s required by iscsi %s target is not up" % (tg.iface, tg.target)))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Network interface \"%(nic)s\" required by iSCSI \"%(iscsiTarget)s\" target is not up.") %
+                             {"nic": tg.iface, "iscsiTarget": tg.target}))
 
         mode = blivet.iscsi.iscsi().mode
         if mode == "none":
@@ -636,7 +775,8 @@ class Iscsi(commands.iscsi.F17_Iscsi):
                 blivet.iscsi.iscsi().create_interfaces(nm.nm_activated_devices())
         elif ((mode == "bind" and not tg.iface)
               or (mode == "default" and tg.iface)):
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="iscsi --iface must be specified (binding used) either for all targets or for none"))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("iscsi --iface must be specified (binding used) either for all targets or for none")))
 
         try:
             blivet.iscsi.iscsi().addTarget(tg.ipaddr, tg.port, tg.user,
@@ -661,12 +801,12 @@ class IscsiName(commands.iscsiname.FC6_IscsiName):
 
 class Lang(commands.lang.F19_Lang):
     def execute(self, *args, **kwargs):
-        localization.write_language_configuration(self, ROOT_PATH)
+        localization.write_language_configuration(self, iutil.getSysroot())
 
 # no overrides needed here
 Eula = commands.eula.F20_Eula
 
-class LogVol(commands.logvol.F20_LogVol):
+class LogVol(commands.logvol.F21_LogVol):
     def execute(self, storage, ksdata, instClass):
         for l in self.lvList:
             l.execute(storage, ksdata, instClass)
@@ -674,7 +814,7 @@ class LogVol(commands.logvol.F20_LogVol):
         if self.lvList:
             growLVM(storage)
 
-class LogVolData(commands.logvol.F20_LogVolData):
+class LogVolData(commands.logvol.F21_LogVolData):
     def execute(self, storage, ksdata, instClass):
         devicetree = storage.devicetree
 
@@ -683,12 +823,17 @@ class LogVolData(commands.logvol.F20_LogVolData):
         # we might have truncated or otherwise changed the specified vg name
         vgname = ksdata.onPart.get(self.vgname, self.vgname)
 
+        size = None
+
+        if self.percent:
+            size = Size(0)
+
         if self.mountpoint == "swap":
             ty = "swap"
             self.mountpoint = ""
             if self.recommended or self.hibernation:
                 disk_space = getAvailableDiskSpace(storage)
-                self.size = swap.swapSuggestion(hibernation=self.hibernation, disk_space=disk_space)
+                size = swap_lib.swapSuggestion(hibernation=self.hibernation, disk_space=disk_space)
                 self.grow = False
         else:
             if self.fstype != "":
@@ -696,56 +841,71 @@ class LogVolData(commands.logvol.F20_LogVolData):
             else:
                 ty = storage.defaultFSType
 
+        if size is None:
+            if not self.size:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg="Size can not be decided on from kickstart nor obtained from device."))
+            try:
+                size = Size("%d MiB" % self.size)
+            except ValueError:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg="The size \"%s\" is invalid." % self.size))
+
         if self.thin_pool:
             self.mountpoint = ""
             ty = None
 
         # Sanity check mountpoint
         if self.mountpoint != "" and self.mountpoint[0] != '/':
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="The mount point \"%s\" is not valid." % (self.mountpoint,)))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The mount point \"%s\" is not valid.  It must start with a /.") % self.mountpoint))
 
         # Check that the VG this LV is a member of has already been specified.
         vg = devicetree.getDeviceByName(vgname)
         if not vg:
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="No volume group exists with the name \"%s\".  Specify volume groups before logical volumes." % self.vgname))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("No volume group exists with the name \"%s\".  Specify volume groups before logical volumes.") % self.vgname))
 
         pool = None
         if self.thin_volume:
             pool = devicetree.getDeviceByName("%s-%s" % (vg.name, self.pool_name))
             if not pool:
                 err = formatErrorMsg(self.lineno,
-                                     msg="No thin pool exists with the name "
-                                         "\"%s\". Specify thin pools before "
-                                         "thin volumes." % self.pool_name)
+                                     msg=_("No thin pool exists with the name \"%s\". Specify thin pools before thin volumes.") % self.pool_name)
                 raise KickstartValueError(err)
 
         # If this specifies an existing request that we should not format,
         # quit here after setting up enough information to mount it later.
         if not self.format:
             if not self.name:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="--noformat used without --name"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("logvol --noformat must also use the --name= option.")))
 
             dev = devicetree.getDeviceByName("%s-%s" % (vg.name, self.name))
             if not dev:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="No preexisting logical volume with the name \"%s\" was found." % self.name))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Logical volume \"%s\" given in logvol command does not exist.") % self.name))
 
             if self.resize:
-                if self.size < dev.currentSize:
+                size = dev.raw_device.alignTargetSize(size)
+                if size < dev.currentSize:
                     # shrink
                     try:
-                        devicetree.registerAction(ActionResizeFormat(dev, self.size))
-                        devicetree.registerAction(ActionResizeDevice(dev, self.size))
+                        devicetree.registerAction(ActionResizeFormat(dev, size))
+                        devicetree.registerAction(ActionResizeDevice(dev, size))
                     except ValueError:
                         raise KickstartValueError(formatErrorMsg(self.lineno,
-                                msg="Invalid target size (%d) for device %s" % (self.size, dev.name)))
+                                msg=_("Target size \"%(size)s\" for device \"%(device)s\" is invalid.") %
+                                     {"size": self.size, "device": dev.name}))
                 else:
                     # grow
                     try:
-                        devicetree.registerAction(ActionResizeDevice(dev, self.size))
-                        devicetree.registerAction(ActionResizeFormat(dev, self.size))
+                        devicetree.registerAction(ActionResizeDevice(dev, size))
+                        devicetree.registerAction(ActionResizeFormat(dev, size))
                     except ValueError:
                         raise KickstartValueError(formatErrorMsg(self.lineno,
-                                msg="Invalid target size (%d) for device %s" % (self.size, dev.name)))
+                                msg=_("Target size \"%(size)s\" for device \"%(device)s\" is invalid.") %
+                                     {"size": self.size, "device": dev.name}))
 
             dev.format.mountpoint = self.mountpoint
             dev.format.mountopts = self.fsopts
@@ -757,16 +917,22 @@ class LogVolData(commands.logvol.F20_LogVolData):
         if not self.preexist:
             tmp = devicetree.getDeviceByName("%s-%s" % (vg.name, self.name))
             if tmp:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Logical volume name already used in volume group %s" % vg.name))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Logical volume name \"%(logvol)s\" is already in use in volume group \"%(volgroup)s\".") %
+                             {"logvol": self.name, "volgroup": vg.name}))
 
             # Size specification checks
             if not self.percent:
-                if not self.size:
-                    raise KickstartValueError(formatErrorMsg(self.lineno, msg="Size required"))
-                elif not self.grow and self.size*1024 < vg.peSize:
-                    raise KickstartValueError(formatErrorMsg(self.lineno, msg="Logical volume size must be larger than the volume group physical extent size."))
+                if not size:
+                    raise KickstartValueError(formatErrorMsg(self.lineno,
+                            msg=_("No size given for logical volume \"%s\".  Use one of --useexisting, --size, or --percent.") % self.name))
+                elif not self.grow and size < vg.peSize:
+                    raise KickstartValueError(formatErrorMsg(self.lineno,
+                            msg=_("Logical volume size \"%(logvolSize)s\" must be larger than the volume group extent size of \"%(extentSize)s\".") %
+                                 {"logvolSize": size, "extentSize": vg.peSize}))
             elif self.percent <= 0 or self.percent > 100:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Percentage must be between 0 and 100"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Percentage must be between 0 and 100.")))
 
         # Now get a format to hold a lot of these extra values.
         fmt = getFormat(ty,
@@ -775,7 +941,8 @@ class LogVolData(commands.logvol.F20_LogVolData):
                         fsprofile=self.fsprofile,
                         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))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The \"%s\" filesystem 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
@@ -784,16 +951,19 @@ class LogVolData(commands.logvol.F20_LogVolData):
         if self.preexist:
             device = devicetree.getDeviceByName("%s-%s" % (vg.name, self.name))
             if not device:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent LV %s in logvol command" % self.name))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Logical volume \"%s\" given in logvol command does not exist.") % self.name))
 
             removeExistingFormat(device, storage)
 
             if self.resize:
+                size = device.raw_device.alignTargetSize(size)
                 try:
-                    devicetree.registerAction(ActionResizeDevice(device, self.size))
+                    devicetree.registerAction(ActionResizeDevice(device, size))
                 except ValueError:
                     raise KickstartValueError(formatErrorMsg(self.lineno,
-                            msg="Invalid target size (%d) for device %s" % (self.size, device.name)))
+                            msg=_("Target size \"%(size)s\" for device \"%(device)s\" is invalid.") %
+                                 {"size": self.size, "device": device.name}))
 
             devicetree.registerAction(ActionCreateFormat(device, fmt))
             if ty == "swap":
@@ -813,20 +983,37 @@ class LogVolData(commands.logvol.F20_LogVolData):
             else:
                 parents = [vg]
 
+            pool_args = {}
             if self.thin_pool:
-                pool_args = { "metadatasize": self.metadata_size,
-                              "chunksize": self.chunk_size / 1024.0 }
-            else:
-                pool_args = {}
+                if self.profile:
+                    matching = (p for p in KNOWN_THPOOL_PROFILES if p.name == self.profile)
+                    profile = next(matching, None)
+                    if profile:
+                        pool_args["profile"] = profile
+                    else:
+                        log.warning("No matching profile for %s found in LVM configuration", self.profile)
+                if self.metadata_size:
+                    pool_args["metadatasize"] = Size("%d MiB" % self.metadata_size)
+                if self.chunk_size:
+                    pool_args["chunksize"] = Size("%d KiB" % self.chunk_size)
 
-            request = storage.newLV(format=fmt,
+            if self.maxSizeMB:
+                try:
+                    maxsize = Size("%d MiB" % self.maxSizeMB)
+                except ValueError:
+                    raise KickstartValueError(formatErrorMsg(self.lineno,
+                            msg="The maximum size \"%s\" is invalid." % self.maxSizeMB))
+            else:
+                maxsize = None
+
+            request = storage.newLV(fmt=fmt,
                                     name=self.name,
                                     parents=parents,
-                                    size=self.size,
+                                    size=size,
                                     thin_pool=self.thin_pool,
                                     thin_volume=self.thin_volume,
                                     grow=self.grow,
-                                    maxsize=self.maxSizeMB,
+                                    maxsize=maxsize,
                                     percent=self.percent,
                                     **pool_args)
 
@@ -846,16 +1033,18 @@ class LogVolData(commands.logvol.F20_LogVolData):
                                           escrow_cert=cert,
                                           add_backup_passphrase=self.backuppassphrase)
                 luksdev = LUKSDevice("luks%d" % storage.nextID,
-                                     format=luksformat,
-                                     parents=device)
+                                     fmt=luksformat,
+                                     parents=device,
+                                     min_luks_entropy=MIN_CREATE_ENTROPY)
             else:
                 luksformat = request.format
                 request.format = getFormat("luks", passphrase=self.passphrase,
                                            cipher=self.cipher,
                                            escrow_cert=cert,
-                                           add_backup_passphrase=self.backuppassphrase)
+                                           add_backup_passphrase=self.backuppassphrase,
+                                           min_luks_entropy=MIN_CREATE_ENTROPY)
                 luksdev = LUKSDevice("luks%d" % storage.nextID,
-                                     format=luksformat,
+                                     fmt=luksformat,
                                      parents=request)
             storage.createDevice(luksdev)
 
@@ -875,17 +1064,17 @@ class Logging(commands.logging.FC6_Logging):
                 remote_server = "%s:%s" %(self.host, self.port)
             logger.updateRemote(remote_server)
 
-class Network(commands.network.F20_Network):
+class Network(commands.network.F21_Network):
     def execute(self, storage, ksdata, instClass):
-        network.write_network_config(storage, ksdata, instClass, ROOT_PATH)
+        network.write_network_config(storage, ksdata, instClass, iutil.getSysroot())
 
 class MultiPath(commands.multipath.FC6_MultiPath):
     def parse(self, args):
-        raise NotImplementedError("The multipath kickstart command is not currently supported")
+        raise NotImplementedError(_("The %s kickstart command is not currently supported.") % "multipath")
 
 class DmRaid(commands.dmraid.FC6_DmRaid):
     def parse(self, args):
-        raise NotImplementedError("The dmraid kickstart command is not currently supported")
+        raise NotImplementedError(_("The %s kickstart command is not currently supported.") % "dmraid")
 
 class Partition(commands.partition.F20_Partition):
     def execute(self, storage, ksdata, instClass):
@@ -909,14 +1098,17 @@ class PartitionData(commands.partition.F18_PartData):
                     break
 
             if not self.disk:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified BIOS disk %s cannot be determined" % self.onbiosdisk))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("No disk found for specified BIOS disk \"%s\".") % self.onbiosdisk))
+
+        size = None
 
         if self.mountpoint == "swap":
             ty = "swap"
             self.mountpoint = ""
             if self.recommended or self.hibernation:
                 disk_space = getAvailableDiskSpace(storage)
-                self.size = swap.swapSuggestion(hibernation=self.hibernation, disk_space=disk_space)
+                size = swap_lib.swapSuggestion(hibernation=self.hibernation, disk_space=disk_space)
                 self.grow = False
         # if people want to specify no mountpoint for some reason, let them
         # this is really needed for pSeries boot partitions :(
@@ -941,7 +1133,8 @@ class PartitionData(commands.partition.F18_PartData):
             self.mountpoint = ""
 
             if devicetree.getDeviceByName(kwargs["name"]):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="RAID partition defined multiple times"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("RAID partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             if self.onPart:
                 ksdata.onPart[kwargs["name"]] = self.onPart
@@ -951,7 +1144,8 @@ class PartitionData(commands.partition.F18_PartData):
             self.mountpoint = ""
 
             if devicetree.getDeviceByName(kwargs["name"]):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="PV partition defined multiple times"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("PV partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             if self.onPart:
                 ksdata.onPart[kwargs["name"]] = self.onPart
@@ -961,7 +1155,8 @@ class PartitionData(commands.partition.F18_PartData):
             self.mountpoint = ""
 
             if devicetree.getDeviceByName(kwargs["name"]):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="BTRFS partition defined multiple times"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("BTRFS partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             if self.onPart:
                 ksdata.onPart[kwargs["name"]] = self.onPart
@@ -970,7 +1165,7 @@ class PartitionData(commands.partition.F18_PartData):
                 ty = "macefi"
             else:
                 ty = "EFI System Partition"
-                self.fsopts = "defaults,uid=0,gid=0,umask=0077,shortname=winnt"
+                self.fsopts = "defaults,uid=0,gid=0,umask=077,shortname=winnt"
         else:
             if self.fstype != "":
                 ty = self.fstype
@@ -979,33 +1174,45 @@ class PartitionData(commands.partition.F18_PartData):
             else:
                 ty = storage.defaultFSType
 
+        if not size and self.size:
+            try:
+                size = Size("%d MiB" % self.size)
+            except ValueError:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("The size \"%s\" is invalid.") % self.size))
+
         # If this specified an existing request that we should not format,
         # quit here after setting up enough information to mount it later.
         if not self.format:
             if not self.onPart:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="--noformat used without --onpart"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("part --noformat must also use the --onpart option.")))
 
-            dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(self.onPart))
+            dev = devicetree.resolveDevice(self.onPart)
             if not dev:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="No preexisting partition with the name \"%s\" was found." % self.onPart))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Partition \"%s\" given in part command does not exist.") % self.onPart))
 
             if self.resize:
-                if self.size < dev.currentSize:
+                size = dev.raw_device.alignTargetSize(size)
+                if size < dev.currentSize:
                     # shrink
                     try:
-                        devicetree.registerAction(ActionResizeFormat(dev, self.size))
-                        devicetree.registerAction(ActionResizeDevice(dev, self.size))
+                        devicetree.registerAction(ActionResizeFormat(dev, size))
+                        devicetree.registerAction(ActionResizeDevice(dev, size))
                     except ValueError:
                         raise KickstartValueError(formatErrorMsg(self.lineno,
-                                msg="Invalid target size (%d) for device %s" % (self.size, dev.name)))
+                                msg=_("Target size \"%(size)s\" for device \"%(device)s\" is invalid.") %
+                                     {"size": self.size, "device": dev.name}))
                 else:
                     # grow
                     try:
-                        devicetree.registerAction(ActionResizeDevice(dev, self.size))
-                        devicetree.registerAction(ActionResizeFormat(dev, self.size))
+                        devicetree.registerAction(ActionResizeDevice(dev, size))
+                        devicetree.registerAction(ActionResizeFormat(dev, size))
                     except ValueError:
                         raise KickstartValueError(formatErrorMsg(self.lineno,
-                                msg="Invalid target size (%d) for device %s" % (self.size, dev.name)))
+                                msg=_("Target size \"%(size)s\" for device \"%(device)s\" is invalid.") %
+                                     {"size": self.size, "device": dev.name}))
 
             dev.format.mountpoint = self.mountpoint
             dev.format.mountopts = self.fsopts
@@ -1014,46 +1221,58 @@ class PartitionData(commands.partition.F18_PartData):
             return
 
         # Now get a format to hold a lot of these extra values.
-        kwargs["format"] = getFormat(ty,
-                                     mountpoint=self.mountpoint,
-                                     label=self.label,
-                                     fsprofile=self.fsprofile,
-                                     mountopts=self.fsopts,
-                                     size=self.size)
-        if not kwargs["format"].type:
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="The \"%s\" filesystem type is not supported." % ty))
+        kwargs["fmt"] = getFormat(ty,
+           mountpoint=self.mountpoint,
+           label=self.label,
+           fsprofile=self.fsprofile,
+           mountopts=self.fsopts,
+           size=size)
+        if not kwargs["fmt"].type:
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The \"%s\" filesystem 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
         # mapper/ on the front.  If that doesn't exist either, it's an error.
         if self.disk:
-            names = [self.disk, "mapper/" + self.disk]
-            for n in names:
-                disk = devicetree.getDeviceByName(udev.udev_resolve_devspec(n))
-                # if this is a multipath member promote it to the real mpath
-                if disk and disk.format.type == "multipath_member":
-                    mpath_device = storage.devicetree.getChildren(disk)[0]
-                    storage_log.info("kickstart: part: promoting %s to %s",
-                                     disk.name, mpath_device.name)
-                    disk = mpath_device
-                if not disk:
-                    raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in partition command" % n))
-                if not disk.partitionable:
-                    raise KickstartValueError(formatErrorMsg(self.lineno, msg="Cannot install to read-only media %s." % n))
+            disk = devicetree.resolveDevice(self.disk)
+            # if this is a multipath member promote it to the real mpath
+            if disk and disk.format.type == "multipath_member":
+                mpath_device = storage.devicetree.getChildren(disk)[0]
+                storage_log.info("kickstart: part: promoting %s to %s",
+                                 disk.name, mpath_device.name)
+                disk = mpath_device
+            if not disk:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Disk \"%s\" given in part command does not exist.") % self.disk))
+            if not disk.partitionable:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Cannot install to unpartitionable device \"%s\".") % self.disk))
 
-                should_clear = storage.shouldClear(disk)
-                if disk and (disk.partitioned or should_clear):
-                    kwargs["parents"] = [disk]
-                    break
-                elif disk:
-                    raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified unpartitioned disk %s in partition command" % self.disk))
+            should_clear = storage.shouldClear(disk)
+            if disk and (disk.partitioned or should_clear):
+                kwargs["parents"] = [disk]
+            elif disk:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Disk \"%s\" in part command is not partitioned.") % self.disk))
 
             if not kwargs["parents"]:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in partition command" % self.disk))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Disk \"%s\" given in part command does not exist.") % self.disk))
 
         kwargs["grow"] = self.grow
-        kwargs["size"] = self.size
-        kwargs["maxsize"] = self.maxSizeMB
+        kwargs["size"] = size
+        if self.maxSizeMB:
+            try:
+                maxsize = Size("%d MiB" % self.maxSizeMB)
+            except ValueError:
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("The maximum size \"%s\" is invalid.") % self.maxSizeMB))
+        else:
+            maxsize = None
+
+        kwargs["maxsize"] = maxsize
+
         kwargs["primary"] = self.primOnly
 
         # If we were given a pre-existing partition to create a filesystem on,
@@ -1061,19 +1280,22 @@ class PartitionData(commands.partition.F18_PartData):
         # take place there.  Also, we only support a subset of all the options
         # on pre-existing partitions.
         if self.onPart:
-            device = devicetree.getDeviceByName(udev.udev_resolve_devspec(self.onPart))
+            device = devicetree.resolveDevice(self.onPart)
             if not device:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specified nonexistent partition %s in partition command" % self.onPart))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Partition \"%s\" given in part command does not exist.") % self.onPart))
 
             removeExistingFormat(device, storage)
             if self.resize:
+                size = device.raw_device.alignTargetSize(size)
                 try:
-                    devicetree.registerAction(ActionResizeDevice(device, self.size))
+                    devicetree.registerAction(ActionResizeDevice(device, size))
                 except ValueError:
                     raise KickstartValueError(formatErrorMsg(self.lineno,
-                            msg="Invalid target size (%d) for device %s" % (self.size, device.name)))
+                            msg=_("Target size \"%(size)s\" for device \"%(device)s\" is invalid.") %
+                                 {"size": self.size, "device": device.name}))
 
-            devicetree.registerAction(ActionCreateFormat(device, kwargs["format"]))
+            devicetree.registerAction(ActionCreateFormat(device, kwargs["fmt"]))
             if ty == "swap":
                 storage.addFstabSwap(device)
         # tmpfs mounts are not disks and don't occupy a disk partition,
@@ -1102,22 +1324,24 @@ class PartitionData(commands.partition.F18_PartData):
 
             cert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert)
             if self.onPart:
-                luksformat = kwargs["format"]
+                luksformat = kwargs["fmt"]
                 device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
                                           cipher=self.cipher,
                                           escrow_cert=cert,
-                                          add_backup_passphrase=self.backuppassphrase)
+                                          add_backup_passphrase=self.backuppassphrase,
+                                          min_luks_entropy=MIN_CREATE_ENTROPY)
                 luksdev = LUKSDevice("luks%d" % storage.nextID,
-                                     format=luksformat,
+                                     fmt=luksformat,
                                      parents=device)
             else:
                 luksformat = request.format
                 request.format = getFormat("luks", passphrase=self.passphrase,
                                            cipher=self.cipher,
                                            escrow_cert=cert,
-                                           add_backup_passphrase=self.backuppassphrase)
+                                           add_backup_passphrase=self.backuppassphrase,
+                                           min_luks_entropy=MIN_CREATE_ENTROPY)
                 luksdev = LUKSDevice("luks%d" % storage.nextID,
-                                     format=luksformat,
+                                     fmt=luksformat,
                                      parents=request)
             storage.createDevice(luksdev)
 
@@ -1149,7 +1373,8 @@ class RaidData(commands.raid.F18_RaidData):
             ksdata.onPart[kwargs["name"]] = devicename
 
             if devicetree.getDeviceByName(kwargs["name"]):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="PV partition defined multiple times"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("PV partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             self.mountpoint = ""
         elif self.mountpoint.startswith("btrfs."):
@@ -1158,7 +1383,8 @@ class RaidData(commands.raid.F18_RaidData):
             ksdata.onPart[kwargs["name"]] = devicename
 
             if devicetree.getDeviceByName(kwargs["name"]):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="BTRFS partition defined multiple times"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("BTRFS partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             self.mountpoint = ""
         else:
@@ -1172,17 +1398,20 @@ class RaidData(commands.raid.F18_RaidData):
 
         # Sanity check mountpoint
         if self.mountpoint != "" and self.mountpoint[0] != '/':
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="The mount point is not valid."))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The mount point \"%s\" is not valid.  It must start with a /.") % self.mountpoint))
 
         # If this specifies an existing request that we should not format,
         # quit here after setting up enough information to mount it later.
         if not self.format:
             if not devicename:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="--noformat used without --device"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("raid --noformat must also use the --device option.")))
 
             dev = devicetree.getDeviceByName(devicename)
             if not dev:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="No preexisting RAID device with the name \"%s\" was found." % devicename))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("RAID device  \"%s\" given in raid command does not exist.") % devicename))
 
             dev.format.mountpoint = self.mountpoint
             dev.format.mountopts = self.fsopts
@@ -1202,21 +1431,25 @@ class RaidData(commands.raid.F18_RaidData):
                     dev = None
 
             if dev and dev.format.type != "mdmember":
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="RAID member %s has incorrect format (%s)" % (member, dev.format.type)))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("RAID device \"%(device)s\" has a format of \"%(format)s\", but should have a format of \"mdmember\".") %
+                             {"device": member, "format": dev.format.type}))
 
             if not dev:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Tried to use undefined partition %s in RAID specification" % member))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Tried to use undefined partition \"%s\" in RAID specification.") % member))
 
             raidmems.append(dev)
 
         # Now get a format to hold a lot of these extra values.
-        kwargs["format"] = getFormat(ty,
-                                     label=self.label,
-                                     fsprofile=self.fsprofile,
-                                     mountpoint=self.mountpoint,
-                                     mountopts=self.fsopts)
-        if not kwargs["format"].type:
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="The \"%s\" filesystem type is not supported." % ty))
+        kwargs["fmt"] = getFormat(ty,
+           label=self.label,
+           fsprofile=self.fsprofile,
+           mountpoint=self.mountpoint,
+           mountopts=self.fsopts)
+        if not kwargs["fmt"].type:
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The \"%s\" filesystem type is not supported.") % ty))
 
         kwargs["name"] = devicename
         kwargs["level"] = self.level
@@ -1231,13 +1464,15 @@ class RaidData(commands.raid.F18_RaidData):
         if self.preexist:
             device = devicetree.getDeviceByName(devicename)
             if not device:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Specifeid nonexistent RAID %s in raid command" % devicename))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("RAID volume \"%s\" specified with --useexisting does not exist.") % devicename))
 
             removeExistingFormat(device, storage)
-            devicetree.registerAction(ActionCreateFormat(device, kwargs["format"]))
+            devicetree.registerAction(ActionCreateFormat(device, kwargs["fmt"]))
         else:
             if devicename and devicename in (a.name for a in storage.mdarrays):
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="The Software RAID array name \"%s\" is already in use." % devicename))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("The RAID volume name \"%s\" is already in use.") % devicename))
 
             # If a previous device has claimed this mount point, delete the
             # old one.
@@ -1261,13 +1496,13 @@ class RaidData(commands.raid.F18_RaidData):
 
             cert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert)
             if self.preexist:
-                luksformat = kwargs["format"]
+                luksformat = kwargs["fmt"]
                 device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
                                           cipher=self.cipher,
                                           escrow_cert=cert,
                                           add_backup_passphrase=self.backuppassphrase)
                 luksdev = LUKSDevice("luks%d" % storage.nextID,
-                                     format=luksformat,
+                                     fmt=luksformat,
                                      parents=device)
             else:
                 luksformat = request.format
@@ -1276,7 +1511,7 @@ class RaidData(commands.raid.F18_RaidData):
                                            escrow_cert=cert,
                                            add_backup_passphrase=self.backuppassphrase)
                 luksdev = LUKSDevice("luks%d" % storage.nextID,
-                                     format=luksformat,
+                                     fmt=luksformat,
                                      parents=request)
             storage.createDevice(luksdev)
 
@@ -1310,12 +1545,15 @@ class SELinux(commands.selinux.FC3_SELinux):
                            SELINUX_ENFORCING: "enforcing",
                            SELINUX_PERMISSIVE: "permissive" }
 
-        if self.selinux not in selinux_states:
+        if self.selinux is None:
+            # Use the defaults set by the installed (or not) selinux package
+            return
+        elif self.selinux not in selinux_states:
             log.error("unknown selinux state: %s", self.selinux)
             return
 
         try:
-            selinux_cfg = SimpleConfigFile(ROOT_PATH+"/etc/selinux/config")
+            selinux_cfg = SimpleConfigFile(iutil.getSysroot()+"/etc/selinux/config")
             selinux_cfg.read()
             selinux_cfg.set(("SELINUX", selinux_states[self.selinux]))
             selinux_cfg.write()
@@ -1328,15 +1566,13 @@ class Services(commands.services.FC6_Services):
             if not svc.endswith(".service"):
                 svc += ".service"
 
-            iutil.execWithRedirect("systemctl", ["disable", svc],
-                                   root=ROOT_PATH)
+            iutil.execInSysroot("systemctl", ["disable", svc])
 
         for svc in self.enabled:
             if not svc.endswith(".service"):
                 svc += ".service"
 
-            iutil.execWithRedirect("systemctl", ["enable", svc],
-                                   root=ROOT_PATH)
+            iutil.execInSysroot("systemctl", ["enable", svc])
 
 class Timezone(commands.timezone.F18_Timezone):
     def __init__(self, *args):
@@ -1344,6 +1580,7 @@ class Timezone(commands.timezone.F18_Timezone):
 
         self._added_chrony = False
         self._enabled_chrony = False
+        self._disabled_chrony = False
 
     def setup(self, ksdata):
         if self.nontp:
@@ -1357,10 +1594,16 @@ class Timezone(commands.timezone.F18_Timezone):
                 ksdata.packages.packageList.remove(NTP_PACKAGE)
                 self._added_chrony = False
 
+            # Both un-enable and disable chrony, because sometimes it's installed
+            # off by default (packages) and sometimes not (liveimg).
             if self._enabled_chrony and NTP_SERVICE in ksdata.services.enabled:
                 ksdata.services.enabled.remove(NTP_SERVICE)
                 self._enabled_chrony = False
 
+            if NTP_SERVICE not in ksdata.services.disabled:
+                ksdata.services.disabled.append(NTP_SERVICE)
+                self._disabled_chrony = True
+
         else:
             if not iutil.service_running(NTP_SERVICE) and \
                     can_touch_runtime_system("start NTP service"):
@@ -1372,6 +1615,10 @@ class Timezone(commands.timezone.F18_Timezone):
                 ksdata.packages.packageList.append(NTP_PACKAGE)
                 self._added_chrony = True
 
+            if self._disabled_chrony and NTP_SERVICE in ksdata.services.disabled:
+                ksdata.services.disabled.remove(NTP_SERVICE)
+                self._disabled_chrony = False
+
             if not NTP_SERVICE in ksdata.services.enabled and \
                     not NTP_SERVICE in ksdata.services.disabled:
                 ksdata.services.enabled.append(NTP_SERVICE)
@@ -1385,11 +1632,11 @@ class Timezone(commands.timezone.F18_Timezone):
                         "back to default (America/New_York).", self.timezone)
             self.timezone = "America/New_York"
 
-        timezone.write_timezone_config(self, ROOT_PATH)
+        timezone.write_timezone_config(self, iutil.getSysroot())
 
         # write out NTP configuration (if set)
         if not self.nontp and self.ntpservers:
-            chronyd_conf_path = os.path.normpath(ROOT_PATH + ntp.NTP_CONFIG_FILE)
+            chronyd_conf_path = os.path.normpath(iutil.getSysroot() + ntp.NTP_CONFIG_FILE)
             try:
                 ntp.save_servers_to_config(self.ntpservers,
                                            conf_file_path=chronyd_conf_path)
@@ -1402,15 +1649,22 @@ class User(commands.user.F19_User):
 
         for usr in self.userList:
             kwargs = usr.__dict__
-            kwargs.update({"algo": algo, "root": ROOT_PATH})
-            users.createUser(usr.name, **kwargs)
+            kwargs.update({"algo": algo, "root": iutil.getSysroot()})
 
-class VolGroup(commands.volgroup.F20_VolGroup):
+            # If the user password came from a kickstart and it is blank we
+            # need to make sure the account is locked, not created with an
+            # empty password.
+            if ksdata.user.seen and kwargs.get("password", "") == "":
+                kwargs["password"] = None
+            if not users.createUser(usr.name, **kwargs):
+                log.error("User %s already exists, not creating.", usr.name)
+
+class VolGroup(commands.volgroup.F21_VolGroup):
     def execute(self, storage, ksdata, instClass):
         for v in self.vgList:
             v.execute(storage, ksdata, instClass)
 
-class VolGroupData(commands.volgroup.FC16_VolGroupData):
+class VolGroupData(commands.volgroup.F21_VolGroupData):
     def execute(self, storage, ksdata, instClass):
         pvs = []
 
@@ -1432,33 +1686,48 @@ class VolGroupData(commands.volgroup.FC16_VolGroupData):
                     dev = None
 
             if dev and dev.format.type != "lvmpv":
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Physical Volume %s has incorrect format (%s)" % (pv, dev.format.type)))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Physical volume \"%(device)s\" has a format of \"%(format)s\", but should have a format of \"lvmpv\".") %
+                             {"device": pv, "format": dev.format.type}))
 
             if not dev:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="Tried to use undefined partition %s in Volume Group specification" % pv))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Tried to use undefined partition \"%s\" in Volume Group specification") % pv))
 
             pvs.append(dev)
 
         if len(pvs) == 0 and not self.preexist:
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="Volume group defined without any physical volumes.  Either specify physical volumes or use --useexisting."))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("Volume group \"%s\" defined without any physical volumes.  Either specify physical volumes or use --useexisting.") % self.vgname))
 
-        if self.pesize not in getPossiblePhysicalExtents(floor=1024):
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="Volume group specified invalid pesize"))
+        if self.pesize == 0:
+            # default PE size requested -- we use blivet's default in KiB
+            self.pesize = LVM_PE_SIZE.convertTo(spec="KiB")
+
+        pesize = Size("%d KiB" % self.pesize)
+        possible_extents = getPossiblePhysicalExtents()
+        if pesize not in possible_extents:
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("Volume group given physical extent size of \"%(extentSize)s\", but must be one of:\n%(validExtentSizes)s.") %
+                         {"extentSize": pesize, "validExtentSizes": ", ".join(str(e) for e in possible_extents)}))
 
         # If --noformat or --useexisting was given, there's really nothing to do.
         if not self.format or self.preexist:
             if not self.vgname:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="--noformat or --useexisting used without giving a name"))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("volgroup --noformat and volgroup --useexisting must also use the --name= option.")))
 
             dev = devicetree.getDeviceByName(self.vgname)
             if not dev:
-                raise KickstartValueError(formatErrorMsg(self.lineno, msg="No preexisting VG with the name \"%s\" was found." % self.vgname))
+                raise KickstartValueError(formatErrorMsg(self.lineno,
+                        msg=_("Volume group \"%s\" given in volgroup command does not exist.") % self.vgname))
         elif self.vgname in (vg.name for vg in storage.vgs):
-            raise KickstartValueError(formatErrorMsg(self.lineno, msg="The volume group name \"%s\" is already in use." % self.vgname))
+            raise KickstartValueError(formatErrorMsg(self.lineno,
+                    msg=_("The volume group name \"%s\" is already in use.") % self.vgname))
         else:
             request = storage.newVG(parents=pvs,
                                     name=self.vgname,
-                                    peSize=self.pesize/1024.0)
+                                    peSize=pesize)
 
             storage.createDevice(request)
             if self.reserved_space:
@@ -1481,6 +1750,13 @@ class XConfig(commands.xconfig.F14_XConfig):
         # now write it out
         desktop.write()
 
+class SkipX(commands.skipx.FC3_SkipX):
+    def execute(self, *args):
+        if self.skipx:
+            desktop = Desktop()
+            desktop.runlevel = 3
+            desktop.write()
+
 class ZFCP(commands.zfcp.F14_ZFCP):
     def parse(self, args):
         fcp = commands.zfcp.F14_ZFCP.parse(self, args)
@@ -1493,34 +1769,15 @@ class ZFCP(commands.zfcp.F14_ZFCP):
 
 class Keyboard(commands.keyboard.F18_Keyboard):
     def execute(self, *args):
-        keyboard.write_keyboard_config(self, ROOT_PATH)
+        keyboard.write_keyboard_config(self, iutil.getSysroot())
 
-    def dracutSetupArgs(self, *args):
-        return keyboard.dracut_setup_args()
-
-
-class SpokeRegistry(dict):
-    """This class represents the ksdata.firstboot object and
-       maintains the ids of all user configured spokes.
-
-       The information is then used by inital_setup and GIE
-       to hide already configured spokes.
-    """
-
-    def __str__(self):
-        # do not write anything into kickstart
-        return ""
-
-    def execute(self, storage, ksdata, instClass, users):
-        path = os.path.join(ROOT_PATH, "var", "lib", "inital-setup")
-        try:
-            os.makedirs(path, 0755)
-        except OSError:
-            pass
-        f = open(os.path.join(path, "configured.ini"), "a")
-        for k,v in self.iteritems():
-            f.write("%s=%s\n" % (k, v))
-        f.close()
+class Upgrade(commands.upgrade.F20_Upgrade):
+    # Upgrade is no longer supported. If an upgrade command was included in
+    # a kickstart, warn the user and exit.
+    def parse(self, *args):
+        log.error("The upgrade kickstart command is no longer supported. Upgrade functionality is provided through fedup.")
+        sys.stderr.write(_("The upgrade kickstart command is no longer supported. Upgrade functionality is provided through fedup."))
+        sys.exit(1)
 
 ###
 ### HANDLERS
@@ -1557,7 +1814,9 @@ commandMap = {
         "rootpw": RootPw,
         "selinux": SELinux,
         "services": Services,
+        "skipx": SkipX,
         "timezone": Timezone,
+        "upgrade": Upgrade,
         "user": User,
         "volgroup": VolGroup,
         "xconfig": XConfig,
@@ -1608,9 +1867,6 @@ class AnacondaKSHandler(superclass):
             if classes:
                 addons[addon_id] = classes[0](name = addon_id)
 
-        # Prepare the structure to track configured spokes
-        self.configured_spokes = SpokeRegistry()
-
         # Prepare the final structures for 3rd party addons
         self.addons = AddonRegistry(addons)
 
@@ -1633,8 +1889,8 @@ class AnacondaPreParser(KickstartParser):
         self.registerSection(NullSection(self.handler, sectionOpen="%traceback"))
         self.registerSection(NullSection(self.handler, sectionOpen="%packages"))
         self.registerSection(NullSection(self.handler, sectionOpen="%addon"))
-        
-    
+
+
 class AnacondaKSParser(KickstartParser):
     def __init__ (self, handler, followIncludes=True, errorsAreFatal=True,
                   missingIncludeIsFatal=True, scriptClass=AnacondaKSScript):
@@ -1665,7 +1921,7 @@ def preScriptPass(f):
     except KickstartError as e:
         # We do not have an interface here yet, so we cannot use our error
         # handling callback.
-        print e
+        print(e)
         sys.exit(1)
 
     # run %pre scripts
@@ -1679,7 +1935,7 @@ def parseKickstart(f):
     ksparser = AnacondaKSParser(handler)
 
     # We need this so all the /dev/disk/* stuff is set up before parsing.
-    udev.udev_trigger(subsystem="block", action="change")
+    udev.trigger(subsystem="block", action="change")
     # So that drives onlined by these can be used in the ks file
     blivet.iscsi.iscsi().startup()
     blivet.fcoe.fcoe().startup()
@@ -1692,7 +1948,7 @@ def parseKickstart(f):
     except KickstartError as e:
         # We do not have an interface here yet, so we cannot use our error
         # handling callback.
-        print e
+        print(e)
         sys.exit(1)
 
     return handler
@@ -1721,11 +1977,11 @@ def runPostScripts(scripts):
 
     # Remove environment variables that cause problems for %post scripts.
     for var in ["LIBUSER_CONF"]:
-        if os.environ.has_key(var):
+        if var in os.environ:
             del(os.environ[var])
 
     log.info("Running kickstart %%post script(s)")
-    map (lambda s: s.run(ROOT_PATH), postScripts)
+    map (lambda s: s.run(iutil.getSysroot()), postScripts)
     log.info("All kickstart %%post script(s) have been run")
 
 def runPreScripts(scripts):
@@ -1747,12 +2003,22 @@ def runTracebackScripts(scripts):
         script.run("/")
     log.info("All kickstart %%traceback script(s) have been run")
 
+def resetCustomStorageData(ksdata):
+    cmds = ["partition", "raid", "volgroup", "logvol", "btrfs"]
+    map(ksdata.resetCommand, cmds)
+
+    ksdata.clearpart.type = CLEARPART_TYPE_NONE
+
 def doKickstartStorage(storage, ksdata, instClass):
     """ Setup storage state from the kickstart data """
     ksdata.clearpart.execute(storage, ksdata, instClass)
     if not any(d for d in storage.disks
                if not d.format.hidden and not d.protected):
         return
+
+    # snapshot free space now so that we know how much we had available
+    storage.createFreeSpaceSnapshot()
+
     ksdata.bootloader.execute(storage, ksdata, instClass)
     ksdata.autopart.execute(storage, ksdata, instClass)
     ksdata.partition.execute(storage, ksdata, instClass)
diff --git a/anaconda/pyanaconda/localization.py b/anaconda/pyanaconda/localization.py
index c95fa1d..a7cc908 100644
--- a/anaconda/pyanaconda/localization.py
+++ b/anaconda/pyanaconda/localization.py
@@ -26,6 +26,7 @@ import re
 import langtable
 import locale as locale_mod
 import glob
+from collections import namedtuple
 
 from pyanaconda import constants
 from pyanaconda.iutil import upcase_first_letter
@@ -469,3 +470,89 @@ def load_firmware_language(lang):
 
     log.debug("Using UEFI PlatformLang '%s' ('%s') as our language.", d, locales[0])
     setup_locale(locales[0], lang)
+
+_DateFieldSpec = namedtuple("DateFieldSpec", ["format", "suffix"])
+
+def resolve_date_format(year, month, day, fail_safe=True):
+    """
+    Puts the year, month and day objects in the right order according to the
+    currently set locale and provides format specification for each of the
+    fields.
+
+    :param year: any object or value representing year
+    :type year: any
+    :param month: any object or value representing month
+    :type month: any
+    :param day: any object or value representing day
+    :type day: any
+    :param bool fail_safe: whether to fall back to default in case of invalid
+                           format or raise exception instead
+    :returns: a pair where the first field contains a tuple with the year, month
+              and day objects/values put in the right order and where the second
+              field contains a tuple with three :class:`_DateFieldSpec` objects
+              specifying formats respectively to the first (year, month, day)
+              field, e.g. ((year, month, day), (y_fmt, m_fmt, d_fmt))
+    :rtype: tuple
+    :raise ValueError: in case currently set locale has unsupported date
+                       format and fail_safe is set to False
+
+    """
+
+    FAIL_SAFE_DEFAULT = "%Y-%m-%d"
+
+    def order_terms_formats(fmt_str):
+        # see date (1), 'O' (not '0') is a mystery, 'E' is Buddhist calendar, '(.*)'
+        # is an arbitrary suffix
+        field_spec_re = re.compile(r'([-_0OE^#]*)([yYmbBde])(.*)')
+
+        # see date (1)
+        fmt_str = fmt_str.replace("%F", "%Y-%m-%d")
+
+        # e.g. "%d.%m.%Y" -> ['d.', 'm.', 'Y']
+        fields = fmt_str.split("%")[1:]
+
+        ordered_terms = []
+        ordered_formats = []
+        for field in fields:
+            match = field_spec_re.match(field)
+            if not match:
+                # ignore fields we are not interested in (like %A for weekday name, etc.)
+                continue
+
+            prefix, item, suffix = match.groups()
+            if item in ("d", "e"):
+                # "e" is the same as "_d"
+                ordered_terms.append(day)
+            elif item in ("Y", "y"):
+                # 4-digit year, 2-digit year
+                ordered_terms.append(year)
+            elif item in ("m", "b", "B"):
+                # month number, short month name, long month name
+                ordered_terms.append(month)
+
+            # "%" + prefix + item gives a format for date/time formatting functions
+            ordered_formats.append(_DateFieldSpec("%" + prefix + item, suffix.strip()))
+
+        if len(ordered_terms) != 3 or len(ordered_formats) != 3:
+            raise ValueError("Not all fields successfully identified in the format '%s'" % fmt_str)
+
+        return (tuple(ordered_terms), tuple(ordered_formats))
+
+    fmt_str = locale_mod.nl_langinfo(locale_mod.D_FMT)
+
+    if not fmt_str or "%" not in fmt_str:
+        if fail_safe:
+            # use some sane default
+            fmt_str = FAIL_SAFE_DEFAULT
+        else:
+            raise ValueError("Invalid date format string for current locale: '%s'" % fmt_str)
+
+    try:
+        return order_terms_formats(fmt_str)
+    except ValueError:
+        if not fail_safe:
+            raise
+        else:
+            # if this call fails too, something is going terribly wrong and we
+            # should be informed about it
+            return order_terms_formats(FAIL_SAFE_DEFAULT)
diff --git a/anaconda/pyanaconda/network.py b/anaconda/pyanaconda/network.py
index d62da3d..1fe62a6 100644
--- a/anaconda/pyanaconda/network.py
+++ b/anaconda/pyanaconda/network.py
@@ -24,7 +24,6 @@
 #            David Cantrell <dcantrell@redhat.com>
 #            Radek Vykydal <rvykydal@redhat.com>
 
-import string
 import shutil
 from pyanaconda import iutil
 import socket
@@ -34,7 +33,7 @@ import threading
 import re
 import dbus
 import IPy
-import uuid
+from uuid import uuid4
 import itertools
 
 from pyanaconda.simpleconfig import SimpleConfigFile
@@ -45,6 +44,7 @@ from pyanaconda import nm
 from pyanaconda import constants
 from pyanaconda.flags import flags, can_touch_runtime_system
 from pyanaconda.i18n import _
+from pyanaconda.regexes import HOSTNAME_PATTERN_WITHOUT_ANCHORS
 
 from gi.repository import NetworkManager
 
@@ -59,10 +59,6 @@ ipv6ConfFile = "/etc/sysctl.d/anaconda.conf"
 ifcfgLogFile = "/tmp/ifcfg.log"
 DEFAULT_HOSTNAME = "dom0"
 
-# part of a valid hostname between two periods (cannot start nor end with '-')
-# for more info about '(?!-)' and '(?<!-)' see 're' module documentation
-HOSTNAME_PART_RE = re.compile(r"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
-
 ifcfglog = None
 
 network_connected = None
@@ -109,17 +105,7 @@ def sanityCheckHostname(hostname):
     if len(hostname) > 255:
         return (False, _("Hostname must be 255 or fewer characters in length."))
 
-    validStart = string.ascii_letters + string.digits
-
-    if hostname[0] not in validStart:
-        return (False, _("Hostname must start with a valid character in the "
-                         "ranges 'a-z', 'A-Z', or '0-9'"))
-
-    if hostname.endswith("."):
-        # hostname can end with '.', but the regexp used below would not match
-        hostname = hostname[:-1]
-
-    if not all(HOSTNAME_PART_RE.match(part) for part in hostname.split(".")):
+    if not (re.match('^' + HOSTNAME_PATTERN_WITHOUT_ANCHORS + '$', hostname)):
         return (False, _("Hostnames can only contain the characters 'a-z', "
                          "'A-Z', '0-9', '-', or '.', parts between periods "
                          "must contain something and cannot start or end with "
@@ -129,15 +115,17 @@ def sanityCheckHostname(hostname):
 
 # Return a list of IP addresses for all active devices.
 def getIPs():
-    ips = []
+    ipv4_addresses = []
+    ipv6_addresses = []
     for devname in nm.nm_activated_devices():
         try:
-            ips += (nm.nm_device_ip_addresses(devname, version=4) +
-                    nm.nm_device_ip_addresses(devname, version=6))
+            ipv4_addresses += nm.nm_device_ip_addresses(devname, version=4)
+            ipv6_addresses += nm.nm_device_ip_addresses(devname, version=6)
         except (dbus.DBusException, ValueError) as e:
             log.warning("Got an exception trying to get the ip addr "
                         "of %s: %s", devname, e)
-    return ips
+    # prefer IPv4 addresses to IPv6 addresses
+    return ipv4_addresses + ipv6_addresses
 
 # Return the first real non-local IP we find
 def getFirstRealIP():
@@ -285,7 +273,7 @@ def dumpMissingDefaultIfcfgs():
 
         # check that device has connection without ifcfg file
         try:
-            con_uuid = nm.nm_device_setting_value(devname, "connection", "uuid")
+            nm.nm_device_setting_value(devname, "connection", "uuid")
         except nm.SettingsNotFoundError:
             continue
         if find_ifcfg_file_of_device(devname):
@@ -350,24 +338,26 @@ def dracutBootArguments(devname, ifcfg, storage_ipaddr, hostname=None):
                     gateway = "[%s]" % ifcfg.get('IPV6_DEFAULTGW')
                 else:
                     gateway = ""
-                netargs.add("ip=%s::%s:%s:%s:%s:none" % (ipaddr, gateway,
-                           ifcfg.get('PREFIX'), hostname, devname))
+                netargs.add("ip=%s::%s::%s:%s:none" % (ipaddr, gateway,
+                            hostname, devname))
         else:
             if iutil.lowerASCII(ifcfg.get('bootproto')) == 'dhcp':
                 netargs.add("ip=%s:dhcp" % devname)
             else:
-                if ifcfg.get('GATEWAY'):
-                    gateway = ifcfg.get('GATEWAY')
+                cfgidx = ''
+                if ifcfg.get('IPADDR0'):
+                    cfgidx = '0'
+                if ifcfg.get('GATEWAY%s' % cfgidx):
+                    gateway = ifcfg.get('GATEWAY%s' % cfgidx)
                 else:
                     gateway = ""
-
-                netmask = ifcfg.get('netmask')
-                prefix  = ifcfg.get('prefix')
+                netmask = ifcfg.get('NETMASK%s' % cfgidx)
+                prefix  = ifcfg.get('PREFIX%s' % cfgidx)
                 if not netmask and prefix:
                     netmask = prefix2netmask(int(prefix))
-
-                netargs.add("ip=%s::%s:%s:%s:%s:none" % (ifcfg.get('ipaddr'),
-                           gateway, netmask, hostname, devname))
+                ipaddr = ifcfg.get('IPADDR%s' % cfgidx)
+                netargs.add("ip=%s::%s:%s:%s:%s:none" %
+                            (ipaddr, gateway, netmask, hostname, devname))
 
         hwaddr = ifcfg.get("HWADDR")
         if hwaddr:
@@ -458,7 +448,7 @@ def bond_options_ksdata_to_dbus(opts_str):
 def add_connection_for_ksdata(networkdata, devname):
 
     added_connections = []
-    con_uuid = str(uuid.uuid4())
+    con_uuid = str(uuid4())
     values = _get_ip_setting_values_from_ksdata(networkdata)
     # HACK preventing NM to autoactivate the connection
     #values.append(['connection', 'autoconnect', networkdata.onboot, 'b'])
@@ -473,19 +463,19 @@ def add_connection_for_ksdata(networkdata, devname):
         values.append(['bond', 'interface-name', devname, 's'])
         options = bond_options_ksdata_to_dbus(networkdata.bondopts)
         values.append(['bond', 'options', options, 'a{ss}'])
-        for i, slave in enumerate(networkdata.bondslaves.split(","), 1):
+        for _i, slave in enumerate(networkdata.bondslaves.split(","), 1):
 
             #slave_name = "%s slave %d" % (devname, i)
             slave_name = slave
 
             svalues = []
-            suuid =  str(uuid.uuid4())
+            suuid =  str(uuid4())
             svalues.append(['connection', 'uuid', suuid, 's'])
             svalues.append(['connection', 'id', slave_name, 's'])
             svalues.append(['connection', 'slave-type', 'bond', 's'])
             svalues.append(['connection', 'master', devname, 's'])
             svalues.append(['connection', 'type', '802-3-ethernet', 's'])
-            mac = nm.nm_device_hwaddress(slave)
+            mac = nm.nm_device_perm_hwaddress(slave)
             mac = [int(b, 16) for b in mac.split(":")]
             svalues.append(['802-3-ethernet', 'mac-address', mac, 'ay'])
 
@@ -519,7 +509,7 @@ def add_connection_for_ksdata(networkdata, devname):
             svalues.append(['connection', 'slave-type', 'team', 's'])
             svalues.append(['connection', 'master', devname, 's'])
             svalues.append(['connection', 'type', '802-3-ethernet', 's'])
-            mac = nm.nm_device_hwaddress(slave)
+            mac = nm.nm_device_perm_hwaddress(slave)
             mac = [int(b, 16) for b in mac.split(":")]
             svalues.append(['802-3-ethernet', 'mac-address', mac, 'ay'])
             svalues.append(['team-port', 'config', cfg, 's'])
@@ -537,8 +527,7 @@ def add_connection_for_ksdata(networkdata, devname):
         dev_spec = None
     # type "vlan"
     elif networkdata.vlanid:
-        parent, _sep, _vlanid = devname.partition(".")
-        values.append(['vlan', 'parent', parent, 's'])
+        values.append(['vlan', 'parent', networkdata.parent, 's'])
         values.append(['connection', 'type', 'vlan', 's'])
         values.append(['connection', 'id', devname, 's'])
         values.append(['vlan', 'interface-name', devname, 's'])
@@ -548,7 +537,7 @@ def add_connection_for_ksdata(networkdata, devname):
     else:
         values.append(['connection', 'type', '802-3-ethernet', 's'])
         values.append(['connection', 'id', devname, 's'])
-        mac = nm.nm_device_hwaddress(devname)
+        mac = nm.nm_device_perm_hwaddress(devname)
         mac = [int(b, 16) for b in mac.split(":")]
         values.append(['802-3-ethernet', 'mac-address', mac, 'ay'])
         dev_spec = devname
@@ -557,20 +546,26 @@ def add_connection_for_ksdata(networkdata, devname):
     added_connections.insert(0, (con_uuid, dev_spec))
     return added_connections
 
-def ksdata_from_ifcfg(devname):
+def ksdata_from_ifcfg(devname, uuid=None):
+
+    if devname not in nm.nm_devices():
+        return None
 
     if nm.nm_device_is_slave(devname):
         return None
+    if nm.nm_device_type_is_wifi(devname):
+        # wifi from kickstart is not supported yet
+        return None
 
-    ifcfg_path = None
+    if not uuid:
+        # Find ifcfg file for the device.
+        # If the device is active, use uuid of its active connection.
+        uuid = nm.nm_device_active_con_uuid(devname)
 
-    # Find ifcfg file for the device.
-    # If the device is active, use uuid of its active connection.
-    uuid = nm.nm_device_active_con_uuid(devname)
     if uuid:
         ifcfg_path = find_ifcfg_file([("UUID", uuid)])
     else:
-        # If not, look it up by other values depending on its type
+        # look it up by other values depending on its type
         ifcfg_path = find_ifcfg_file_of_device(devname)
 
     if not ifcfg_path:
@@ -592,7 +587,8 @@ def ksdata_from_ifcfg(devname):
     elif nm.nm_device_type_is_team(devname):
         nd.device = devname
     elif nm.nm_device_type_is_vlan(devname):
-        nd.device = devname.split(".")[0]
+        if devname != default_ks_vlan_interface_name(nd.device, nd.vlanid):
+            nd.interfacename = devname
 
     return nd
 
@@ -701,7 +697,7 @@ def ifcfg_to_ksdata(ifcfg, devname):
         kwargs["device"] = ifcfg.get("PHYSDEV")
         kwargs["vlanid"] = ifcfg.get("VLAN_ID")
 
-    # pylint: disable-msg=E1101
+    # pylint: disable=no-member
     nd = handler.NetworkData(**kwargs)
 
     # teaming
@@ -719,7 +715,7 @@ def ifcfg_to_ksdata(ifcfg, devname):
 def hostname_ksdata(hostname):
     from pyanaconda.kickstart import AnacondaKSHandler
     handler = AnacondaKSHandler()
-    # pylint: disable-msg=E1101
+    # pylint: disable=no-member
     return handler.NetworkData(hostname=hostname, bootProto="")
 
 def find_ifcfg_file_of_device(devname, root_path=""):
@@ -740,7 +736,7 @@ def find_ifcfg_file_of_device(devname, root_path=""):
         ifcfg_path = find_ifcfg_file([("DEVICE", devname)])
     elif nm.nm_device_type_is_ethernet(devname):
         try:
-            hwaddr = nm.nm_device_hwaddress(devname)
+            hwaddr = nm.nm_device_perm_hwaddress(devname)
         except nm.PropertyNotFoundError:
             hwaddr = None
         if hwaddr:
@@ -852,6 +848,23 @@ def ifaceForHostIP(host):
 
     return routeInfo[routeInfo.index("dev") + 1]
 
+def default_route_device():
+    routes = iutil.execWithCapture("ip", ["route", "show"])
+    if not routes:
+        log.error("Could not get default route device")
+        return None
+
+    for line in routes.split("\n"):
+        if line.startswith("default"):
+            parts = line.split()
+            if len(parts) >= 5 and parts[3] == "dev":
+                return parts[4]
+            else:
+                log.error("Could not parse default route device: %s", line)
+                return None
+
+    return None
+
 def copyFileToPath(fileName, destPath='', overwrite=False):
     if not os.path.isfile(fileName):
         return False
@@ -881,50 +894,45 @@ def copyDhclientConfFiles(destPath):
         copyFileToPath(dhclientfile, destPath)
 
 def ks_spec_to_device_name(ksspec=""):
-
-    if not ksspec:
-        ksspec = flags.cmdline.get('ksdevice', "")
-    ksdevice = ksspec
-
     bootif_mac = ''
-    if ksdevice == 'bootif' and "BOOTIF" in flags.cmdline:
+    if ksspec == 'bootif' and "BOOTIF" in flags.cmdline:
         bootif_mac = flags.cmdline["BOOTIF"][3:].replace("-", ":").upper()
     for dev in sorted(nm.nm_devices()):
         # "eth0"
-        if ksdevice == dev:
+        if ksspec == dev:
             break
         # "link"
-        elif ksdevice == 'link':
+        elif ksspec == 'link':
             try:
                 link_up = nm.nm_device_carrier(dev)
             except ValueError as e:
                 log.debug("ks_spec_to_device_name: %s", e)
                 continue
             if link_up:
-                ksdevice = dev
+                ksspec = dev
                 break
         # "XX:XX:XX:XX:XX:XX" (mac address)
-        elif ':' in ksdevice:
+        elif ':' in ksspec:
             try:
-                hwaddr = nm.nm_device_hwaddress(dev)
+                hwaddr = nm.nm_device_perm_hwaddress(dev)
             except ValueError as e:
                 log.debug("ks_spec_to_device_name: %s", e)
                 continue
-            if ksdevice.lower() == hwaddr.lower():
-                ksdevice = dev
+            if ksspec.lower() == hwaddr.lower():
+                ksspec = dev
                 break
         # "bootif" and BOOTIF==XX:XX:XX:XX:XX:XX
-        elif ksdevice == 'bootif':
+        elif ksspec == 'bootif':
             try:
-                hwaddr = nm.nm_device_hwaddress(dev)
+                hwaddr = nm.nm_device_perm_hwaddress(dev)
             except ValueError as e:
                 log.debug("ks_spec_to_device_name: %s", e)
                 continue
             if bootif_mac.lower() == hwaddr.lower():
-                ksdevice = dev
+                ksspec = dev
                 break
 
-    return ksdevice
+    return ksspec
 
 def set_hostname(hn):
     if can_touch_runtime_system("set hostname", touch_live=True):
@@ -1024,10 +1032,9 @@ def write_network_config(storage, ksdata, instClass, rootpath):
     set_hostname(ksdata.network.hostname)
     write_sysconfig_network(rootpath, overwrite=flags.livecdInstall)
     disableIPV6(rootpath)
-    if not flags.imageInstall:
-        copyIfcfgFiles(rootpath)
-        copyDhclientConfFiles(rootpath)
-        copyFileToPath("/etc/resolv.conf", rootpath, overwrite=flags.livecdInstall)
+    copyIfcfgFiles(rootpath)
+    copyDhclientConfFiles(rootpath)
+    copyFileToPath("/etc/resolv.conf", rootpath, overwrite=flags.livecdInstall)
 
 def update_hostname_data(ksdata, hostname=None):
     if not hostname:
@@ -1043,86 +1050,29 @@ def update_hostname_data(ksdata, hostname=None):
         nd = hostname_ksdata(hostname)
         ksdata.network.network.append(nd)
 
-def get_device_name(devspec):
+def get_device_name(network_data):
 
-    devices = nm.nm_devices()
-    devname = None
-
-    if not devspec:
-        if "ksdevice" in flags.cmdline:
-            msg = "ksdevice boot parameter"
-            devname = ks_spec_to_device_name(flags.cmdline["ksdevice"])
-        elif nm.nm_is_connected():
-            # device activated in stage 1 by network kickstart command
-            msg = "first active device"
-            try:
-                devname = nm.nm_activated_devices()[0]
-            except IndexError:
-                log.debug("get_device_name: NM is connected but no activated devices found")
-        else:
-            msg = "first device found"
-            devname = min(devices)
-        log.info("unspecified network --device in kickstart, using %s (%s)",
-                 devname, msg)
-    else:
-        if iutil.lowerASCII(devspec) == "ibft":
-            devname = ""
-        if iutil.lowerASCII(devspec) == "link":
-            for dev in sorted(devices):
-                try:
-                    link_up = nm.nm_device_carrier(dev)
-                except ValueError as e:
-                    log.debug("get_device_name: %s", e)
-                    continue
-                if link_up:
-                    devname = dev
-                    break
-            else:
-                log.error("Kickstart: No network device with link found")
-        elif iutil.lowerASCII(devspec) == "bootif":
-            if "BOOTIF" in flags.cmdline:
-                # MAC address like 01-aa-bb-cc-dd-ee-ff
-                devname = flags.cmdline["BOOTIF"][3:]
-                devname = devname.replace("-",":")
-            else:
-                log.error("Using --device=bootif without BOOTIF= boot option supplied")
-        else: devname = devspec
-
-    if devname and devname not in devices:
-        for d in devices:
-            try:
-                hwaddr = nm.nm_device_hwaddress(d)
-            except ValueError as e:
-                log.debug("get_device_name: %s", e)
-                continue
-            if hwaddr.lower() == devname.lower():
-                devname = d
-                break
-        else:
+    ksspec = network_data.device or flags.cmdline.get('ksdevice') or ""
+    dev_name = ks_spec_to_device_name(ksspec)
+    if not dev_name:
+        return ""
+    if dev_name not in nm.nm_devices():
+        if not any((network_data.vlanid, network_data.bondslaves, network_data.teamslaves)):
             return ""
+    if network_data.vlanid:
+        network_data.parent = dev_name
+        dev_name = network_data.interfacename or default_ks_vlan_interface_name(network_data.parent, network_data.vlanid)
 
-    return devname
+    return dev_name
 
 def setOnboot(ksdata):
     updated_devices = []
     for network_data in ksdata.network.network:
 
-        # vlan
-        if network_data.vlanid:
-            physdev = get_device_name(network_data.device) or network_data.device
-            devname = "%s.%s" % (physdev, network_data.vlanid)
-        # bond
-        elif network_data.bondslaves:
-            devname = network_data.device
-        # team
-        elif network_data.teamslaves:
-            devname = network_data.device
-        # ethernet
-        else:
-            devname = get_device_name(network_data.device)
-            if not devname:
-                log.warning("Kickstart: The provided network interface %s does not exist", network_data.device)
-                continue
+        devname = get_device_name(network_data)
+        if not devname:
+            log.warning("network: set ONBOOT: --device %s does not exist", network_data.device)
+            continue
 
         updated_devices.append(devname)
         try:
@@ -1131,31 +1081,44 @@ def setOnboot(ksdata):
             log.debug("setOnboot: %s", e)
     return updated_devices
 
-def apply_kickstart_from_pre_section(ksdata):
+def apply_kickstart(ksdata):
     applied_devices = []
 
-    for network_data in ksdata.network.network:
+    for i, network_data in enumerate(ksdata.network.network):
 
         # TODO: wireless not supported yet
         if network_data.essid:
             continue
 
-        # get device name for device specified by MAC, link, bootif, etc...
-        dev_name = ks_spec_to_device_name(network_data.device)
+        dev_name = get_device_name(network_data)
         if not dev_name:
-            log.error("Kickstart: The provided network interface %s does not exist", network_data.device)
+            log.warning("network: apply kickstart: --device %s does not exist", network_data.device)
             continue
 
-        if network_data.vlanid:
-            dev_name = "%s.%s" % (dev_name, network_data.vlanid)
-
         ifcfg_path = find_ifcfg_file_of_device(dev_name)
-        # if the device was already configured in intramfs by kickstart ignore it
         if ifcfg_path:
             with open(ifcfg_path, 'r') as f:
+                # If we have kickstart ifcfg from initramfs
                 if "Generated by parse-kickstart" in f.read():
+                    # and we should activate the device
+                    if i == 0 or network_data.activate:
+                        ifcfg = IfcfgFile(ifcfg_path)
+                        ifcfg.read()
+                        con_uuid = ifcfg.get("UUID")
+                        # and the ifcfg had not been already applied to device by NM
+                        if con_uuid != nm.nm_device_active_con_uuid(dev_name):
+                            # apply it overriding configuration generated by NM
+                            # taking over connection activated in initramfs
+                            log.debug("network: kickstart - reactivating device %s with %s", dev_name, con_uuid)
+                            try:
+                                nm.nm_activate_device_connection(dev_name, con_uuid)
+                            except nm.UnknownConnectionError:
+                                log.warning("network: kickstart - can't activate connection %s on %s",
+                                            con_uuid, dev_name)
                     continue
 
+        # If we don't have kickstart ifcfg from initramfs the command was added
+        # in %pre section after switch root, so apply it now
         applied_devices.append(dev_name)
         if ifcfg_path:
             # if the device was already configured in initramfs update the settings
@@ -1169,26 +1132,30 @@ def apply_kickstart_from_pre_section(ksdata):
 
         if network_data.activate:
             for con_uuid, dev_name in added_connections:
-                nm.nm_activate_device_connection(dev_name, con_uuid)
-
+                try:
+                    nm.nm_activate_device_connection(dev_name, con_uuid)
+                except nm.UnknownConnectionError:
+                    log.warning("network: pre kickstart: can't activate connection %s on %s",
+                               con_uuid, dev_name)
     return applied_devices
 
 def networkInitialize(ksdata):
+    if not can_touch_runtime_system("networkInitialize", touch_live=True):
+        return
 
     log.debug("network: devices found %s", nm.nm_devices())
     logIfcfgFiles("network initialization")
 
-    if not flags.imageInstall:
-        devnames = apply_kickstart_from_pre_section(ksdata)
-        if devnames:
-            msg = "kickstart pre section applied for devices %s" % devnames
-            log.debug("network: %s", msg)
-            logIfcfgFiles(msg)
-        devnames = dumpMissingDefaultIfcfgs()
-        if devnames:
-            msg = "missing ifcfgs created for devices %s" % devnames
-            log.debug("network: %s", msg)
-            logIfcfgFiles(msg)
+    devnames = apply_kickstart(ksdata)
+    if devnames:
+        msg = "kickstart pre section applied for devices %s" % devnames
+        log.debug("network: %s", msg)
+        logIfcfgFiles(msg)
+    devnames = dumpMissingDefaultIfcfgs()
+    if devnames:
+        msg = "missing ifcfgs created for devices %s" % devnames
+        log.debug("network: %s", msg)
+        logIfcfgFiles(msg)
 
     # For kickstart network --activate option we set ONBOOT=yes
     # in dracut to get devices activated by NM. The real network --onboot
@@ -1219,7 +1186,8 @@ def _get_ntp_servers_from_dhcp(ksdata):
             hostname = server_address
         hostnames.append(hostname)
     # check if some NTP servers were specified from kickstart
-    if not ksdata.timezone.ntpservers:
+    if not ksdata.timezone.ntpservers \
+       and not (flags.imageInstall or flags.dirInstall):
         # no NTP servers were specified, add those from DHCP
         ksdata.timezone.ntpservers = hostnames
 
@@ -1227,7 +1195,7 @@ def _wait_for_connecting_NM():
     """If NM is in connecting state, wait for connection.
     Return value: NM has got connection."""
 
-    if nm.nm_is_connected:
+    if nm.nm_is_connected():
         return True
 
     if nm.nm_is_connecting():
@@ -1360,3 +1328,37 @@ def status_message():
         msg = _("No network devices available")
 
     return msg
+
+def default_ks_vlan_interface_name(parent, vlanid):
+    return "%s.%s" % (parent, vlanid)
+
+def has_some_wired_autoconnect_device():
+    """Is there a wired network device with autoconnect?"""
+    for dev in nm.nm_devices():
+        if nm.nm_device_type_is_wifi(dev):
+            continue
+        try:
+            onboot = nm.nm_device_setting_value(dev, "connection", "autoconnect")
+        except nm.SettingsNotFoundError:
+            continue
+        # None means the setting was not found, which means NM is using
+        # default (True)
+        if onboot == True or onboot is None:
+            return True
+    return False
+
+def update_onboot_value(devname, value, ksdata):
+    """Update onboot value in ifcfg files and ksdata"""
+    log.debug("network: setting ONBOOT value of %s to %s", devname, value)
+    ifcfg_path = find_ifcfg_file_of_device(devname, root_path=iutil.getSysroot())
+    if not ifcfg_path:
+        log.debug("network: can't find ifcfg file of %s", devname)
+        return
+    ifcfg = IfcfgFile(ifcfg_path)
+    ifcfg.read()
+    ifcfg.set(('ONBOOT', 'yes'))
+    ifcfg.write()
+    for nd in ksdata.network.network:
+        if nd.device == devname:
+            nd.onboot = True
+            break
diff --git a/anaconda/pyanaconda/nm.py b/anaconda/pyanaconda/nm.py
index 4daaa49..6e1c8e2 100644
--- a/anaconda/pyanaconda/nm.py
+++ b/anaconda/pyanaconda/nm.py
@@ -25,8 +25,11 @@ import IPy
 import struct
 import socket
 import re
+import logging
+log = logging.getLogger("anaconda")
 
 from pyanaconda.constants import DEFAULT_DBUS_TIMEOUT
+from pyanaconda.flags import flags, can_touch_runtime_system
 
 supported_device_types = [
     NetworkManager.DeviceType.ETHERNET,
@@ -48,6 +51,11 @@ class UnmanagedDeviceError(Exception):
     def __str__(self):
         return self.__repr__()
 
+class DeviceNotActiveError(Exception):
+    """Device of specified name is not active"""
+    def __str__(self):
+        return self.__repr__()
+
 class PropertyNotFoundError(ValueError):
     """Property of NM object was not found"""
     def __str__(self):
@@ -63,25 +71,42 @@ class UnknownMethodGetError(Exception):
     def __str__(self):
         return self.__repr__()
 
+# bug #1062417 e.g. for ethernet device without link
+class UnknownConnectionError(Exception):
+    """Connection is not available for the device"""
+    def __str__(self):
+        return self.__repr__()
+
 def _get_proxy(bus_type=Gio.BusType.SYSTEM,
-               flags=Gio.DBusProxyFlags.NONE,
+               proxy_flags=Gio.DBusProxyFlags.NONE,
                info=None,
                name="org.freedesktop.NetworkManager",
                object_path="/org/freedesktop/NetworkManager",
                interface_name="org.freedesktop.NetworkManager",
                cancellable=None):
-    proxy = Gio.DBusProxy.new_for_bus_sync(bus_type,
-                                           flags,
-                                           info,
-                                           name,
-                                           object_path,
-                                           interface_name,
-                                           cancellable)
+    try:
+        proxy = Gio.DBusProxy.new_for_bus_sync(bus_type,
+                                               proxy_flags,
+                                               info,
+                                               name,
+                                               object_path,
+                                               interface_name,
+                                               cancellable)
+    except GLib.GError as e:
+        if can_touch_runtime_system("raise GLib.GError", touch_live=True):
+            raise
+
+        log.error("_get_proxy failed: %s", e)
+        proxy = None
+
     return proxy
 
 def _get_property(object_path, prop, interface_name_suffix=""):
     interface_name = "org.freedesktop.NetworkManager" + interface_name_suffix
     proxy = _get_proxy(object_path=object_path, interface_name="org.freedesktop.DBus.Properties")
+    if not proxy:
+        return None
+
     try:
         prop = proxy.Get('(ss)', interface_name, prop)
     except GLib.GError as e:
@@ -100,7 +125,13 @@ def nm_state():
     :return: state of NetworkManager
     :rtype: integer
     """
-    return _get_property("/org/freedesktop/NetworkManager", "State")
+    prop = _get_property("/org/freedesktop/NetworkManager", "State")
+
+    # If this is an image/dir install assume the network is up
+    if not prop and (flags.imageInstall or flags.dirInstall):
+        return NetworkManager.State.CONNECTED_GLOBAL
+    else:
+        return prop
 
 # FIXME - use just GLOBAL? There is some connectivity checking
 # for GLOBAL in NM (nm_connectivity_get_connected), not sure if
@@ -134,6 +165,9 @@ def nm_devices():
     interfaces = []
 
     proxy = _get_proxy()
+    if not proxy:
+        return []
+
     devices = proxy.GetDevices()
     for device in devices:
         device_type = _get_property(device, "DeviceType", ".Device")
@@ -154,13 +188,21 @@ def nm_activated_devices():
     interfaces = []
 
     active_connections = _get_property("/org/freedesktop/NetworkManager", "ActiveConnections")
+    if not active_connections:
+        return []
+
     for ac in active_connections:
-        state = _get_property(ac, "State", ".Connection.Active")
+        try:
+            state = _get_property(ac, "State", ".Connection.Active")
+        except UnknownMethodGetError:
+            continue
         if state != NetworkManager.ActiveConnectionState.ACTIVATED:
             continue
         devices = _get_property(ac, "Devices", ".Connection.Active")
         for device in devices:
-            iface = _get_property(device, "Interface", ".Device")
+            iface = _get_property(device, "IpInterface", ".Device")
+            if not iface:
+                iface = _get_property(device, "Interface", ".Device")
             interfaces.append(iface)
 
     return interfaces
@@ -307,6 +349,18 @@ def nm_device_hwaddress(name):
     """
     return nm_device_property(name, "HwAddress")
 
+def nm_device_perm_hwaddress(name):
+    """Return active hardware address of device ('HwAddress' property)
+
+       :param name: name of device
+       :type name: str
+       :return: active hardware address of device ('HwAddress' property)
+       :rtype: str
+       :raise UnknownDeviceError: if device is not found
+       :raise PropertyNotFoundError: if 'HwAddress' property is not found
+    """
+    return nm_device_property(name, "PermHwAddress")
+
 def nm_device_active_con_uuid(name):
     """Return uuid of device's active connection
 
@@ -486,7 +540,7 @@ def nm_hwaddr_to_device_name(hwaddr):
         :rtype: str
     """
     for device in nm_devices():
-        if nm_device_hwaddress(device).upper() == hwaddr.upper():
+        if nm_device_perm_hwaddress(device).upper() == hwaddr.upper():
             return device
     return None
 
@@ -534,7 +588,7 @@ def _device_settings(name):
         settings = _find_settings(name, 'connection', 'interface-name')
         if not settings:
             try:
-                hwaddr_str = nm_device_hwaddress(name)
+                hwaddr_str = nm_device_perm_hwaddress(name)
             except PropertyNotFoundError:
                 settings = []
             else:
@@ -697,7 +751,12 @@ def nm_disconnect_device(name):
         raise
 
     device_proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device")
-    device_proxy.Disconnect()
+    try:
+        device_proxy.Disconnect()
+    except GLib.GError as e:
+        if "org.freedesktop.NetworkManager.Device.NotActive" in e.message:
+            raise DeviceNotActiveError(name, e)
+        raise
 
 def nm_activate_device_connection(dev_name, con_uuid):
     """Activate device with specified connection.
@@ -710,6 +769,7 @@ def nm_activate_device_connection(dev_name, con_uuid):
        :raise UnmanagedDeviceError: if device is not managed by NM
                                     or unavailable
        :raise SettingsNotFoundError: if conneciton with given uuid was not found
+       :raise UnknownConnectionError: if connection is not available for the device
     """
 
     if dev_name is None:
@@ -734,6 +794,8 @@ def nm_activate_device_connection(dev_name, con_uuid):
     except GLib.GError as e:
         if "org.freedesktop.NetworkManager.UnmanagedDevice" in e.message:
             raise UnmanagedDeviceError(dev_name, e)
+        elif "org.freedesktop.NetworkManager.UnknownConnection" in e.message:
+            raise UnknownConnectionError(dev_name, e)
         raise
 
 def nm_add_connection(values):
@@ -764,6 +826,21 @@ def nm_add_connection(values):
     connection = proxy.AddConnection('(a{sa{sv}})', settings)
     return connection
 
+def nm_delete_connection(uuid):
+    """Delete connection specified by uuid.
+
+       :param uuid: uuid of connection to be deleted
+       :type uuid: str
+       :return: True if connection was deleted, False if it was not found
+       :rtype: bool
+    """
+
+    settings_paths = _find_settings(uuid, "connection", "uuid")
+    if not settings_paths:
+        return False
+    proxy = _get_proxy(object_path=settings_paths[0], interface_name="org.freedesktop.NetworkManager.Settings.Connection")
+    proxy.Delete()
+
 def nm_update_settings_of_device(name, new_values):
     """Update setting of device.
 
@@ -830,9 +907,13 @@ def _update_settings(settings_path, new_values):
                                DEFAULT_DBUS_TIMEOUT,
                                None)
     for key1, key2, value, default_type_str in new_values:
-        new_settings = _gvariant_settings(settings, key1, key2, value, default_type_str)
+        settings = _gvariant_settings(settings, key1, key2, value, default_type_str)
 
-    proxy.Update(settings.get_type_string(), new_settings)
+    proxy.call_sync("Update",
+                    settings,
+                    Gio.DBusCallFlags.NONE,
+                    DEFAULT_DBUS_TIMEOUT,
+                    None)
 
 def _gvariant_settings(settings, updated_key1, updated_key2, value, default_type_str=None):
     """Update setting of updated_key1, updated_key2 of settings object with value.
@@ -882,7 +963,7 @@ def _gvariant_settings(settings, updated_key1, updated_key2, value, default_type
             new_settings[updated_key1] = {}
         new_settings[updated_key1][updated_key2] = GLib.Variant(type_str, value)
 
-    return new_settings
+    return GLib.Variant(settings.get_type_string(), (new_settings,))
 
 def nm_ipv6_to_dbus_ay(address):
     """Convert ipv6 address from string to list of bytes 'ay' for dbus
@@ -925,11 +1006,11 @@ def nm_dbus_int_to_ipv4(address):
     return socket.inet_ntop(socket.AF_INET, struct.pack('=L', address))
 
 def test():
-    print "NM state: %s:" % nm_state()
-    print "NM is connected: %s" % nm_is_connected()
+    print("NM state: %s:" % nm_state())
+    print("NM is connected: %s" % nm_is_connected())
 
-    print "Devices: %s" % nm_devices()
-    print "Activated devices: %s" % nm_activated_devices()
+    print("Devices: %s" % nm_devices())
+    print("Activated devices: %s" % nm_activated_devices())
 
     wireless_device = ""
 
@@ -937,108 +1018,108 @@ def test():
     devs.append("nonexisting")
     for devname in devs:
 
-        print devname
+        print(devname)
 
         try:
             devtype = nm_device_type(devname)
         except UnknownDeviceError as e:
-            print "     %s" % e
+            print("     %s" % e)
             devtype = None
         if devtype == NetworkManager.DeviceType.ETHERNET:
-            print "     type %s" % "ETHERNET"
+            print("     type %s" % "ETHERNET")
         elif devtype == NetworkManager.DeviceType.WIFI:
-            print "     type %s" % "WIFI"
+            print("     type %s" % "WIFI")
             wireless_device = devname
 
         try:
-            print "     Wifi device: %s" % nm_device_type_is_wifi(devname)
+            print("     Wifi device: %s" % nm_device_type_is_wifi(devname))
         except UnknownDeviceError as e:
-            print "     %s" % e
+            print("     %s" % e)
 
         try:
             hwaddr = nm_device_hwaddress(devname)
-            print "     HwAaddress: %s" % hwaddr
+            print("     HwAaddress: %s" % hwaddr)
         except ValueError as e:
-            print "     %s" % e
+            print("     %s" % e)
             hwaddr = ""
 
         try:
-            print "     Carrier: %s" % nm_device_carrier(devname)
+            print("     Carrier: %s" % nm_device_carrier(devname))
         except ValueError as e:
-            print "     %s" % e
+            print("     %s" % e)
 
         try:
-            print "     IP4 config: %s" % nm_device_ip_config(devname)
-            print "     IP6 config: %s" % nm_device_ip_config(devname, version=6)
-            print "     IP4 addrs: %s" % nm_device_ip_addresses(devname)
-            print "     IP6 addrs: %s" % nm_device_ip_addresses(devname, version=6)
-            print "     Udi: %s" % nm_device_property(devname, "Udi")
+            print("     IP4 config: %s" % nm_device_ip_config(devname))
+            print("     IP6 config: %s" % nm_device_ip_config(devname, version=6))
+            print("     IP4 addrs: %s" % nm_device_ip_addresses(devname))
+            print("     IP6 addrs: %s" % nm_device_ip_addresses(devname, version=6))
+            print("     Udi: %s" % nm_device_property(devname, "Udi"))
         except UnknownDeviceError as e:
-            print "     %s" % e
+            print("     %s" % e)
 
         if devname in nm_devices():
             try:
-                print "     Nonexisting: %s" % nm_device_property(devname, "Nonexisting")
+                print("     Nonexisting: %s" % nm_device_property(devname, "Nonexisting"))
             except PropertyNotFoundError as e:
-                print "     %s" % e
+                print("     %s" % e)
         try:
-            print "     Nonexisting: %s" % nm_device_property(devname, "Nonexisting")
+            print("     Nonexisting: %s" % nm_device_property(devname, "Nonexisting"))
         except ValueError as e:
-            print "     %s" % e
+            print("     %s" % e)
 
         try:
-            print "     Settings: %s" % _device_settings(devname)
+            print("     Settings: %s" % _device_settings(devname))
         except UnknownDeviceError as e:
-            print "     %s" % e
+            print("     %s" % e)
         try:
-            print "     Settings for hwaddr %s: %s" % (hwaddr, _settings_for_hwaddr(hwaddr))
+            print("     Settings for hwaddr %s: %s" % (hwaddr, _settings_for_hwaddr(hwaddr)))
         except UnknownDeviceError as e:
-            print "     %s" % e
+            print("     %s" % e)
         try:
-            print "     Setting value %s %s: %s" % ("ipv6", "method", nm_device_setting_value(devname, "ipv6", "method"))
+            print("     Setting value %s %s: %s" % ("ipv6", "method", nm_device_setting_value(devname, "ipv6", "method")))
         except ValueError as e:
-            print "     %s" % e
+            print("     %s" % e)
         try:
-            print "     Setting value %s %s: %s" % ("ipv7", "method", nm_device_setting_value(devname, "ipv7", "method"))
+            print("     Setting value %s %s: %s" % ("ipv7", "method", nm_device_setting_value(devname, "ipv7", "method")))
         except ValueError as e:
-            print "     %s" % e
+            print("     %s" % e)
 
     ssid = "Red Hat Guest"
-    print "Settings for AP %s: %s" % (ssid, _settings_for_ap(ssid))
+    print("Settings for AP %s: %s" % (ssid, _settings_for_ap(ssid)))
     ssid = "nonexisting"
-    print "Settings for AP %s: %s" % (ssid, _settings_for_ap(ssid))
+    print("Settings for AP %s: %s" % (ssid, _settings_for_ap(ssid)))
 
     devname = devs[0]
     key1 = "connection"
     key2 = "autoconnect"
     original_value = nm_device_setting_value(devname, key1, key2)
-    print "Value of setting %s %s: %s" % (key1, key2, original_value)
+    print("Value of setting %s %s: %s" % (key1, key2, original_value))
     # None means default in this case, which is true
     if original_value in (None, True):
         new_value = False
     else:
         new_value = True
 
-    print "Updating to %s" % new_value
+    print("Updating to %s" % new_value)
     nm_update_settings_of_device(devname, [[key1, key2, new_value, None]])
-    print "Value of setting %s %s: %s" % (key1, key2, nm_device_setting_value(devname, key1, key2))
+    print("Value of setting %s %s: %s" % (key1, key2, nm_device_setting_value(devname, key1, key2)))
     nm_update_settings_of_device(devname, [[key1, key2, original_value, None]])
-    print "Value of setting %s %s: %s" % (key1, key2, nm_device_setting_value(devname, key1, key2))
+    print("Value of setting %s %s: %s" % (key1, key2, nm_device_setting_value(devname, key1, key2)))
     nm_update_settings_of_device(devname, [[key1, key2, original_value, "b"]])
-    print "Value of setting %s %s: %s" % (key1, key2, nm_device_setting_value(devname, key1, key2))
+    print("Value of setting %s %s: %s" % (key1, key2, nm_device_setting_value(devname, key1, key2)))
 
     nm_update_settings_of_device(devname, [[key1, "nonexisting", new_value, None]])
     nm_update_settings_of_device(devname, [["nonexisting", "nonexisting", new_value, None]])
     try:
         nm_update_settings_of_device("nonexixting", [[key1, key2, new_value, None]])
     except UnknownDeviceError as e:
-        print "%s" % e
+        print("%s" % e)
 
     if wireless_device:
         try:
             nm_update_settings_of_device(wireless_device, [[key1, key2, new_value, None]])
         except SettingsNotFoundError as e:
-            print "%s" % e
+            print("%s" % e)
 
     #nm_update_settings_of_device(devname, [["connection", "id", "test", None]])
     #nm_update_settings_of_device(devname, [["connection", "timestamp", 11111111, None]])
diff --git a/anaconda/pyanaconda/ntp.py b/anaconda/pyanaconda/ntp.py
index f0c051b..40263ae 100644
--- a/anaconda/pyanaconda/ntp.py
+++ b/anaconda/pyanaconda/ntp.py
@@ -31,6 +31,7 @@ import ntplib
 import socket
 
 from pyanaconda import isys
+from pyanaconda import iutil
 from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda.constants import THREAD_SYNC_TIME_BASENAME
 
@@ -157,7 +158,7 @@ def save_servers_to_config(servers, conf_file_path=NTP_CONFIG_FILE,
             stat = os.stat(conf_file_path)
             # Use copy rather then move to get the correct selinux context
             shutil.copy(temp_path, conf_file_path)
-            os.chmod(conf_file_path, stat.st_mode)
+            iutil.eintr_retry_call(os.chmod, conf_file_path, stat.st_mode)
             os.unlink(temp_path)
 
         except OSError as oserr:
diff --git a/anaconda/pyanaconda/packaging/__init__.py b/anaconda/pyanaconda/packaging/__init__.py
index 2aeb513..cb78cf1 100644
--- a/anaconda/pyanaconda/packaging/__init__.py
+++ b/anaconda/pyanaconda/packaging/__init__.py
@@ -27,20 +27,27 @@
         - document all methods
 
 """
-
+from __future__ import print_function
 import os, sys
 from urlgrabber.grabber import URLGrabber
 from urlgrabber.grabber import URLGrabError
 import ConfigParser
 import shutil
 import time
+from glob import glob
+import re
+import threading
 
 if __name__ == "__main__":
     from pyanaconda import anaconda_log
     anaconda_log.init()
 
-from pyanaconda.constants import ROOT_PATH, DRACUT_ISODIR, DRACUT_REPODIR, GROUP_ALL, GROUP_DEFAULT, GROUP_REQUIRED, DD_ALL, DD_FIRMWARE, DD_RPMS, INSTALL_TREE, ISO_DIR, THREAD_STORAGE, THREAD_WAIT_FOR_CONNECTING_NM
+from pyanaconda.constants import DRACUT_ISODIR, DRACUT_REPODIR, DD_ALL, DD_FIRMWARE, DD_RPMS, INSTALL_TREE, ISO_DIR
+from pyanaconda.constants import THREAD_STORAGE, THREAD_WAIT_FOR_CONNECTING_NM, THREAD_PAYLOAD
+from pyanaconda.constants import THREAD_PAYLOAD_RESTART
+from pykickstart.constants import GROUP_ALL, GROUP_DEFAULT, GROUP_REQUIRED
 from pyanaconda.flags import flags
+from pyanaconda.i18n import _, N_
 
 from pyanaconda import iutil
 from pyanaconda import isys
@@ -48,6 +55,8 @@ from pyanaconda.image import findFirstIsoImage
 from pyanaconda.image import mountImage
 from pyanaconda.image import opticalInstallMedia
 from pyanaconda.iutil import ProxyString, ProxyStringError
+from pyanaconda.regexes import VERSION_DIGITS
+from pyanaconda.threads import threadMgr, AnacondaThread
 
 from pykickstart.parser import Group
 
@@ -58,7 +67,6 @@ from blivet.errors import StorageError
 import blivet.util
 import blivet.arch
 from blivet.platform import platform
-#from pyanaconda.progress import progress
 
 from pyanaconda.product import productName, productVersion
 import urlgrabber
@@ -90,10 +98,17 @@ class ImageDirectoryMountError(PayloadSetupError):
 
 # software selection
 class NoSuchGroup(PayloadError):
-    pass
+    def __init__(self, group, adding=True, required=False):
+        PayloadError.__init__(self, group)
+        self.group = group
+        self.adding = adding
+        self.required = required
 
 class NoSuchPackage(PayloadError):
-    pass
+    def __init__(self, package, required=False):
+        PayloadError.__init__(self, package)
+        self.package = package
+        self.required = required
 
 class DependencyError(PayloadError):
     pass
@@ -107,15 +122,26 @@ class Payload(object):
     def __init__(self, data):
         """ data is a kickstart.AnacondaKSHandler class
         """
+        if self.__class__ is Payload:
+            raise TypeError("Payload is an abstract class")
+
         self.data = data
         self.storage = None
+        self.instclass = None
         self._kernelVersionList = []
+        self._rescueVersionList = []
         self._createdInitrds = False
         self.txID = None
 
-    def setup(self, storage):
+    def setup(self, storage, instClass):
         """ Do any payload-specific setup. """
         self.storage = storage
+        self.instclass = instClass
+
+    def unsetup(self):
+        """ Invalidate a previously setup paylaod. """
+        self.storage = None
+        self.instclass = None
 
     def preStorage(self):
         """ Do any payload-specific work necessary before writing the storage
@@ -134,14 +160,15 @@ class Payload(object):
         """ Reset the instance, not including ksdata. """
         pass
 
+    def prepareMountTargets(self, storage):
+        """Run when physical storage is mounted, but other mount points may
+        not exist.  Used by the RPMOSTreePayload subclass. 
+        """
+        pass
+
     ###
     ### METHODS FOR WORKING WITH REPOSITORIES
     ###
-    @property
-    def repos(self):
-        """A list of repo identifiers, not objects themselves."""
-        raise NotImplementedError()
-
     @property
     def addOns(self):
         """ A list of addon repo identifiers. """
@@ -161,10 +188,6 @@ class Payload(object):
         """
         return True
 
-    def getRepo(self, repo_id):
-        """ Return the package repo object. """
-        raise NotImplementedError()
-
     def isRepoEnabled(self, repo_id):
         """ Return True if repo is enabled. """
         repo = self.getAddOnRepo(repo_id)
@@ -247,47 +270,12 @@ class Payload(object):
         if repo:
             repo.enabled = False
 
-    ###
-    ### METHODS FOR WORKING WITH ENVIRONMENTS
-    ###
-    @property
-    def environments(self):
-        raise NotImplementedError()
-
-    def environmentSelected(self, environmentid):
-        raise NotImplementedError()
-
-    def environmentHasOption(self, environmentid, grpid):
-        raise NotImplementedError()
-
-    def environmentOptionIsDefault(self, environmentid, grpid):
-        raise NotImplementedError()
-
-    def environmentDescription(self, environmentid):
-        raise NotImplementedError()
-
-    def selectEnvironment(self, environmentid):
-        raise NotImplementedError()
-
-    def deselectEnvironment(self, environmentid):
-        raise NotImplementedError()
-
-    def environmentGroups(self, environmentid):
-        raise NotImplementedError()
-
     ###
     ### METHODS FOR WORKING WITH GROUPS
     ###
-    @property
-    def groups(self):
-        raise NotImplementedError()
-
     def languageGroups(self):
         return []
 
-    def groupDescription(self, groupid):
-        raise NotImplementedError()
-
     def groupSelected(self, groupid):
         return Group(groupid) in self.data.packages.groupList
 
@@ -328,10 +316,6 @@ class Payload(object):
     ###
     ### METHODS FOR WORKING WITH PACKAGES
     ###
-    @property
-    def packages(self):
-        raise NotImplementedError()
-
     def packageSelected(self, pkgid):
         return pkgid in self.data.packages.packageList
 
@@ -363,6 +347,26 @@ class Payload(object):
 
         self.data.packages.excludedList.append(pkgid)
 
+    def _updateKernelVersionList(self):
+        try:
+            import yum
+        except ImportError:
+            cmpfunc = cmp
+        else:
+            cmpfunc = yum.rpmUtils.miscutils.compareVerOnly
+
+        files = glob(iutil.getSysroot() + "/boot/vmlinuz-*")
+        files.extend(glob(iutil.getSysroot() + "/boot/efi/EFI/%s/vmlinuz-*" % self.instclass.efi_dir))
+
+        versions = sorted((f.split("/")[-1][8:] for f in files if os.path.isfile(f)), cmp=cmpfunc)
+        log.debug("kernel versions: %s", versions)
+
+        # Store regular and rescue kernels separately
+        self._kernelVersionList = (
+                [v for v in versions if "-rescue-" not in v],
+                [v for v in versions if "-rescue-" in v]
+                )
+
     ###
     ### METHODS FOR QUERYING STATE
     ###
@@ -374,25 +378,15 @@ class Payload(object):
     @property
     def kernelVersionList(self):
         if not self._kernelVersionList:
-            import glob
-            try:
-                import yum
-            except ImportError:
-                cmpfunc = cmp
-            else:
-                cmpfunc = yum.rpmUtils.miscutils.compareVerOnly
+            self._updateKernelVersionList()
 
-            files = glob.glob(ROOT_PATH + "/boot/vmlinuz-*")
-            files.extend(glob.glob(ROOT_PATH + "/boot/efi/EFI/redhat/vmlinuz-*"))
-            # strip off everything up to and including vmlinuz- to get versions
-            # Ignore rescue kernels
-            versions = [f.split("/")[-1][8:] for f in files if os.path.isfile(f) \
-                        and "-rescue-" not in f]
-            versions.sort(cmp=cmpfunc)
-            log.debug("kernel versions: %s", versions)
-            self._kernelVersionList = versions
+        return self._kernelVersionList[0]
 
-        return self._kernelVersionList
+    @property
+    def rescueKernelList(self):
+        # do re-scan if looking for rescue kernel
+        self._updateKernelVersionList()
+        return self._kernelVersionList[1]
 
     ##
     ## METHODS FOR TREE VERIFICATION
@@ -446,7 +440,10 @@ class Payload(object):
 
     def _getReleaseVersion(self, url):
         """ Return the release version of the tree at the specified URL. """
-        version = productVersion.split("-")[0]
+        try:
+            version = re.match(VERSION_DIGITS, productVersion).group(1)
+        except AttributeError:
+            version = "rawhide"
 
         log.debug("getting release version from tree at %s (%s)", url, version)
 
@@ -460,7 +457,9 @@ class Payload(object):
             c.read(treeinfo)
             try:
                 # Trim off any -Alpha or -Beta
-                version = c.get("general", "version").split("-")[0]
+                version = re.match(VERSION_DIGITS, c.get("general", "version")).group(1)
+            except AttributeError:
+                version = "rawhide"
             except ConfigParser.Error:
                 pass
 
@@ -540,31 +539,45 @@ class Payload(object):
     ###
     def preInstall(self, packages=None, groups=None):
         """ Perform pre-installation tasks. """
-        iutil.mkdirChain(ROOT_PATH + "/root")
+        iutil.mkdirChain(iutil.getSysroot() + "/root")
+
+        self._writeModuleBlacklist()
 
     def install(self):
         """ Install the payload. """
         raise NotImplementedError()
 
-    def _copyDriverDiskFiles(self):
-        import glob
+    def _writeModuleBlacklist(self):
+        """ Copy modules from modprobe.blacklist=<module> on cmdline to
+            /etc/modprobe.d/anaconda-blacklist.conf so that modules will
+            continue to be blacklisted when the system boots.
+        """
+        if "modprobe.blacklist" not in flags.cmdline:
+            return
 
+        iutil.mkdirChain(iutil.getSysroot() + "/etc/modprobe.d")
+        with open(iutil.getSysroot() + "/etc/modprobe.d/anaconda-blacklist.conf", "w") as f:
+            f.write("# Module blacklists written by anaconda\n")
+            for module in flags.cmdline["modprobe.blacklist"].split():
+                f.write("blacklist %s\n" % module)
+
+    def _copyDriverDiskFiles(self):
         # Multiple driver disks may be loaded, so we need to glob for all
         # the firmware files in the common DD firmware directory
-        for f in glob.glob(DD_FIRMWARE+"/*"):
+        for f in glob(DD_FIRMWARE+"/*"):
             try:
-                shutil.copyfile(f, "%s/lib/firmware/" % ROOT_PATH)
+                shutil.copyfile(f, "%s/lib/firmware/" % iutil.getSysroot())
             except IOError as e:
                 log.error("Could not copy firmware file %s: %s", f, e.strerror)
 
         #copy RPMS
-        for d in glob.glob(DD_RPMS):
-            shutil.copytree(d, ROOT_PATH + "/root/" + os.path.basename(d))
+        for d in glob(DD_RPMS):
+            shutil.copytree(d, iutil.getSysroot() + "/root/" + os.path.basename(d))
 
         #copy modules and firmware into root's home directory
         if os.path.exists(DD_ALL):
             try:
-                shutil.copytree(DD_ALL, ROOT_PATH + "/root/DD")
+                shutil.copytree(DD_ALL, iutil.getSysroot() + "/root/DD")
             except IOError as e:
                 log.error("failed to copy driver disk files: %s", e.strerror)
                 # XXX TODO: real error handling, as this is probably going to
@@ -585,15 +598,25 @@ class Payload(object):
 
         for kernel in self.kernelVersionList:
             log.info("recreating initrd for %s", kernel)
-            iutil.execWithRedirect("kernel-install",
-                                   ["add", kernel, "/boot/vmlinuz-%s" % kernel],
-                                   root=ROOT_PATH)
+            if not flags.imageInstall:
+                iutil.execInSysroot("new-kernel-pkg",
+                                    ["--mkinitrd", "--dracut",
+                                    "--depmod", "--update", kernel])
+            else:
+                # hostonly is not sensible for disk image installations
+                # using /dev/disk/by-uuid/ is necessary due to disk image naming
+                iutil.execInSysroot("dracut",
+                                    ["-N",
+                                     "--persistent-policy", "by-uuid",
+                                     "-f", "/boot/initramfs-%s.img" % kernel,
+                                    kernel])
+
         self._createdInitrds = True
 
 
     def _setDefaultBootTarget(self):
         """ Set the default systemd target for the system. """
-        if not os.path.exists(ROOT_PATH + "/etc/systemd/system"):
+        if not os.path.exists(iutil.getSysroot() + "/etc/systemd/system"):
             log.error("systemd is not installed -- can't set default target")
             return
 
@@ -606,7 +629,7 @@ class Payload(object):
         except ImportError:
             log.info("failed to import rpm -- not adjusting default runlevel")
         else:
-            ts = rpm.TransactionSet(ROOT_PATH)
+            ts = rpm.TransactionSet(iutil.getSysroot())
 
             # XXX one day this might need to account for anaconda's display mode
             if ts.dbMatch("provides", 'service(graphical-login)').count() and \
@@ -624,7 +647,7 @@ class Payload(object):
             pass
         else:
             iutil.resetRpmDb()
-            ts = rpm.TransactionSet(ROOT_PATH)
+            ts = rpm.TransactionSet(iutil.getSysroot())
 
             # Only add "rhgb quiet" on non-s390, non-serial installs
             if iutil.isConsoleOnVirtualTerminal() and \
@@ -645,23 +668,84 @@ class Payload(object):
 
         self._copyDriverDiskFiles()
 
+# Inherit abstract methods from Payload
+# pylint: disable=abstract-method
 class ImagePayload(Payload):
     """ An ImagePayload installs an OS image to the target system. """
-    pass
 
+    def __init__(self, data):
+        if self.__class__ is ImagePayload:
+            raise TypeError("ImagePayload is an abstract class")
+
+        Payload.__init__(self, data)
+
+# Inherit abstract methods from ImagePayload
+# pylint: disable=abstract-method
 class ArchivePayload(ImagePayload):
     """ An ArchivePayload unpacks source archives onto the target system. """
-    pass
+
+    def __init__(self, data):
+        if self.__class__ is ArchivePayload:
+            raise TypeError("ArchivePayload is an abstract class")
+
+        ImagePayload.__init__(self, data)
 
 class PackagePayload(Payload):
     """ A PackagePayload installs a set of packages onto the target system. """
 
+    DEFAULT_REPOS = [productName.split('-')[0].lower(), "rawhide"]
+
     def __init__(self, data):
+        if self.__class__ is PackagePayload:
+            raise TypeError("PackagePayload is an abstract class")
+
         super(PackagePayload, self).__init__(data)
         self.install_device = None
+        self._rpm_macros = []
+
+        self.requiredPackages = []
+        self.requiredGroups = []
+
+        # Used to determine which add-ons to display for each environment.
+        # The dictionary keys are environment IDs. The dictionary values are two-tuples
+        # consisting of lists of add-on group IDs. The first list is the add-ons specific
+        # to the environment, and the second list is the other add-ons possible for the
+        # environment.
+        self._environmentAddons = {}
+
+    def preInstall(self, packages=None, groups=None):
+        super(PackagePayload, self).preInstall()
+
+        # Set rpm-specific options
+
+        # nofsync speeds things up at the risk of rpmdb data loss in a crash.
+        # But if we crash mid-install you're boned anyway, so who cares?
+        self.rpmMacros.append(('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}'))
+
+        if self.data.packages.excludeDocs:
+            self.rpmMacros.append(('_excludedocs', '1'))
+
+        if self.data.packages.instLangs is not None:
+            # Use nil if instLangs is empty
+            self.rpmMacros.append(('_install_langs', self.data.packages.instLangs or '%{nil}'))
+
+        if flags.selinux:
+            for d in ["/tmp/updates",
+                      "/etc/selinux/targeted/contexts/files",
+                      "/etc/security/selinux/src/policy",
+                      "/etc/security/selinux"]:
+                f = d + "/file_contexts"
+                if os.access(f, os.R_OK):
+                    self.rpmMacros.append(('__file_context_path', f))
+                    break
+        else:
+            self.rpmMacros.append(('__file_context_path', '%{nil}'))
 
     @property
     def kernelPackages(self):
+        if "kernel" in self.data.packages.excludedList:
+            return []
+
         kernels = ["kernel"]
 
         if isys.isPaeAvailable():
@@ -677,6 +761,15 @@ class PackagePayload(Payload):
 
         return kernels
 
+    @property
+    def rpmMacros(self):
+        """A list of (name, value) pairs to define as macros in the rpm transaction."""
+        return self._rpm_macros
+
+    @rpmMacros.setter
+    def rpmMacros(self, value):
+        self._rpm_macros = value
+
     def reset(self, root=None, releasever=None):
         # cdrom: install_device.teardown (INSTALL_TREE)
         # hd: umount INSTALL_TREE, install_device.teardown (ISO_DIR)
@@ -882,16 +975,316 @@ class PackagePayload(Payload):
 
         return url, mirrorlist, sslverify
 
-def payloadInitialize(storage, ksdata, payload):
-    from pyanaconda.threads import threadMgr
+    ###
+    ### METHODS FOR WORKING WITH REPOSITORIES
+    ###
+    @property
+    def repos(self):
+        """A list of repo identifiers, not objects themselves."""
+        raise NotImplementedError()
 
-    threadMgr.wait(THREAD_STORAGE)
+    def addDriverRepos(self):
+        """ Add driver repositories and packages
+        """
+        # Drivers are loaded by anaconda-dracut, their repos are copied
+        # into /run/install/DD-X where X is a number starting at 1. The list of
+        # packages that were selected is in /run/install/dd_packages
 
-    # FIXME: condition for cases where we don't want network
-    # (set and use payload.needsNetwork ?)
-    threadMgr.wait(THREAD_WAIT_FOR_CONNECTING_NM)
+        # Add repositories
+        dir_num = 0
+        while True:
+            dir_num += 1
+            repo = "/run/install/DD-%d/" % dir_num
+            if not os.path.isdir(repo):
+                break
 
-    payload.setup(storage)
+            # Drivers are under /<arch>/ or /DD-net/
+            if os.path.isdir(repo+"DD-net"):
+                repo += "DD-net"
+            elif os.path.isdir(repo+blivet.arch.getArch()):
+                repo += blivet.arch.getArch()
+            else:
+                log.debug("No driver repo in %s", repo)
+                continue
+
+            # Run createrepo if there are rpms and no repodata
+            if not os.path.isdir(repo+"/repodata"):
+                rpms = glob(repo+"/*rpm")
+                if not rpms:
+                    continue
+                log.info("Running createrepo on %s", repo)
+                iutil.execWithRedirect("createrepo_c", [repo])
+
+            ks_repo = self.data.RepoData(name="DD-%d" % dir_num,
+                                         baseurl="file://"+repo,
+                                         enabled=True)
+            self.addRepo(ks_repo)
+
+        # Add packages
+        if not os.path.exists("/run/install/dd_packages"):
+            return
+        with open("/run/install/dd_packages", "r") as f:
+            for line in f:
+                package = line.strip()
+                if package not in self.requiredPackages:
+                    self.requiredPackages.append(package)
+        log.debug("required packages = %s", self.requiredPackages)
+
+    ###
+    ### METHODS FOR WORKING WITH ENVIRONMENTS
+    ###
+    @property
+    def environments(self):
+        raise NotImplementedError()
+
+    def environmentHasOption(self, environmentid, grpid):
+        raise NotImplementedError()
+
+    def environmentOptionIsDefault(self, environmentid, grpid):
+        raise NotImplementedError()
+
+    def environmentDescription(self, environmentid):
+        raise NotImplementedError()
+
+    def selectEnvironment(self, environmentid):
+        raise NotImplementedError()
+
+    def environmentGroups(self, environmentid):
+        raise NotImplementedError()
+
+    @property
+    def environmentAddons(self):
+        return self._environmentAddons
+
+    def _isGroupVisible(self, grp):
+        raise NotImplementedError()
+
+    def _groupHasInstallableMembers(self, grp):
+        raise NotImplementedError()
+
+    def _refreshEnvironmentAddons(self):
+        log.info("Refreshing environmentAddons")
+        self._environmentAddons = {}
+
+        for environment in self.environments:
+            self._environmentAddons[environment] = ([], [])
+
+            # Determine which groups are specific to this environment and which other groups
+            # are available in this environment.
+            for grp in self.groups:
+                if not self._groupHasInstallableMembers(grp):
+                    continue
+                elif self.environmentHasOption(environment, grp):
+                    self._environmentAddons[environment][0].append(grp)
+                elif self._isGroupVisible(grp):
+                    self._environmentAddons[environment][1].append(grp)
+
+    ###
+    ### METHODS FOR WORKING WITH GROUPS
+    ###
+    @property
+    def groups(self):
+        raise NotImplementedError()
+
+    def groupDescription(self, groupid):
+        raise NotImplementedError()
+
+class PayloadManager(object):
+    """Framework for starting and watching the payload thread.
+
+       This class defines several states, and events can be triggered upon
+       reaching a state. Depending on whether a state has already been reached
+       when a listener is added, the event code may be run in either the
+       calling thread or the payload thread. The event code will block the
+       payload thread regardless, so try not to run anything that takes a long
+       time.
+
+       All states except STATE_ERROR are expected to happen linearly, and adding
+       a listener for a state that has already been reached or passed will
+       immediately trigger that listener. For example, if the payload thread is
+       currently in STATE_GROUP_MD, adding a listener for STATE_NETWORK will
+       immediately run the code being added for STATE_NETWORK.
+
+       The payload thread data should be accessed using the payloadMgr object,
+       and the running thread can be accessed using threadMgr with the
+       THREAD_PAYLOAD constant, if you need to wait for it or something. The
+       thread should be started using payloadMgr.restartThread.
+    """
+
+    STATE_START = 0
+    # Waiting on storage
+    STATE_STORAGE = 1
+    # Waiting on network
+    STATE_NETWORK = 2
+    # Downloading package metadata
+    STATE_PACKAGE_MD = 3
+    # Downloading group metadata
+    STATE_GROUP_MD = 4
+    # All done
+    STATE_FINISHED = 5
+
+    # Error
+    STATE_ERROR = -1
+
+    # Error strings
+    ERROR_SETUP = N_("Failed to set up installation source")
+    ERROR_MD = N_("Error downloading package metadata")
+    ERROR_SOURCE = N_("No installation source available")
+
+    def __init__(self):
+        self._event_lock = threading.Lock()
+        self._event_listeners = {}
+        self._thread_state = self.STATE_START
+        self._error = None
+
+        # Initialize a list for each event state
+        for event_id in range(self.STATE_ERROR, self.STATE_FINISHED + 1):
+            self._event_listeners[event_id] = []
+
+    @property
+    def error(self):
+        return _(self._error)
+
+    def addListener(self, event_id, func):
+        """Add a listener for an event.
+
+           :param int event_id: The event to listen for, one of the EVENT_* constants
+           :param function func: An object to call when the event is reached
+        """
+
+        # Check that the event_id is valid
+        assert isinstance(event_id, int)
+        assert event_id <= self.STATE_FINISHED
+        assert event_id >= self.STATE_ERROR
+
+        # Add the listener inside the lock in case we need to run immediately,
+        # to make sure the listener isn't triggered twice
+        with self._event_lock:
+            self._event_listeners[event_id].append(func)
+
+            # If an error event was requested, run it if currently in an error state
+            if event_id == self.STATE_ERROR:
+                if event_id == self._thread_state:
+                    func()
+            # Otherwise, run if the requested event has already occurred
+            elif event_id <= self._thread_state:
+                func()
+
+    def restartThread(self, storage, ksdata, payload, instClass, fallback=False, checkmount=True):
+        """Start or restart the payload thread.
+
+           This method starts a new thread to restart the payload thread, so
+           this method's return is not blocked by waiting on the previous payload
+           thread. If there is already a payload thread restart pending, this method
+           has no effect.
+
+           :param blivet.Blivet storage: The blivet storage instance
+           :param kickstart.AnacondaKSHandler ksdata: The kickstart data instance
+           :param packaging.Payload payload: The payload instance
+           :param installclass.BaseInstallClass instClass: The install class instance
+           :param bool fallback: Whether to fall back to the default repo in case of error
+           :param bool checkmount: Whether to check for valid mounted media
+        """
+
+        log.debug("Restarting payload thread")
+
+        # If a restart thread is already running, don't start a new one
+        if threadMgr.get(THREAD_PAYLOAD_RESTART):
+            return
+
+        # Launch a new thread so that this method can return immediately
+        threadMgr.add(AnacondaThread(name=THREAD_PAYLOAD_RESTART, target=self._restartThread,
+            args=(storage, ksdata, payload, instClass, fallback, checkmount)))
+
+    def _restartThread(self, storage, ksdata, payload, instClass, fallback, checkmount):
+        # Wait for the old thread to finish
+        threadMgr.wait(THREAD_PAYLOAD)
+
+        # Start a new payload thread
+        threadMgr.add(AnacondaThread(name=THREAD_PAYLOAD, target=self._runThread,
+            args=(storage, ksdata, payload, instClass, fallback, checkmount)))
+
+    def _setState(self, event_id):
+        # Update the current state
+        log.debug("Updating payload thread state: %d", event_id)
+        with self._event_lock:
+            # Update the state within the lock to avoid a race with listeners
+            # currently being added
+            self._thread_state = event_id
+
+            # Run any listeners for the new state
+            for func in self._event_listeners[event_id]:
+                func()
+
+    def _runThread(self, storage, ksdata, payload, instClass, fallback, checkmount):
+        # This is the thread entry
+        # Set the initial state
+        self._error = None
+        self._setState(self.STATE_START)
+
+        # Wait for storage
+        self._setState(self.STATE_STORAGE)
+        threadMgr.wait(THREAD_STORAGE)
+
+        # Wait for network
+        self._setState(self.STATE_NETWORK)
+        # FIXME: condition for cases where we don't want network
+        # (set and use payload.needsNetwork ?)
+        threadMgr.wait(THREAD_WAIT_FOR_CONNECTING_NM)
+
+        self._setState(self.STATE_PACKAGE_MD)
+        payload.setup(storage, instClass)
+
+        # If this is a non-package Payload, we're done
+        if not isinstance(payload, PackagePayload):
+            self._setState(self.STATE_FINISHED)
+            return
+
+        # Keep setting up package-based repositories
+        # Download package metadata
+        try:
+            payload.updateBaseRepo(fallback=fallback, checkmount=checkmount)
+        except (OSError, PayloadError) as e:
+            log.error("PayloadError: %s", e)
+            self._error = self.ERROR_SETUP
+            self._setState(self.STATE_ERROR)
+            payload.unsetup()
+            return
+
+        # Gather the group data
+        self._setState(self.STATE_GROUP_MD)
+        payload.gatherRepoMetadata()
+        payload.release()
+
+        # Check if that failed
+        if not payload.baseRepo:
+            log.error("No base repo configured")
+            self._error = self.ERROR_MD
+            self._setState(self.STATE_ERROR)
+            payload.unsetup()
+            return
+
+        try:
+            # Grabbing the list of groups could potentially take a long time the
+            # first time (yum does a lot of magic property stuff, some of which
+            # involves side effects like network access) so go ahead and grab
+            # them now. These are properties with side-effects, just accessing
+            # them will trigger yum.
+            # pylint: disable=pointless-statement
+            payload.environments
+            # pylint: disable=pointless-statement
+            payload.groups
+        except MetadataError as e:
+            log.error("MetadataError: %s", e)
+            self._error = self.ERROR_SOURCE
+            self._setState(self.STATE_ERROR)
+            payload.unsetup()
+            return
+
+        self._setState(self.STATE_FINISHED)
+
+# Initialize the PayloadManager instance
+payloadMgr = PayloadManager()
 
 def show_groups(payload):
     #repo = ksdata.RepoData(name="anaconda", baseurl="http://cannonball/install/rawhide/os/")
@@ -908,21 +1301,21 @@ def show_groups(payload):
 
     import pprint
 
-    print "==== DESKTOPS ===="
+    print("==== DESKTOPS ====")
     pprint.pprint(desktops)
-    print "==== ADDONS ===="
+    print("==== ADDONS ====")
     pprint.pprint(addons)
 
-    print payload.groups
+    print(payload.groups)
 
 def print_txmbrs(payload, f=None):
     if f is None:
         f = sys.stdout
 
-    print >> f, "###########"
+    print("###########", file=f)
     for txmbr in payload._yum.tsInfo.getMembers():
-        print >> f, txmbr
-    print >> f, "###########"
+        print(txmbr, file=f)
+    print("###########", file=f)
 
 def write_txmbrs(payload, filename):
     if os.path.exists(filename):
diff --git a/anaconda/pyanaconda/packaging/dnfpayload.py b/anaconda/pyanaconda/packaging/dnfpayload.py
index d634a8e..64affc9 100644
--- a/anaconda/pyanaconda/packaging/dnfpayload.py
+++ b/anaconda/pyanaconda/packaging/dnfpayload.py
@@ -25,11 +25,17 @@ from pyanaconda.flags import flags
 from pyanaconda.i18n import _
 from pyanaconda.progress import progressQ
 
+import ConfigParser
+import collections
 import itertools
 import logging
 import multiprocessing
+import operator
 import pyanaconda.constants as constants
+from pykickstart.constants import GROUP_ALL, GROUP_DEFAULT, KS_MISSING_IGNORE
 import pyanaconda.errors as errors
+import pyanaconda.iutil
+import pyanaconda.localization
 import pyanaconda.packaging as packaging
 import sys
 import time
@@ -40,15 +46,22 @@ try:
     import dnf
     import dnf.exceptions
     import dnf.repo
-    import dnf.output
+    import dnf.callback
     import rpm
 except ImportError as e:
     log.error("dnfpayload: component import failed: %s", e)
     dnf = None
     rpm = None
 
-DEFAULT_REPOS = [constants.productName.lower(), "rawhide"]
 DNF_CACHE_DIR = '/tmp/dnf.cache'
+DNF_PACKAGE_CACHE_DIR_SUFFIX = 'dnf.package.cache'
+DOWNLOAD_MPOINTS = {'/tmp',
+                    '/',
+                    '/mnt/sysimage',
+                    '/mnt/sysimage/home',
+                    '/mnt/sysimage/tmp',
+                    '/mnt/sysimage/var',
+                    }
 REPO_DIRS = ['/etc/yum.repos.d',
              '/etc/anaconda.repos.d',
              '/tmp/updates/anaconda.repos.d',
@@ -59,7 +72,48 @@ def _failure_limbo():
     while True:
         time.sleep(10000)
 
-class PayloadRPMDisplay(dnf.output.LoggingTransactionDisplay):
+def _df_map():
+    """Return (mountpoint -> size available) mapping."""
+    output = pyanaconda.iutil.execWithCapture('df', ['--output=target,avail'])
+    output = output.rstrip()
+    lines = output.splitlines()
+    structured = {}
+    for line in lines:
+        items = line.split()
+        key = items[0]
+        val = items[1]
+        if not key.startswith('/'):
+            continue
+        structured[key] = Size(int(val)*1024)
+    return structured
+
+def _paced(fn):
+    """Execute `fn` no more often then every 2 seconds."""
+    def paced_fn(self, *args):
+        now = time.time()
+        if now - self.last_time < 2:
+            return
+        self.last_time = now
+        return fn(self, *args)
+    return paced_fn
+
+def _pick_mpoint(df, requested):
+    def reasonable_mpoint(mpoint):
+        return mpoint in DOWNLOAD_MPOINTS
+
+    # reserve extra
+    requested = requested + Size("150 MB")
+    sufficients = {key : val for (key,val) in df.items() if val > requested
+                   and reasonable_mpoint(key)}
+    log.info('Sufficient mountpoints found: %s', sufficients)
+
+    if not len(sufficients):
+        return None
+    # default to the biggest one:
+    return sorted(sufficients.iteritems(), key=operator.itemgetter(1),
+                  reverse=True)[0][0]
+
+class PayloadRPMDisplay(dnf.callback.LoggingTransactionDisplay):
     def __init__(self, queue):
         super(PayloadRPMDisplay, self).__init__()
         self._queue = queue
@@ -80,6 +134,43 @@ class PayloadRPMDisplay(dnf.output.LoggingTransactionDisplay):
         elif action == self.TRANS_POST:
             self._queue.put(('post', None))
 
+class DownloadProgress(dnf.callback.DownloadProgress):
+    def __init__(self):
+        self.downloads = collections.defaultdict(int)
+        self.last_time = time.time()
+        self.total_files = 0
+        self.total_size = Size(0)
+
+    @_paced
+    def _update(self):
+        msg = _('Downloading %(total_files)s RPMs, '
+                '%(downloaded)s / %(total_size)s (%(percent)d%%) done.')
+        downloaded = Size(sum(self.downloads.values()))
+        vals = {
+            'downloaded'  : downloaded,
+            'percent'     : int(100 * downloaded/self.total_size),
+            'total_files' : self.total_files,
+            'total_size'  : self.total_size
+        }
+        progressQ.send_message(msg % vals)
+
+    def end(self, payload, status, err_msg):
+        nevra = str(payload)
+        if status is dnf.callback.STATUS_OK:
+            self.downloads[nevra] = payload.download_size
+            self._update()
+            return
+        log.critical("Failed to download '%s': %d - %s", nevra, status, err_msg)
+
+    def progress(self, payload, done):
+        nevra = str(payload)
+        self.downloads[nevra] = done
+        self._update()
+
+    def start(self, total_files, total_size):
+        self.total_files = total_files
+        self.total_size = Size(total_size)
+
 def do_transaction(base, queue):
     try:
         display = PayloadRPMDisplay(queue)
@@ -96,11 +187,19 @@ class DNFPayload(packaging.PackagePayload):
             raise packaging.PayloadError("unsupported payload type")
 
         self._base = None
-        self._required_groups = []
-        self._required_pkgs = []
         self._configure()
 
+    def unsetup(self):
+        super(DNFPayload, self).unsetup()
+        self._base = None
+
     def _add_repo(self, ksrepo):
+        """Add a repo to the dnf repo object
+
+           :param ksrepo: Kickstart Repository to add
+           :type ksrepo: Kickstart RepoData object.
+           :returns: None
+        """
         repo = dnf.repo.Repo(ksrepo.name, DNF_CACHE_DIR)
         url = ksrepo.baseurl
         mirrorlist = ksrepo.mirrorlist
@@ -111,10 +210,31 @@ class DNFPayload(packaging.PackagePayload):
         repo.sslverify = not (ksrepo.noverifyssl or flags.noverifyssl)
         repo.enable()
         self._base.repos.add(repo)
+
+        # Load the metadata to verify that the repo is valid
+        try:
+            self._base.repos[repo.id].load()
+        except dnf.exceptions.RepoError as e:
+            raise packaging.MetadataError(e)
+
         log.info("added repo: '%s'", ksrepo.name)
 
+    def addRepo(self, ksrepo):
+        """Add a repo to dnf and kickstart repo lists
+
+           :param ksrepo: Kickstart Repository to add
+           :type ksrepo: Kickstart RepoData object.
+           :returns: None
+        """
+        self._add_repo(ksrepo)
+        super(DNFPayload, self).addRepo(ksrepo)
+
     def _apply_selections(self):
-        self._select_group('core')
+        if self.data.packages.nocore:
+            log.info("skipping core group due to %%packages --nocore; system may not be complete")
+        else:
+            self._select_group('core')
+
         for pkg_name in self.data.packages.packageList:
             log.info("selecting package: '%s'", pkg_name)
             try:
@@ -123,16 +243,22 @@ class DNFPayload(packaging.PackagePayload):
                 self._miss(e)
 
         for group in self.data.packages.groupList:
+            if group.name == 'core':
+                continue
             try:
-                default = group.include in (constants.GROUP_ALL,
-                                            constants.GROUP_DEFAULT)
-                optional = group.include == constants.GROUP_ALL
+                default = group.include in (GROUP_ALL,
+                                            GROUP_DEFAULT)
+                optional = group.include == GROUP_ALL
                 self._select_group(group.name, default=default, optional=optional)
             except packaging.NoSuchGroup as e:
                 self._miss(e)
 
-        map(self._install_package, self._required_pkgs)
-        map(self._select_group, self._required_groups)
+        for package in self.requiredPackages:
+            self._install_package(package, required=True)
+
+        for group in self.requiredGroups:
+            self._select_group(group, required=True)
+
         self._select_kernel_package()
         self._install_package('dnf')
 
@@ -147,14 +273,14 @@ class DNFPayload(packaging.PackagePayload):
         self._base = dnf.Base()
         conf = self._base.conf
         conf.cachedir = DNF_CACHE_DIR
-        conf.logdir = '/tmp/payload-logs'
+        conf.logdir = '/tmp/'
         # disable console output completely:
         conf.debuglevel = 0
         conf.errorlevel = 0
         self._base.logging.setup_from_dnf_conf(conf)
 
         conf.releasever = self._getReleaseVersion(None)
-        conf.installroot = constants.ROOT_PATH
+        conf.installroot = pyanaconda.iutil.getSysroot()
         conf.prepend_installroot('persistdir')
 
         # NSS won't survive the forking we do to shield out chroot during
@@ -163,18 +289,27 @@ class DNFPayload(packaging.PackagePayload):
 
         conf.reposdir = REPO_DIRS
 
-    def _install_package(self, pkg_name):
+    @property
+    def _download_space(self):
+        transaction = self._base.transaction
+        if transaction is None:
+            return Size(0)
+
+        size = sum(tsi.installed.downloadsize for tsi in transaction)
+        return Size(size)
+
+    def _install_package(self, pkg_name, required=False):
         try:
             return self._base.install(pkg_name)
-        except dnf.exceptions.PackageNotFoundError:
-            raise packaging.NoSuchPackage(pkg_name)
+        except dnf.exceptions.MarkingError:
+            raise packaging.NoSuchPackage(pkg_name, required=required)
 
     def _miss(self, exn):
-        if self.data.packages.handleMissing == constants.KS_MISSING_IGNORE:
+        if self.data.packages.handleMissing == KS_MISSING_IGNORE:
             return
 
         log.error('Missed: %r', exn)
-        if errors.errorHandler.cb(exn, str(exn)) == errors.ERROR_RAISE:
+        if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
             # The progress bar polls kind of slowly, thus installation could
             # still continue for a bit before the quit message is processed.
             # Doing a sys.exit also ensures the running thread quits before
@@ -182,16 +317,31 @@ class DNFPayload(packaging.PackagePayload):
             progressQ.send_quit(1)
             sys.exit(1)
 
-    def _select_group(self, group_id, default=True, optional=False):
+    def _pick_download_location(self):
+        required = self._download_space
+        df_map = _df_map()
+        mpoint = _pick_mpoint(df_map, required)
+        log.info("Download space required: %s, use filesystem at: %s", required,
+                 mpoint)
+        if mpoint is None:
+            msg = "Not enough disk space to download the packages."
+            raise packaging.PayloadError(msg)
+
+        pkgdir = '%s/%s' % (mpoint, DNF_PACKAGE_CACHE_DIR_SUFFIX)
+        for repo in self._base.repos.iter_enabled():
+            repo.pkgdir = pkgdir
+
+    def _select_group(self, group_id, default=True, optional=False, required=False):
         grp = self._base.comps.group_by_pattern(group_id)
         if grp is None:
-            raise packaging.NoSuchGroup(group_id)
+            raise packaging.NoSuchGroup(group_id, required=required)
         types = {'mandatory'}
         if default:
             types.add('default')
         if optional:
             types.add('optional')
-        self._base.select_group(grp, types)
+        exclude = self.data.packages.excludedList
+        self._base.group_install(grp, types, exclude=exclude)
 
     def _select_kernel_package(self):
         kernels = self.kernelPackages
@@ -210,17 +360,16 @@ class DNFPayload(packaging.PackagePayload):
         try:
             dnf_repo.load()
         except dnf.exceptions.RepoError as e:
-            raise packaging.MetadataError(str(e))
-
-    @property
-    def addOns(self):
-        # addon repos via kickstart
-        return [r.name for r in self.data.repo.dataList()]
+            id_ = dnf_repo.id
+            if id_ == self.baseRepo:
+                raise packaging.MetadataError(str(e))
+            log.info('_sync_metadata: addon repo error: %s', e)
+            self.disableRepo(id_)
 
     @property
     def baseRepo(self):
         # is any locking needed here as in the yumpayload?
-        repo_names = [constants.BASE_REPO_NAME] + DEFAULT_REPOS
+        repo_names = [constants.BASE_REPO_NAME] + self.DEFAULT_REPOS
         for repo in self._base.repos.iter_enabled():
             if repo.id in repo_names:
                 return repo.id
@@ -238,7 +387,7 @@ class DNFPayload(packaging.PackagePayload):
 
     @property
     def mirrorEnabled(self):
-        return False
+        return True
 
     @property
     def repos(self):
@@ -249,7 +398,7 @@ class DNFPayload(packaging.PackagePayload):
     def spaceRequired(self):
         transaction = self._base.transaction
         if transaction is None:
-            return Size(en_spec="3000 MB")
+            return Size("3000 MB")
 
         size = sum(tsi.installed.installsize for tsi in transaction)
         # add 35% to account for the fact that the above method is laughably
@@ -338,21 +487,36 @@ class DNFPayload(packaging.PackagePayload):
         map(self._sync_metadata, self._base.repos.iter_enabled())
         self._base.fill_sack(load_system_repo=False)
         self._base.read_comps()
+        self._refreshEnvironmentAddons()
 
     def install(self):
         progressQ.send_message(_('Starting package installation process'))
+
+        # Add the rpm macros to the global transaction environment
+        for macro in self.rpmMacros:
+            rpm.addMacro(macro[0], macro[1])
+
         if self.install_device:
             self._setupMedia(self.install_device)
         try:
             self.checkSoftwareSelection()
-        except packaging.DependencyError as e:
+            self._pick_download_location()
+        except packaging.PayloadError as e:
             if errors.errorHandler.cb(e) == errors.ERROR_RAISE:
                 _failure_limbo()
 
         pkgs_to_download = self._base.transaction.install_set
         log.info('Downloading pacakges.')
         progressQ.send_message(_('Downloading packages'))
-        self._base.download_packages(pkgs_to_download)
+        progress = DownloadProgress()
+        try:
+            self._base.download_packages(pkgs_to_download, progress)
+        except dnf.exceptions.DownloadError as e:
+            msg = 'Failed to download the following packages: %s' % str(e)
+            exc = packaging.PayloadInstallError(msg)
+            if errors.errorHandler.cb(exc) == errors.ERROR_RAISE:
+                _failure_limbo()
+
         log.info('Downloading packages finished.')
 
         pre_msg = _("Preparing transaction from installation source")
@@ -375,6 +539,7 @@ class DNFPayload(packaging.PackagePayload):
         post_msg = _("Performing post-installation setup tasks")
         progressQ.send_message(post_msg)
         process.join()
+        self._base.close()
 
     def isRepoEnabled(self, repo_id):
         try:
@@ -382,10 +547,23 @@ class DNFPayload(packaging.PackagePayload):
         except (dnf.exceptions.RepoError, KeyError):
             return super(DNFPayload, self).isRepoEnabled(repo_id)
 
+    def languageGroups(self):
+        locales = [self.data.lang.lang] + self.data.lang.addsupport
+        match_fn = pyanaconda.localization.langcode_matches_locale
+        gids = set()
+        gl_tuples = ((g.id, g.lang_only) for g in self._base.comps.groups_iter())
+        for (gid, lang) in gl_tuples:
+            for locale in locales:
+                if match_fn(lang, locale):
+                    gids.add(gid)
+        log.info('languageGroups: %s', gids)
+        return list(gids)
+
     def preInstall(self, packages=None, groups=None):
         super(DNFPayload, self).preInstall()
-        self._required_pkgs = packages
-        self._required_groups = groups
+        self.requiredPackages = packages
+        self.requiredGroups = groups
+        self.addDriverRepos()
 
     def release(self):
         pass
@@ -399,28 +577,39 @@ class DNFPayload(packaging.PackagePayload):
         env = self._base.comps.environment_by_pattern(environmentid)
         map(self.selectGroup, (id_.name for id_ in env.group_ids))
 
-    def setup(self, storage):
-        # must end up with the base repo (and its metadata) ready
-        super(DNFPayload, self).setup(storage)
-        self.updateBaseRepo()
-        self.gatherRepoMetadata()
-
     def updateBaseRepo(self, fallback=True, root=None, checkmount=True):
         log.info('configuring base repo')
         self.reset()
         url, mirrorlist, sslverify = self._setupInstallDevice(self.storage,
                                                               checkmount)
         method = self.data.method
+
         if method.method:
-            self._base.conf.releasever = self._getReleaseVersion(url)
-            if url or mirrorlist:
+            try:
+                self._base.conf.releasever = self._getReleaseVersion(url)
+                log.debug("releasever from %s is %s", url, self._base.conf.releasever)
+            except ConfigParser.MissingSectionHeaderError as e:
+                log.error("couldn't set releasever from base repo (%s): %s",
+                          method.method, e)
+
+            try:
                 base_ksrepo = self.data.RepoData(
                     name=constants.BASE_REPO_NAME, baseurl=url,
                     mirrorlist=mirrorlist, noverifyssl=not sslverify)
                 self._add_repo(base_ksrepo)
-            else:
-                log.debug("disabling ksdata method, doesn't provide a valid repo")
+            except (packaging.MetadataError, packaging.PayloadError) as e:
+                log.error("base repo (%s/%s) not valid -- removing it",
+                          method.method, url)
+                self._base.repos.pop(constants.BASE_REPO_NAME, None)
+                if not fallback:
+                    for repo in self._base.repos.iter_enabled():
+                        self.disableRepo(repo.id)
+                    return
+
+                # this preserves the method details while disabling it
                 method.method = None
+                self.install_device = None
+
         if not method.method:
             # only when there's no repo set via method use the repos from the
             # install image itself:
diff --git a/anaconda/pyanaconda/packaging/livepayload.py b/anaconda/pyanaconda/packaging/livepayload.py
index 6fa363a..f8051ff 100644
--- a/anaconda/pyanaconda/packaging/livepayload.py
+++ b/anaconda/pyanaconda/packaging/livepayload.py
@@ -42,8 +42,8 @@ import glob
 
 from pyanaconda.packaging import ImagePayload, PayloadSetupError, PayloadInstallError
 
-from pyanaconda.constants import INSTALL_TREE, ROOT_PATH, THREAD_LIVE_PROGRESS
-from pyanaconda.constants import IMAGE_DIR
+from pyanaconda.constants import INSTALL_TREE, THREAD_LIVE_PROGRESS
+from pyanaconda.constants import IMAGE_DIR, TAR_SUFFIX
 
 from pyanaconda import iutil
 
@@ -61,13 +61,14 @@ class LiveImagePayload(ImagePayload):
     """ A LivePayload copies the source image onto the target system. """
     def __init__(self, *args, **kwargs):
         super(LiveImagePayload, self).__init__(*args, **kwargs)
-        # Used to adjust size of ROOT_PATH when files are already present
+        # Used to adjust size of sysroot when files are already present
         self._adj_size = 0
         self.pct = 0
         self.pct_lock = None
+        self.source_size = 1
 
-    def setup(self, storage):
-        super(LiveImagePayload, self).setup(storage)
+    def setup(self, storage, instClass):
+        super(LiveImagePayload, self).setup(storage, instClass)
 
         # Mount the live device and copy from it instead of the overlay at /
         osimg = storage.devicetree.getDeviceByPath(self.data.method.partition)
@@ -75,7 +76,21 @@ class LiveImagePayload(ImagePayload):
             exn = PayloadSetupError("%s is not a valid block device" % (self.data.method.partition,))
             if errorHandler.cb(exn) == ERROR_RAISE:
                 raise exn
-        blivet.util.mount(osimg.path, INSTALL_TREE, fstype="auto", options="ro")
+        rc = blivet.util.mount(osimg.path, INSTALL_TREE, fstype="auto", options="ro")
+        if rc != 0:
+            raise PayloadInstallError("Failed to mount the install tree")
+
+        source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE)
+        self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree)
+
+    def unsetup(self):
+        super(LiveImagePayload, self).unsetup()
+
+        # Unmount a previously mounted live tree
+        try:
+            blivet.util.umount(INSTALL_TREE)
+        except OSError:
+            pass
 
     def preInstall(self, packages=None, groups=None):
         """ Perform pre-installation tasks. """
@@ -86,19 +101,17 @@ class LiveImagePayload(ImagePayload):
         """Monitor the amount of disk space used on the target and source and
            update the hub's progress bar.
         """
-        source = os.statvfs(INSTALL_TREE)
-        source_size = source.f_frsize * (source.f_blocks - source.f_bfree)
         mountpoints = self.storage.mountpoints.copy()
         last_pct = -1
         while self.pct < 100:
             dest_size = 0
             for mnt in mountpoints:
-                mnt_stat = os.statvfs(ROOT_PATH+mnt)
+                mnt_stat = iutil.eintr_retry_call(os.statvfs, iutil.getSysroot()+mnt)
                 dest_size += mnt_stat.f_frsize * (mnt_stat.f_blocks - mnt_stat.f_bfree)
             if dest_size >= self._adj_size:
                 dest_size -= self._adj_size
 
-            pct = int(100 * dest_size / source_size)
+            pct = int(100 * dest_size / self.source_size)
             if pct != last_pct:
                 with self.pct_lock:
                     self.pct = pct
@@ -108,6 +121,10 @@ class LiveImagePayload(ImagePayload):
 
     def install(self):
         """ Install the payload. """
+
+        if self.source_size <= 0:
+            raise PayloadInstallError("Nothing to install")
+
         self.pct_lock = Lock()
         self.pct = 0
         threadMgr.add(AnacondaThread(name=THREAD_LIVE_PROGRESS,
@@ -120,7 +137,7 @@ class LiveImagePayload(ImagePayload):
         # file system boundaries
         args = ["-pogAXtlHrDx", "--exclude", "/dev/", "--exclude", "/proc/",
                 "--exclude", "/sys/", "--exclude", "/run/", "--exclude", "/boot/*rescue*",
-                "--exclude", "/etc/machine-id", INSTALL_TREE+"/", ROOT_PATH]
+                "--exclude", "/etc/machine-id", INSTALL_TREE+"/", iutil.getSysroot()]
         try:
             rc = iutil.execWithRedirect(cmd, args)
         except (OSError, RuntimeError) as e:
@@ -142,6 +159,12 @@ class LiveImagePayload(ImagePayload):
             self.pct = 100
         threadMgr.wait(THREAD_LIVE_PROGRESS)
 
+        # Live needs to create the rescue image before bootloader is written
+        for kernel in self.kernelVersionList:
+            log.info("Generating rescue image for %s", kernel)
+            iutil.execInSysroot("new-kernel-pkg",
+                                ["--rpmposttrans", kernel])
+
     def postInstall(self):
         """ Perform post-installation tasks. """
         progressQ.send_message(_("Performing post-installation setup tasks"))
@@ -149,20 +172,13 @@ class LiveImagePayload(ImagePayload):
 
         super(LiveImagePayload, self).postInstall()
 
-        # Live needs to create the rescue image before bootloader is written
-        for kernel in self.kernelVersionList:
-            log.info("Generating rescue image for %s", kernel)
-            iutil.execWithRedirect("new-kernel-pkg",
-                                   ["--rpmposttrans", kernel],
-                                   root=ROOT_PATH)
-
         # Make sure the new system has a machine-id, it won't boot without it
-        if not os.path.exists(ROOT_PATH+"/etc/machine-id"):
-            iutil.execWithRedirect("systemd-machine-id-setup", [], root=ROOT_PATH)
+        if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
+            iutil.execInSysroot("systemd-machine-id-setup", [])
 
     @property
     def spaceRequired(self):
-        return Size(bytes=iutil.getDirSize("/")*1024)
+        return Size(iutil.getDirSize("/")*1024)
 
 class URLGrabberProgress(object):
     """ Provide methods for urlgrabber progress."""
@@ -219,14 +235,17 @@ class LiveImageKSPayload(LiveImagePayload):
         super(LiveImageKSPayload, self).__init__(*args, **kwargs)
         self._min_size = 0
         self._proxies = {}
-        self.image_path = ROOT_PATH+"/disk.img"
+        self.image_path = iutil.getSysroot()+"/disk.img"
 
-    def setup(self, storage):
-        """ Check the availability and size of the image.
+    @property
+    def is_tarfile(self):
+        """ Return True if the url ends with a tar suffix """
+        return any(self.data.method.url.endswith(suffix) for suffix in TAR_SUFFIX)
+
+    def _setup_url_image(self):
+        """ Check to make sure the url is available and estimate the space
+            needed to download and install it.
         """
-        # This is on purpose, we don't want to call LiveImagePayload's setup method.
-        ImagePayload.setup(self, storage)
-
         self._proxies = {}
         if self.data.method.proxy:
             try:
@@ -240,6 +259,12 @@ class LiveImageKSPayload(LiveImagePayload):
         error = None
         try:
             req = urllib.urlopen(self.data.method.url, proxies=self._proxies)
+
+            # At this point we know we can get the image and what its size is
+            # Make a guess as to minimum size needed:
+            # Enough space for image and image * 3
+            if req.info().get("content-length"):
+                self._min_size = int(req.info().get("content-length")) * 4
         except IOError as e:
             log.error("Error opening liveimg: %s", e)
             error = e
@@ -249,27 +274,39 @@ class LiveImageKSPayload(LiveImagePayload):
             if method.startswith("http") and req.getcode() != 200:
                 error = "http request returned %s" % req.getcode()
 
+        return error
+
+    def _setup_file_image(self):
+        """ Check to make sure the file is available and estimate the space
+            needed to install it.
+        """
+        if not os.path.exists(self.data.method.url[7:]):
+            return "file does not exist: %s" % self.data.method.url
+
+        self._min_size = os.stat(self.data.method.url[7:])[stat.ST_SIZE] * 3
+        return None
+
+    def setup(self, storage, instClass):
+        """ Check the availability and size of the image.
+        """
+        # This is on purpose, we don't want to call LiveImagePayload's setup method.
+        ImagePayload.setup(self, storage, instClass)
+
+        if self.data.method.url.startswith("file://"):
+            error = self._setup_file_image()
+        else:
+            error = self._setup_url_image()
+
         if error:
             exn = PayloadInstallError(str(error))
             if errorHandler.cb(exn) == ERROR_RAISE:
                 raise exn
 
-        # At this point we know we can get the image and what its size is
-        # Make a guess as to minimum size needed:
-        # Enough space for image and image * 3
-        if req.info().get("content-length"):
-            self._min_size = int(req.info().get("content-length")) * 4
-
         log.debug("liveimg size is %s", self._min_size)
 
-    def preInstall(self, *args, **kwargs):
-        """ Download image and loopback mount it.
-
-            This is called after partitioning is setup, we now have space
-            to grab the image. Download it to ROOT_PATH and provide feedback
-            during the download (using urlgrabber callback).
-        """
-        # Setup urlgrabber and call back to download image to ROOT_PATH
+    def _preInstall_url_image(self):
+        """ Download the image using urlgrabber """
+        # Setup urlgrabber and call back to download image to sysroot
         progress = URLGrabberProgress()
         ugopts = {"ssl_verify_peer": not self.data.method.noverifyssl,
                   "ssl_verify_host": not self.data.method.noverifyssl,
@@ -289,6 +326,26 @@ class LiveImageKSPayload(LiveImagePayload):
                 error = "Failed to download %s, file doesn't exist" % self.data.method.url
                 log.error(error)
 
+    def unsetup(self):
+        # Skip LiveImagePayload's unsetup method
+        ImagePayload.unsetup(self)
+
+    def preInstall(self, *args, **kwargs):
+        """ Get image and loopback mount it.
+
+            This is called after partitioning is setup, we now have space to
+            grab the image. If it is a network source Download it to sysroot
+            and provide feedback during the download (using urlgrabber
+            callback).
+
+            If it is a file:// source then use the file directly.
+        """
+        error = None
+        if self.data.method.url.startswith("file://"):
+            self.image_path = self.data.method.url[7:]
+        else:
+            error = self._preInstall_url_image()
+
         if error:
             exn = PayloadInstallError(str(error))
             if errorHandler.cb(exn) == ERROR_RAISE:
@@ -315,35 +372,87 @@ class LiveImageKSPayload(LiveImagePayload):
                 if errorHandler.cb(exn) == ERROR_RAISE:
                     raise exn
 
-        # Mount the image and check to see if it is a LiveOS/*.img
-        # style squashfs image. If so, move it to IMAGE_DIR and mount the real
-        # root image on INSTALL_TREE
-        blivet.util.mount(self.image_path, INSTALL_TREE, fstype="auto", options="ro")
-        if os.path.exists(INSTALL_TREE+"/LiveOS"):
-            # Find the first .img in the directory and mount that on INSTALL_TREE
-            img_files = glob.glob(INSTALL_TREE+"/LiveOS/*.img")
-            if img_files:
-                img_file = os.path.basename(sorted(img_files)[0])
+        # If this looks like a tarfile, skip trying to mount it
+        if not self.is_tarfile:
+            # Mount the image and check to see if it is a LiveOS/*.img
+            # style squashfs image. If so, move it to IMAGE_DIR and mount the real
+            # root image on INSTALL_TREE
+            blivet.util.mount(self.image_path, INSTALL_TREE, fstype="auto", options="ro")
+            if os.path.exists(INSTALL_TREE+"/LiveOS"):
+                # Find the first .img in the directory and mount that on INSTALL_TREE
+                img_files = glob.glob(INSTALL_TREE+"/LiveOS/*.img")
+                if img_files:
+                    img_file = os.path.basename(sorted(img_files)[0])
 
-                # move the mount to IMAGE_DIR
-                os.makedirs(IMAGE_DIR, 0755)
-                # work around inability to move shared filesystems
-                iutil.execWithRedirect("mount",
-                                       ["--make-rprivate", "/"])
-                iutil.execWithRedirect("mount",
-                                       ["--move", INSTALL_TREE, IMAGE_DIR])
-                blivet.util.mount(IMAGE_DIR+"/LiveOS/"+img_file, INSTALL_TREE,
-                                  fstype="auto", options="ro")
+                    # move the mount to IMAGE_DIR
+                    os.makedirs(IMAGE_DIR, 0o755)
+                    # work around inability to move shared filesystems
+                    iutil.execWithRedirect("mount",
+                                           ["--make-rprivate", "/"])
+                    iutil.execWithRedirect("mount",
+                                           ["--move", INSTALL_TREE, IMAGE_DIR])
+                    blivet.util.mount(IMAGE_DIR+"/LiveOS/"+img_file, INSTALL_TREE,
+                                      fstype="auto", options="ro")
+
+                    source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE)
+                    self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree)
+
+    def install(self):
+        """ Install the payload if it is a tar.
+            Otherwise fall back to rsync of INSTALL_TREE
+        """
+        # If it doesn't look like a tarfile use the super's install()
+        if not self.is_tarfile:
+            super(LiveImageKSPayload, self).install()
+            return
+
+        # Use 2x the archive's size to estimate the size of the install
+        # This is used to drive the progress display
+        self.source_size = os.stat(self.image_path)[stat.ST_SIZE] * 2
+
+        self.pct_lock = Lock()
+        self.pct = 0
+        threadMgr.add(AnacondaThread(name=THREAD_LIVE_PROGRESS,
+                                     target=self.progress))
+
+        cmd = "tar"
+        # preserve: ACL's, xattrs, and SELinux context
+        args = ["--selinux", "--acls", "--xattrs",
+                "--exclude", "/dev/", "--exclude", "/proc/",
+                "--exclude", "/sys/", "--exclude", "/run/", "--exclude", "/boot/*rescue*",
+                "--exclude", "/etc/machine-id", "-xaf", self.image_path, "-C", iutil.getSysroot()]
+        try:
+            rc = iutil.execWithRedirect(cmd, args)
+        except (OSError, RuntimeError) as e:
+            msg = None
+            err = str(e)
+            log.error(err)
+        else:
+            err = None
+            msg = "%s exited with code %d" % (cmd, rc)
+            log.info(msg)
+
+        if err:
+            exn = PayloadInstallError(err or msg)
+            if errorHandler.cb(exn) == ERROR_RAISE:
+                raise exn
+
+        # Wait for progress thread to finish
+        with self.pct_lock:
+            self.pct = 100
+        threadMgr.wait(THREAD_LIVE_PROGRESS)
 
     def postInstall(self):
-        """ Unmount image, remove image file from target
+        """ Unmount and remove image
+
+            If file:// was used, just unmount it.
         """
         super(LiveImageKSPayload, self).postInstall()
 
         if os.path.exists(IMAGE_DIR+"/LiveOS"):
             blivet.util.umount(IMAGE_DIR)
 
-        if os.path.exists(self.image_path):
+        if os.path.exists(self.image_path) and not self.data.method.url.startswith("file://"):
             os.unlink(self.image_path)
 
     @property
@@ -354,6 +463,6 @@ class LiveImageKSPayload(LiveImagePayload):
             and install.
         """
         if self._min_size:
-            return Size(bytes=self._min_size)
+            return Size(self._min_size)
         else:
-            return Size(bytes=1024*1024*1024)
+            return Size(1024*1024*1024)
diff --git a/anaconda/pyanaconda/packaging/rpmostreepayload.py b/anaconda/pyanaconda/packaging/rpmostreepayload.py
new file mode 100644
index 0000000..1dca94a
--- /dev/null
+++ b/anaconda/pyanaconda/packaging/rpmostreepayload.py
@@ -0,0 +1,234 @@
+# ostreepayload.py
+# Deploy OSTree trees to target
+#
+# Copyright (C) 2012,2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Colin Walters <walters@redhat.com>
+#
+
+import os
+import shutil
+
+from pyanaconda import iutil
+from pyanaconda.i18n import _
+from pyanaconda.progress import progressQ
+from gi.repository import GLib
+from gi.repository import Gio
+
+from blivet.size import Size
+
+import logging
+log = logging.getLogger("anaconda")
+
+from pyanaconda.packaging import ArchivePayload, PayloadInstallError
+import pyanaconda.errors as errors
+
+class RPMOSTreePayload(ArchivePayload):
+    """ A RPMOSTreePayload deploys a tree (possibly with layered packages) onto the target system. """
+    def __init__(self, data):
+        super(RPMOSTreePayload, self).__init__(data)
+
+    @property
+    def handlesBootloaderConfiguration(self):
+        return True
+
+    @property
+    def kernelVersionList(self):
+        # OSTree handles bootloader configuration
+        return []
+
+    @property
+    def spaceRequired(self):
+        # We don't have this data with OSTree at the moment
+        return Size("500 MB")
+
+    def _safeExecWithRedirect(self, cmd, argv, **kwargs):
+        """Like iutil.execWithRedirect, but treat errors as fatal"""
+        rc = iutil.execWithRedirect(cmd, argv, **kwargs)
+        if rc != 0:
+            exn = PayloadInstallError("%s %s exited with code %d" % (cmd, argv, rc))
+            if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
+                raise exn
+
+    def _pullProgressCb(self, asyncProgress):
+        status = asyncProgress.get_status()
+        outstanding_fetches = asyncProgress.get_uint('outstanding-fetches')
+        if status:
+            progressQ.send_message(status)
+        elif outstanding_fetches > 0:
+            bytes_transferred = asyncProgress.get_uint64('bytes-transferred')
+            fetched = asyncProgress.get_uint('fetched')
+            requested = asyncProgress.get_uint('requested')
+            formatted_bytes = GLib.format_size_full(bytes_transferred, 0)
+
+            if requested == 0:
+                percent = 0.0
+            else:
+                percent = (fetched*1.0 / requested) * 100
+
+            progressQ.send_message("Receiving objects: %d%% (%d/%d) %s" % (percent, fetched, requested, formatted_bytes))
+        else:
+            progressQ.send_message("Writing objects")
+
+    def install(self):
+        cancellable = None
+        from gi.repository import OSTree
+        ostreesetup = self.data.ostreesetup
+        log.info("executing ostreesetup=%r", ostreesetup)
+
+        # Initialize the filesystem - this will create the repo as well
+        self._safeExecWithRedirect("ostree",
+            ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
+             "init-fs", iutil.getTargetPhysicalRoot()])
+
+        repo_arg = "--repo=" + iutil.getTargetPhysicalRoot() + '/ostree/repo'
+
+        # Set up the chosen remote
+        remote_args = [repo_arg, "remote", "add"]
+        if ((hasattr(ostreesetup, 'noGpg') and ostreesetup.noGpg) or
+            (hasattr(ostreesetup, 'nogpg') and ostreesetup.nogpg)):
+            remote_args.append("--set=gpg-verify=false")
+        remote_args.extend([ostreesetup.remote,
+                            ostreesetup.url])
+        self._safeExecWithRedirect("ostree", remote_args)
+
+        sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
+        sysroot = OSTree.Sysroot.new(sysroot_path)
+        sysroot.load(cancellable)
+
+        repo = sysroot.get_repo(None)[1]
+        repo.set_disable_fsync(True)
+        progressQ.send_message(_("Starting pull of %(branchName)s from %(source)s") % \
+                               {"branchName": ostreesetup.ref, "source": ostreesetup.remote})
+
+        progress = OSTree.AsyncProgress.new()
+        progress.connect('changed', self._pullProgressCb)
+        repo.pull(ostreesetup.remote, [ostreesetup.ref], 0, progress, cancellable)
+
+        progressQ.send_message(_("Preparing deployment of %s") % (ostreesetup.ref, ))
+
+        self._safeExecWithRedirect("ostree",
+            ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
+             "os-init", ostreesetup.osname])
+
+        admin_deploy_args = ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
+                             "deploy", "--os=" + ostreesetup.osname]
+
+        admin_deploy_args.append(ostreesetup.remote + ':' + ostreesetup.ref)
+
+        log.info("ostree admin deploy starting")
+        progressQ.send_message(_("Deployment starting: %s") % (ostreesetup.ref, ))
+        self._safeExecWithRedirect("ostree", admin_deploy_args)
+        log.info("ostree admin deploy complete")
+        progressQ.send_message(_("Deployment complete: %s") % (ostreesetup.ref, ))
+
+        # Reload now that we've deployed, find the path to the new deployment
+        sysroot.load(None)
+        deployments = sysroot.get_deployments()
+        assert len(deployments) > 0
+        deployment = deployments[0]
+        deployment_path = sysroot.get_deployment_directory(deployment)
+        iutil.setSysroot(deployment_path.get_path())
+
+        # Copy specific bootloader data files from the deployment
+        # checkout to the target root.  See
+        # https://bugzilla.gnome.org/show_bug.cgi?id=726757 This
+        # happens once, at installation time.
+        # extlinux ships its modules directly in the RPM in /boot.
+        # For GRUB2, Anaconda installs device.map there.  We may need
+        # to add other bootloaders here though (if they can't easily
+        # be fixed to *copy* data into /boot at install time, instead
+        # of shipping it in the RPM).
+        physboot = iutil.getTargetPhysicalRoot() + '/boot'
+        sysboot = iutil.getSysroot() + '/boot'
+        for fname in ['extlinux', 'grub2']:
+            srcpath = os.path.join(sysboot, fname)
+            if os.path.isdir(srcpath):
+                log.info("Copying bootloader data: " + fname)
+                shutil.copytree(srcpath, os.path.join(physboot, fname))
+
+    def prepareMountTargets(self, storage):
+        ostreesetup = self.data.ostreesetup
+
+        varroot = iutil.getTargetPhysicalRoot() + '/ostree/deploy/' + ostreesetup.osname + '/var'
+
+        # Set up bind mounts as if we've booted the target system, so
+        # that %post script work inside the target.
+        binds = [(iutil.getTargetPhysicalRoot(),
+                  iutil.getSysroot() + '/sysroot'),
+                 (varroot,
+                  iutil.getSysroot() + '/var'),
+                 (iutil.getSysroot() + '/usr', None)]
+
+        for (src, dest) in binds:
+            self._safeExecWithRedirect("mount",
+                                       ["--bind", src, dest if dest else src])
+            if dest is None:
+                self._safeExecWithRedirect("mount",
+                                           ["--bind", "-o", "ro", src, src])
+
+        # Now, ensure that all other potential mount point directories such as
+        # (/home) are created.  We run through the full tmpfiles here in order
+        # to also allow Anaconda and %post scripts to write to directories like
+        # /root.  We don't iterate *all* tmpfiles because we don't have the
+        # matching NSS configuration inside Anaconda, and we can't "chroot" to
+        # get it because that would require mounting the API filesystems in the
+        # target.
+        for varsubdir in ('home', 'roothome', 'lib/rpm', 'opt', 'srv',
+                          'usrlocal', 'mnt', 'media', 'spool/mail'):
+            self._safeExecWithRedirect("systemd-tmpfiles",
+                                       ["--create", "--boot", "--root=" + iutil.getSysroot(),
+                                        "--prefix=/var/" + varsubdir])
+
+    def recreateInitrds(self, force=False):
+        # For rpmostree payloads, we're replicating an initramfs from
+        # a compose server, and should never be regenerating them
+        # per-machine.
+        pass
+
+    def postInstall(self):
+        super(RPMOSTreePayload, self).postInstall()
+
+        physboot = iutil.getTargetPhysicalRoot() + '/boot'
+
+        # If we're using extlinux, rename extlinux.conf to
+        # syslinux.cfg, since that's what OSTree knows about.
+        # syslinux upstream supports both, but I'd say that upstream
+        # using syslinux.cfg is somewhat preferred.
+        physboot_extlinux = physboot + '/extlinux'
+        if os.path.isdir(physboot_extlinux):
+            physboot_syslinux = physboot + '/syslinux'
+            physboot_loader = physboot + '/loader'
+            assert os.path.isdir(physboot_loader)
+            orig_extlinux_conf = physboot_extlinux + '/extlinux.conf'
+            target_syslinux_cfg = physboot_loader + '/syslinux.cfg'
+            log.info("Moving %s -> %s", orig_extlinux_conf, target_syslinux_cfg)
+            os.rename(orig_extlinux_conf, target_syslinux_cfg)
+            # A compatibility bit for OSTree
+            os.mkdir(physboot_syslinux)
+            os.symlink('../loader/syslinux.cfg', physboot_syslinux + '/syslinux.cfg')
+            # And *also* tell syslinux that the config is really in /boot/loader
+            os.symlink('loader/syslinux.cfg', physboot + '/syslinux.cfg')
+
+        # OSTree owns the bootloader configuration, so here we give it
+        # the argument list we computed from storage, architecture and
+        # such.
+        set_kargs_args = ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
+                          "instutil", "set-kargs"]
+        set_kargs_args.extend(self.storage.bootloader.boot_args)
+        set_kargs_args.append("root=" + self.storage.rootDevice.fstabSpec)
+        self._safeExecWithRedirect("ostree", set_kargs_args)
diff --git a/anaconda/pyanaconda/packaging/tarpayload.py b/anaconda/pyanaconda/packaging/tarpayload.py
index 33bc07e..b6328e0 100644
--- a/anaconda/pyanaconda/packaging/tarpayload.py
+++ b/anaconda/pyanaconda/packaging/tarpayload.py
@@ -36,9 +36,11 @@ except ImportError:
     log.error("import of tarfile failed")
     tarfile = None
 
-from pyanaconda.constants import ROOT_PATH
 from pyanaconda.packaging import ArchivePayload, PayloadError
+from pyanaconda import iutil
 
+# TarPayload is not yet fully implemented
+# pylint: disable=abstract-method
 class TarPayload(ArchivePayload):
     """ A TarPayload unpacks a single tar archive onto the target system. """
     def __init__(self, data):
@@ -49,8 +51,8 @@ class TarPayload(ArchivePayload):
         self.archive = None
         self.image_file = None
 
-    def setup(self, storage):
-        super(TarPayload, self).setup(storage)
+    def setup(self, storage, instClass):
+        super(TarPayload, self).setup(storage, instClass)
 
         try:
             self.archive = tarfile.open(self.image_file)
@@ -59,6 +61,10 @@ class TarPayload(ArchivePayload):
             log.error("opening tar archive %s: %s", self.image_file, e)
             raise PayloadError("invalid payload format")
 
+    def unsetup(self):
+        super(TarPayload, self).unsetup()
+        self.archive = None
+
     @property
     def requiredSpace(self):
         byte_count = sum(m.size for m in self.archive.getmembers())
@@ -72,7 +78,7 @@ class TarPayload(ArchivePayload):
 
     def install(self):
         try:
-            self.archive.extractall(path=ROOT_PATH)
+            self.archive.extractall(path=iutil.getSysroot())
         except (tarfile.ExtractError, tarfile.CompressionError) as e:
             log.error("extracting tar archive %s: %s", self.image_file, e)
 
diff --git a/anaconda/pyanaconda/packaging/yumpayload.py b/anaconda/pyanaconda/packaging/yumpayload.py
index 9227693..36e314f 100644
--- a/anaconda/pyanaconda/packaging/yumpayload.py
+++ b/anaconda/pyanaconda/packaging/yumpayload.py
@@ -62,19 +62,20 @@ except ImportError:
     log.error("import of yum failed")
     yum = None
 
-from pyanaconda.constants import BASE_REPO_NAME, DRACUT_ISODIR, INSTALL_TREE, ISO_DIR, MOUNT_DIR, ROOT_PATH
+from pyanaconda.constants import BASE_REPO_NAME, DRACUT_ISODIR, INSTALL_TREE, ISO_DIR, MOUNT_DIR, \
+                                 LOGLVL_LOCK
 from pyanaconda.flags import flags
 
 from pyanaconda import iutil
 from pyanaconda.iutil import ProxyString, ProxyStringError
 from pyanaconda.i18n import _
 from pyanaconda.nm import nm_is_connected
-from pyanaconda.product import productName, isFinal
+from pyanaconda.product import isFinal
 from blivet.size import Size
 import blivet.util
 import blivet.arch
 
-from pyanaconda.errors import ERROR_RAISE, errorHandler
+from pyanaconda.errors import ERROR_RAISE, errorHandler, CmdlineError
 from pyanaconda.packaging import DependencyError, MetadataError, NoNetworkError, NoSuchGroup, \
                                  NoSuchPackage, PackagePayload, PayloadError, PayloadInstallError, \
                                  PayloadSetupError
@@ -84,9 +85,8 @@ from pyanaconda.localization import langcode_matches_locale
 
 from pykickstart.constants import GROUP_ALL, GROUP_DEFAULT, KS_MISSING_IGNORE
 
-YUM_PLUGINS = ["blacklist", "whiteout", "fastestmirror", "langpacks"]
-DEFAULT_REPOS = [productName.lower(), "rawhide"]
-BASE_REPO_NAMES = [BASE_REPO_NAME] + DEFAULT_REPOS
+YUM_PLUGINS = ["fastestmirror", "langpacks"]
+BASE_REPO_NAMES = [BASE_REPO_NAME] + PackagePayload.DEFAULT_REPOS
 
 import inspect
 import threading
@@ -101,16 +101,16 @@ class YumLock(object):
         frame = inspect.stack()[2]
         threadName = threading.currentThread().name
 
-        log.debug("about to acquire _yum_lock for %s at %s:%s (%s)", threadName, frame[1], frame[2], frame[3])
+        log.log(LOGLVL_LOCK, "about to acquire _yum_lock for %s at %s:%s (%s)", threadName, frame[1], frame[2], frame[3])
         _private_yum_lock.acquire()
-        log.debug("have _yum_lock for %s", threadName)
+        log.log(LOGLVL_LOCK, "have _yum_lock for %s", threadName)
         return _private_yum_lock
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         _private_yum_lock.release()
 
         if not isFinal:
-            log.debug("gave up _yum_lock for %s", threading.currentThread().name)
+            log.log(LOGLVL_LOCK, "gave up _yum_lock for %s", threading.currentThread().name)
 
 def refresh_base_repo(cond_fn=None):
     """
@@ -148,6 +148,8 @@ def refresh_base_repo(cond_fn=None):
 
 _yum_lock = YumLock()
 _yum_cache_dir = "/tmp/yum.cache"
+_yum_installer_langpack_conf = "/tmp/yum.pluginconf.d/langpacks.conf"
+_yum_target_langpack_conf = "/etc/yum/pluginconf.d/langpacks.conf"
 
 class YumPayload(PackagePayload):
     """ A YumPayload installs packages onto the target system using yum.
@@ -165,16 +167,11 @@ class YumPayload(PackagePayload):
 
         PackagePayload.__init__(self, data)
 
-        self.default_repos = [productName.lower(), "rawhide"]
-
         self._root_dir = "/tmp/yum.root"
         self._repos_dir = "/etc/yum.repos.d,/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anaconda.repos.d"
         self._yum = None
         self._setup = False
 
-        self._requiredPackages = []
-        self._requiredGroups = []
-
         # base repo caching
         self._base_repo = None
         self._base_repo_lock = threading.RLock()
@@ -188,30 +185,29 @@ class YumPayload(PackagePayload):
         # This value comes from a default install of the x86_64 Fedora 18.  It
         # is meant as a best first guess only.  Once package metadata is
         # available we can use that as a better value.
-        self._space_required = Size(en_spec="3000 MB")
+        self._space_required = Size("3000 MB")
 
         self._groups = None
         self._packages = []
 
         self._resetYum(root=root, releasever=releasever)
 
-    def setup(self, storage):
-        super(YumPayload, self).setup(storage)
+    def setup(self, storage, instClass):
+        super(YumPayload, self).setup(storage, instClass)
 
         self._writeYumConfig()
         self._setup = True
 
-        self.updateBaseRepo(fallback=not flags.automatedInstall)
-
-        # When setup is called, it's already in a separate thread. That thread
-        # will try to select groups right after this returns, so make sure we
-        # have group info ready.
-        self.gatherRepoMetadata()
+    def unsetup(self):
+        super(YumPayload, self).unsetup()
+        self._setup = False
 
     def _resetYum(self, root=None, keep_cache=False, releasever=None):
         """ Delete and recreate the payload's YumBase instance.
 
             Setup _yum.preconf -- DO NOT TOUCH IT OUTSIDE THIS METHOD
+            NOTE:  This is enforced by tests/pylint/preconf.py.  If the name
+            of this method changes, change it there too.
         """
         if root is None:
             root = self._root_dir
@@ -249,10 +245,17 @@ class YumPayload(PackagePayload):
     def _writeLangpacksConfig(self):
         langs = [self.data.lang.lang] + self.data.lang.addsupport
         log.debug("configuring langpacks for %s", langs)
-        with open("/etc/yum/pluginconf.d/langpacks.conf", "a") as f:
+        iutil.mkdirChain(os.path.dirname(_yum_installer_langpack_conf))
+        shutil.copy2(_yum_target_langpack_conf,
+                     _yum_installer_langpack_conf)
+        with open(_yum_installer_langpack_conf, "a") as f:
             f.write("# Added by Anaconda\n")
             f.write("langpack_locales = %s\n" % ", ".join(langs))
 
+    def _copyLangpacksConfigToTarget(self):
+        shutil.copy2(_yum_installer_langpack_conf,
+                     iutil.getSysroot()+_yum_target_langpack_conf)
+
     def _writeYumConfig(self):
         """ Write out anaconda's main yum configuration file. """
         buf = """
@@ -262,12 +265,13 @@ keepcache=0
 logfile=/tmp/yum.log
 metadata_expire=never
 pluginpath=/usr/lib/yum-plugins,/tmp/updates/yum-plugins
-pluginconfpath=/etc/yum/pluginconf.d,/tmp/updates/pluginconf.d
+pluginconfpath=%s,/etc/yum/pluginconf.d,/tmp/updates/pluginconf.d
 plugins=1
 debuglevel=3
 errorlevel=6
 reposdir=%s
-""" % (_yum_cache_dir, self._repos_dir)
+""" % (_yum_cache_dir, os.path.dirname(_yum_installer_langpack_conf),
+       self._repos_dir)
 
         if flags.noverifyssl:
             buf += "sslverify=0\n"
@@ -293,7 +297,7 @@ reposdir=%s
     def _yumCacheDirHack(self):
         # This is what it takes to get yum to use a cache dir outside the
         # install root. We do this so we don't have to re-gather repo meta-
-        # data after we change the install root to ROOT_PATH, which can only
+        # data after we change the install root to sysroot, which can only
         # happen after we've enabled the new storage configuration.
         with _yum_lock:
             if not self._yum.conf.cachedir.startswith(self._yum.conf.installroot):
@@ -370,7 +374,7 @@ reposdir=%s
         self._writeYumConfig()
         self._writeLangpacksConfig()
         log.debug("setting releasever to previous value of %s", releasever)
-        self._resetYum(root=ROOT_PATH, keep_cache=True, releasever=releasever)
+        self._resetYum(root=iutil.getSysroot(), keep_cache=True, releasever=releasever)
         self._yumCacheDirHack()
         self.gatherRepoMetadata()
 
@@ -442,12 +446,18 @@ reposdir=%s
             else:
                 # didn't find any base repo set and enabled
                 with self._base_repo_lock:
+                    log.debug("No base_repo found in %s", BASE_REPO_NAMES)
                     self._base_repo = None
 
     @property
     def mirrorEnabled(self):
         with _yum_lock:
-            return "fastestmirror" in self._yum.plugins.enabledPlugins
+            # yum initializes with plugins disabled, and when plugins are disabled
+            # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
+            if hasattr(self._yum.plugins, "enabledPlugins"):
+                return "fastestmirror" in self._yum.plugins.enabledPlugins
+            else:
+                return False
 
     def getRepo(self, repo_id):
         """ Return the yum repo object. """
@@ -465,7 +475,6 @@ reposdir=%s
         except RepoError:
             return super(YumPayload, self).isRepoEnabled(repo_id)
 
-    # pylint: disable-msg=W0221
     @refresh_base_repo()
     def updateBaseRepo(self, fallback=True, root=None, checkmount=True):
         """ Update the base repo based on self.data.method.
@@ -585,7 +594,7 @@ reposdir=%s
                 elif self._yum.conf.yumvar['releasever'] == "rawhide" and \
                      "rawhide" in self.repos and \
                      self._yum.repos.getRepo("rawhide").enabled and \
-                     repo.id != "rawhide":
+                     repo.id not in (BASE_REPO_NAME, "rawhide"):
                     self.disableRepo(repo.id)
                 elif method.method and \
                      repo.id != BASE_REPO_NAME and \
@@ -602,11 +611,17 @@ reposdir=%s
                 repo = self._yum.repos.getRepo(repo_id)
                 if repo.enabled:
                     try:
+                        log.info("gathering repo metadata for %s", repo_id)
                         self._getRepoMetadata(repo)
                     except PayloadError as e:
                         log.error("failed to grab repo metadata for %s: %s",
                                   repo_id, e)
                         self.disableRepo(repo_id)
+                else:
+                    log.info("skipping disabled repo %s", repo_id)
+
+        # Make sure environmentAddon information is current
+        self._refreshEnvironmentAddons()
 
         log.info("metadata retrieval complete")
 
@@ -628,10 +643,11 @@ reposdir=%s
     def _configureAddOnRepo(self, repo):
         """ Configure a single ksdata repo. """
         url = repo.baseurl
-        if url and url.startswith("nfs:"):
-            (opts, server, path) = iutil.parseNfsUrl(url)
+        if url and url.startswith("nfs://"):
+            # Let the assignment throw ValueError for bad NFS urls from kickstart
+            (server, path) = url.strip("nfs://").split(":", 1)
             mountpoint = "%s/%s.nfs" % (MOUNT_DIR, repo.name)
-            self._setupNFS(mountpoint, server, path, opts)
+            self._setupNFS(mountpoint, server, path, None)
 
             url = "file://" + mountpoint
 
@@ -796,8 +812,8 @@ reposdir=%s
             baseurl = self._replaceVars(baseurl)
         if mirrorlist:
             mirrorlist = self._replaceVars(mirrorlist)
-        log.debug("adding yum repo %s with baseurl %s and mirrorlist %s",
-                  name, baseurl, mirrorlist)
+        log.info("adding yum repo, name: %s, baseurl: %s, mirrorlist: %s",
+                 name, baseurl, mirrorlist)
         with _yum_lock:
             if needsAdding:
                 # Then add it to yum's internal structures.
@@ -996,6 +1012,9 @@ reposdir=%s
     @property
     def _yumGroups(self):
         """ yum.comps.Comps instance. """
+        if not self._setup:
+            return []
+
         from yum.Errors import RepoError, GroupsError
         with _yum_lock:
             if not self._groups:
@@ -1076,7 +1095,7 @@ reposdir=%s
                 return True
             return False
 
-    def _selectYumGroup(self, groupid, default=True, optional=False):
+    def _selectYumGroup(self, groupid, default=True, optional=False, required=False):
         # select the group in comps
         pkg_types = ['mandatory']
         if default:
@@ -1090,7 +1109,7 @@ reposdir=%s
             try:
                 self._yum.selectGroup(groupid, group_package_types=pkg_types)
             except yum.Errors.GroupsError:
-                raise NoSuchGroup(groupid)
+                raise NoSuchGroup(groupid, required=required)
 
     def _deselectYumGroup(self, groupid):
         # deselect the group in comps
@@ -1099,7 +1118,7 @@ reposdir=%s
             try:
                 self._yum.deselectGroup(groupid, force=True)
             except yum.Errors.GroupsError:
-                raise NoSuchGroup(groupid)
+                raise NoSuchGroup(groupid, adding=False)
 
     ###
     ### METHODS FOR WORKING WITH PACKAGES
@@ -1120,7 +1139,7 @@ reposdir=%s
 
             return self._packages
 
-    def _selectYumPackage(self, pkgid):
+    def _selectYumPackage(self, pkgid, required=False):
         """Mark a package for installation.
 
            pkgid - The name of a package to be installed.  This could include
@@ -1131,7 +1150,7 @@ reposdir=%s
             try:
                 self._yum.install(pattern=pkgid)
             except yum.Errors.InstallError:
-                raise NoSuchPackage(pkgid)
+                raise NoSuchPackage(pkgid, required=required)
 
     def _deselectYumPackage(self, pkgid):
         """Mark a package to be excluded from installation.
@@ -1160,7 +1179,7 @@ reposdir=%s
 
         total += total * 0.35   # add 35% to account for the fact that the above
                                 # method is laughably inaccurate
-        self._space_required = Size(bytes=total)
+        self._space_required = Size(total)
 
         return self._space_required
 
@@ -1182,7 +1201,13 @@ reposdir=%s
         if self.data.packages.handleMissing == KS_MISSING_IGNORE:
             return
 
-        if errorHandler.cb(exn, str(exn)) == ERROR_RAISE:
+        # If we're doing non-interactive ks install, raise CmdlineError,
+        # otherwise the system will just reboot automatically
+        if flags.automatedInstall and not flags.ksprompt:
+            errtxt = _("CmdlineError: Missing package: %s") % str(exn)
+            log.error(errtxt)
+            raise CmdlineError(errtxt)
+        elif errorHandler.cb(exn) == ERROR_RAISE:
             # The progress bar polls kind of slowly, thus installation could
             # still continue for a bit before the quit message is processed.
             # Let's sleep forever to prevent any further actions and wait for
@@ -1196,15 +1221,22 @@ reposdir=%s
 
             This follows the same ordering/pattern as kickstart.py.
         """
-        self._selectYumGroup("core")
+        if self.data.packages.nocore:
+            log.info("skipping core group due to %%packages --nocore; system may not be complete")
+        else:
+            self._selectYumGroup("core")
+
+        env = None
 
         if self.data.packages.default and self.environments:
-            self.selectEnvironment(self.environments[0])
+            env = self.environments[0]
+        elif self.data.packages.environment:
+            env = self.data.packages.environment
 
-        for package in self.data.packages.packageList:
+        if env:
             try:
-                self._selectYumPackage(package)
-            except NoSuchPackage as e:
+                self.selectEnvironment(env)
+            except NoSuchGroup as e:
                 self._handleMissing(e)
 
         for group in self.data.packages.groupList:
@@ -1221,48 +1253,24 @@ reposdir=%s
             except NoSuchGroup as e:
                 self._handleMissing(e)
 
-        for package in self.data.packages.excludedList:
-            try:
-                self._deselectYumPackage(package)
-            except NoSuchPackage as e:
-                self._handleMissing(e)
-
         for group in self.data.packages.excludedGroupList:
             try:
                 self._deselectYumGroup(group.name)
             except NoSuchGroup as e:
                 self._handleMissing(e)
 
+        for package in self.data.packages.packageList:
+            try:
+                self._selectYumPackage(package)
+            except NoSuchPackage as e:
+                self._handleMissing(e)
+
+        for package in self.data.packages.excludedList:
+            self._deselectYumPackage(package)
+
         self._select_kernel_package()
         self.selectRequiredPackages()
 
-    def _addDriverRepos(self):
-        """ Add driver repositories and packages
-        """
-        # Drivers are loaded by anaconda-dracut, their repos are copied
-        # into /run/install/DD-X where X is a number starting at 1. The list of
-        # packages that were selected is in /run/install/dd_packages
-
-        # Add repositories
-        dir_num = 1
-        repo_template="/run/install/DD-%d/%s/"
-        while True:
-            repo = repo_template % (dir_num, blivet.arch.getArch())
-            if not os.path.isdir(repo+"repodata"):
-                break
-            ks_repo = self.data.RepoData(name="DD-%d" % dir_num,
-                                         baseurl="file://"+repo,
-                                         enabled=True)
-            self.addRepo(ks_repo)
-            dir_num += 1
-
-        # Add packages
-        if not os.path.exists("/run/install/dd_packages"):
-            return
-        with open("/run/install/dd_packages", "r") as f:
-            for line in f:
-                self._requiredPackages.append(line.strip())
-
     def checkSoftwareSelection(self):
         log.info("checking software selection")
         self.txID = time.time()
@@ -1329,21 +1337,24 @@ reposdir=%s
             log.error("failed to select a kernel from %s", kernels)
 
     def selectRequiredPackages(self):
-        if self._requiredPackages:
-            map(self._selectYumPackage, self._requiredPackages)
+        try:
+            for package in self.requiredPackages:
+                self._selectYumPackage(package, required=True)
 
-        if self._requiredGroups:
-            map(self._selectYumGroup, self._requiredGroups)
+            for group in self.requiredGroups:
+                self._selectYumGroup(group, required=True)
+        except (NoSuchPackage, NoSuchGroup) as e:
+            self._handleMissing(e)
 
     def preInstall(self, packages=None, groups=None):
         """ Perform pre-installation tasks. """
         super(YumPayload, self).preInstall()
         progressQ.send_message(_("Starting package installation process"))
 
-        self._requiredPackages = packages
-        self._requiredGroups = groups
+        self.requiredPackages = packages
+        self.requiredGroups = groups
 
-        self._addDriverRepos()
+        self.addDriverRepos()
 
         if self.install_device:
             self._setupMedia(self.install_device)
@@ -1363,52 +1374,6 @@ reposdir=%s
                 while True:
                     time.sleep(100000)
 
-        # doPreInstall
-        # create mountpoints for protected device mountpoints (?)
-        # write static configs (storage, modprobe.d/anaconda.conf, network, keyboard)
-
-        # nofsync speeds things up at the risk of rpmdb data loss in a crash.
-        # But if we crash mid-install you're boned anyway, so who cares?
-        rpm.addMacro("__dbi_htconfig",
-                     "hash nofsync %{__dbi_other} %{__dbi_perms}")
-
-        if self.data.packages.excludeDocs:
-            rpm.addMacro("_excludedocs", "1")
-
-        if flags.selinux:
-            for d in ["/tmp/updates",
-                      "/etc/selinux/targeted/contexts/files",
-                      "/etc/security/selinux/src/policy",
-                      "/etc/security/selinux"]:
-                f = d + "/file_contexts"
-                if os.access(f, os.R_OK):
-                    rpm.addMacro("__file_context_path", f)
-                    break
-        else:
-            rpm.addMacro("__file_context_path", "%{nil}")
-
-    def _transactionErrors(self, errors):
-        spaceNeeded = {}
-        retval = ""
-
-        # RPM can give us a bunch of potential errors, but we really only
-        # care about a handful.
-        for (descr, (ty, mount, need)) in errors:
-            log.error(descr)
-
-            if ty == rpm.RPMPROB_DISKSPACE:
-                spaceNeeded[mount] = need
-
-        # Now that we've found the ones we are interested in, create an
-        # error string to match.
-        if spaceNeeded:
-            retval += _("You need more space on the following "
-                        "file systems:\n")
-
-            for (mount, need) in spaceNeeded.items():
-                retval += "%s on %s\n" % (Size(need), mount)
-
-        return retval
 
     def install(self):
         """ Install the payload.
@@ -1425,7 +1390,7 @@ reposdir=%s
             "PROGRESS_POST"    : _("Performing post-installation setup tasks")
         }
 
-        ts_file = ROOT_PATH+"/anaconda-yum.yumtx"
+        ts_file = iutil.getSysroot()+"/anaconda-yum.yumtx"
         with _yum_lock:
             # Save the transaction, this will be loaded and executed by the new
             # process.
@@ -1442,17 +1407,20 @@ reposdir=%s
         args = ["--config", "/tmp/anaconda-yum.conf",
                 "--tsfile", ts_file,
                 "--rpmlog", script_log,
-                "--installroot", ROOT_PATH,
+                "--installroot", iutil.getSysroot(),
                 "--release", release,
                 "--arch", blivet.arch.getArch()]
 
+        for macro in self.rpmMacros:
+            args.extend(["--macro", macro[0], macro[1]])
+
         log.info("Running anaconda-yum to install packages")
         # Watch output for progress, debug and error information
         install_errors = []
         try:
             for line in execReadlines("/usr/libexec/anaconda/anaconda-yum", args):
                 if line.startswith("PROGRESS_"):
-                    key, text = line.split(":", 2)
+                    key, text = line.split(":", 1)
                     msg = progress_map[key] + text
                     progressQ.send_message(msg)
                     log.debug(msg)
@@ -1498,7 +1466,8 @@ reposdir=%s
         #        all yumvars and writing out the expanded pairs to the conf
         yb = yum.YumBase()
         yum_conf_path = "/etc/yum.conf"
-        yb.preconf.fn = ROOT_PATH + yum_conf_path
+        # pylint: disable=bad-preconf-access
+        yb.preconf.fn = iutil.getSysroot() + yum_conf_path
         yb.conf.multilib_policy = "all"
 
         # this will appear in yum.conf, which is silly
@@ -1508,7 +1477,7 @@ reposdir=%s
         cachedir = yb.conf.cachedir.replace("/%s/" % yb.arch.basearch,
                                             "/$basearch/")
         yb.conf.cachedir = cachedir
-        yum_conf = ROOT_PATH + yum_conf_path
+        yum_conf = iutil.getSysroot() + yum_conf_path
         if os.path.exists(yum_conf):
             try:
                 os.rename(yum_conf, yum_conf + ".anacbak")
@@ -1535,6 +1504,7 @@ reposdir=%s
         self._removeTxSaveFile()
 
         self.writeMultiLibConfig()
+        self._copyLangpacksConfigToTarget()
 
         super(YumPayload, self).postInstall()
 
diff --git a/anaconda/pyanaconda/product.py b/anaconda/pyanaconda/product.py
index 1bf1c43..bc6b617 100644
--- a/anaconda/pyanaconda/product.py
+++ b/anaconda/pyanaconda/product.py
@@ -52,3 +52,7 @@ if productVersion == "development":
 def distributionText():
     return _("%(productName)s %(productVersion)s INSTALLATION") % \
              {"productName": productName, "productVersion": productVersion}
+
+def translated_new_install_name():
+    return _("New %(name)s %(version)s Installation") % \
+        {"name" : productName, "version" : productVersion}
diff --git a/anaconda/pyanaconda/progress.py b/anaconda/pyanaconda/progress.py
index 6c72d8a..dc7a38c 100644
--- a/anaconda/pyanaconda/progress.py
+++ b/anaconda/pyanaconda/progress.py
@@ -45,7 +45,20 @@ progressQ.addMessage("quit", 1)             # exit_code
 # Afterwards, the progress bar is updated to reflect that the task is done.
 @contextmanager
 def progress_report(message):
+    progress_message(message)
+    yield
+    progress_step(message)
+
+def progress_message(message):
     progressQ.send_message(message)
     log.info(message)
-    yield
+
+def progress_step(message):
     progressQ.send_step()
+    log.info(message)
+
+def progress_init(steps):
+    progressQ.send_init(steps)
+
+def progress_complete():
+    progressQ.send_complete()
diff --git a/anaconda/pyanaconda/regexes.py b/anaconda/pyanaconda/regexes.py
index 5d8fd9b..b4e52a3 100644
--- a/anaconda/pyanaconda/regexes.py
+++ b/anaconda/pyanaconda/regexes.py
@@ -70,8 +70,68 @@ GROUPLIST_SIMPLE_VALID = re.compile(r'^\s*(' + _USERNAME_BASE + r'(\s*,\s*' + _U
 # be validated with GROUPNAME_VALID.
 GROUPLIST_FANCY_PARSE = re.compile(r'^(?:\s*)(?P<name>.*?)\s*(?:\((?P<gid>\d+)\))?(?:\s*)$')
 
-# Proxy parsing
-PROXY_URL_PARSE = re.compile("([A-Za-z]+://)?(([A-Za-z0-9]+)(:[^:@]+)?@)?([^:/]+)(:[0-9]+)?(/.*)?")
-
 # IPv4 address without anchors
 IPV4_PATTERN_WITHOUT_ANCHORS = r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
+
+# IPv6 address without anchors
+# Adapted from the IPv6address ABNF definition in RFC 3986, so it has all those
+# IPv4 compatibility bits too. All groups are non-capturing to make it easy to
+# use in an expression with groups and completely impossible to read
+IPV6_PATTERN_WITHOUT_ANCHORS = r'(?:(?:(?:[0-9a-fA-F]{1,4}:){6})(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:::(?:(?:[0-9a-fA-F]{1,4}:){5})(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:(?:[0-9a-fA-F]{1,4})?::(?:(?:[0-9a-fA-F]{1,4}:){4})(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:(?:(?:[0-9a-fA-F]{1,4}:){,1}(?:[0-9a-fA-F]{1,4}))?::(?:(?:[0-9a-fA-F]{1,4}:){3})(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:(?:(?:[0-9a-fA-F]{1,4}:){,2}(?:[0-9a-fA-F]{1,4}))?::(?:(?:[0-9a-fA-F]{1,4}:){2})(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:(?:(?:[0-9a-fA-F]{1,4}:){,3}(?:[0-9a-fA-F]{1,4}))?::(?:(?:[0-9a-fA-F]{1,4}:){1})(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:(?:(?:[0-9a-fA-F]{1,4}:){,4}(?:[0-9a-fA-F]{1,4}))?::(?:(?:(?:[0-9a-fA-F]{1,4}):(?:[0-9a-fA-F]{1,4}))|(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')))|' + \
+                               r'(?:(?:(?:[0-9a-fA-F]{1,4}:){,5}(?:[0-9a-fA-F]{1,4}))?::(?:[0-9a-fA-F]{1,4}))|' + \
+                               r'(?:(?:(?:[0-9a-fA-F]{1,4}:){,6}(?:[0-9a-fA-F]{1,4}))?::)'
+
+# Hostname validation
+# A hostname consists of sections separated by periods. Each of these sections
+# must be between 1 and 63 characters, contain only alphanumeric characters or
+# hyphens, and may not start or end with a hyphen. The whole string cannot start
+# with a period, but it can end with one.
+# This regex uses negative lookahead and lookback assertions to enforce the
+# hyphen rules and make it way more confusing
+HOSTNAME_PATTERN_WITHOUT_ANCHORS = r'(?:(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.(?!-)[A-Za-z0-9-]{1,63}(?<!-))*\.?)'
+
+# URL Hostname
+# This matches any hostname, IPv4 literal or properly encased IPv6 literal
+# This does not match the "IPvFuture" form because come the hell on
+URL_HOSTNAME_PATTERN_WITHOUT_ANCHORS = r'(?:' + IPV4_PATTERN_WITHOUT_ANCHORS + r')|(?:\[' + IPV6_PATTERN_WITHOUT_ANCHORS + r'])|(?:' + HOSTNAME_PATTERN_WITHOUT_ANCHORS + ')'
+
+# Matches the "scheme" defined by RFC 3986
+URL_SCHEME_PATTERN_WITHOUT_ANCHORS = r'[A-Za-z][A-Za-z0-9+.-]*'
+
+# Matches any unreserved or percent-encoded character
+URL_NORMAL_CHAR = r'[A-Za-z0-9._~-]|(?:%[0-9A-Fa-f]{2})'
+
+# The above but also matches 'sub-delims' and :, @ and /
+URL_PATH_CHAR = URL_NORMAL_CHAR + "|[!$&'()*+,;=:@/]"
+
+# Parse a URL
+# Parses a URL of the form [protocol://][username[:password]@]host[:port][path][?query][#fragment]
+# into the following named groups:
+#   1: protocol (e.g., http://)
+#   2: username
+#   3: password
+#   4: host
+#   5: port
+#   6: path
+#   7: query
+#   8: fragment
+URL_PARSE = re.compile(r'^(?P<protocol>' + URL_SCHEME_PATTERN_WITHOUT_ANCHORS + r'://)?' +
+                       r'(?:(?P<username>(?:' + URL_NORMAL_CHAR + r')*)(?::(?P<password>(?:' + URL_NORMAL_CHAR + r')*))?@)?' +
+                       r'(?P<host>' + URL_HOSTNAME_PATTERN_WITHOUT_ANCHORS + ')' +
+                       r'(?::(?P<port>[0-9]+))?' +
+                       r'(?P<path>/(?:' + URL_PATH_CHAR + r')*)?' +
+                       r'(?:\?(?P<query>(?:' + URL_PATH_CHAR + r'|\?)*))?' +
+                       r'(?:#(?P<fragment>(?:' + URL_PATH_CHAR + r'|\?)*))?$')
+
+
+# Valid characters for repository names
+REPO_NAME_VALID = re.compile(r'^[a-zA-Z0-9_.:-]+$')
+
+# Product Version string, just the starting numbers like 21 or 21.1
+VERSION_DIGITS = r'([\d.]+)'
diff --git a/anaconda/pyanaconda/rescue.py b/anaconda/pyanaconda/rescue.py
index b578bc1..63bc0c1 100644
--- a/anaconda/pyanaconda/rescue.py
+++ b/anaconda/pyanaconda/rescue.py
@@ -29,7 +29,7 @@ import subprocess
 
 from snack import ButtonChoiceWindow, ListboxChoiceWindow,SnackScreen
 
-from pyanaconda.constants import ANACONDA_CLEANUP, ROOT_PATH
+from pyanaconda.constants import ANACONDA_CLEANUP
 from pyanaconda.constants_text import TEXT_OK_BUTTON, TEXT_NO_BUTTON, TEXT_YES_BUTTON
 from pyanaconda.text import WaitWindow, OkCancelWindow, ProgressWindow, PassphraseEntryWindow
 from pyanaconda.flags import flags
@@ -38,7 +38,7 @@ from pyanaconda.i18n import _
 from pyanaconda.kickstart import runPostScripts
 
 from blivet import mountExistingSystem
-from blivet.errors import StorageError
+from blivet.errors import StorageError, DirtyFSError
 from blivet.devices import LUKSDevice
 
 from pykickstart.constants import KS_REBOOT, KS_SHUTDOWN
@@ -177,7 +177,7 @@ def runShell(screen = None, msg=""):
 
     print
     if msg:
-        print (msg)
+        print(msg)
 
     if flags.imageInstall:
         print(_("Run %s to unmount the system when you are finished.")
@@ -295,7 +295,7 @@ def doRescue(intf, rescue_mount, ksdata):
                   "\n\n"
                   "If for some reason this process fails you can choose 'Skip' "
                   "and this step will be skipped and you will go directly to a "
-                  "command shell.\n\n") % (ROOT_PATH,),
+                  "command shell.\n\n") % (iutil.getSysroot(),),
                   [_("Continue"), _("Read-Only"), _("Skip")] )
 
             if rc == _("Skip").lower():
@@ -343,11 +343,6 @@ def doRescue(intf, rescue_mount, ksdata):
 
     if root:
         try:
-            # TODO: add a callback to warn about dirty filesystems
-            mountExistingSystem(sto.fsset, root.device,
-                                allowDirty = True,
-                                readOnly = readOnly)
-
             if not flags.imageInstall:
                 msg = _("The system will reboot automatically when you exit "
                         "from the shell.")
@@ -355,7 +350,11 @@ def doRescue(intf, rescue_mount, ksdata):
                 msg = _("Run %s to unmount the system "
                         "when you are finished.") % ANACONDA_CLEANUP
 
-            if rc == -1:
+            try:
+                mountExistingSystem(sto.fsset, root.device,
+                                    allowDirty = True,
+                                    readOnly = readOnly)
+            except DirtyFSError:
                 if flags.automatedInstall:
                     log.error("System had dirty file systems which you chose not to mount")
                 else:
@@ -367,14 +366,14 @@ def doRescue(intf, rescue_mount, ksdata):
                 rootmounted = False
             else:
                 if flags.automatedInstall:
-                    log.info("System has been mounted under: %s", ROOT_PATH)
+                    log.info("System has been mounted under: %s", iutil.getSysroot())
                 else:
                     ButtonChoiceWindow(intf.screen, _("Rescue"),
                        _("Your system has been mounted under %(rootPath)s.\n\n"
                          "Press <return> to get a shell. If you would like to "
                          "make your system the root environment, run the command:\n\n"
                          "\tchroot %(rootPath)s\n\n%(msg)s") %
-                                       {'rootPath': ROOT_PATH,
+                                       {'rootPath': iutil.getSysroot(),
                                         'msg': msg},
                                        [_("OK")] )
                 rootmounted = True
@@ -391,7 +390,7 @@ def doRescue(intf, rescue_mount, ksdata):
                     # we have to catch the possible exception
                     # because we support read-only mounting
                     try:
-                        fd = open("%s/.autorelabel" % ROOT_PATH, "w+")
+                        fd = open("%s/.autorelabel" % iutil.getSysroot(), "w+")
                         fd.close()
                     except IOError:
                         log.warning("cannot touch /.autorelabel")
@@ -443,7 +442,7 @@ def doRescue(intf, rescue_mount, ksdata):
                 ButtonChoiceWindow(intf.screen, _("Rescue"),
                     _("An error occurred trying to mount some or all of your "
                       "system. Some of it may be mounted under %s.\n\n"
-                      "Press <return> to get a shell.") % ROOT_PATH + msg,
+                      "Press <return> to get a shell.") % iutil.getSysroot() + msg,
                       [_("OK")] )
     else:
         if flags.automatedInstall and ksdata.reboot.action in [KS_REBOOT, KS_SHUTDOWN]:
@@ -467,10 +466,10 @@ def doRescue(intf, rescue_mount, ksdata):
     if rootmounted and not readOnly:
         sto.makeMtab()
         try:
-            makeResolvConf(ROOT_PATH)
+            makeResolvConf(iutil.getSysroot())
         except (OSError, IOError) as e:
             log.error("error making a resolv.conf: %s", e)
-        msgStr = _("Your system is mounted under the %s directory.") % (ROOT_PATH,)
+        msgStr = _("Your system is mounted under the %s directory.") % (iutil.getSysroot(),)
         ButtonChoiceWindow(intf.screen, _("Rescue"), msgStr, [_("OK")] )
 
     # we do not need ncurses anymore, shut them down
diff --git a/anaconda/pyanaconda/safe_dbus.py b/anaconda/pyanaconda/safe_dbus.py
index cf04c81..10c0866 100644
--- a/anaconda/pyanaconda/safe_dbus.py
+++ b/anaconda/pyanaconda/safe_dbus.py
@@ -20,12 +20,11 @@
 
 """Module providing thread-safe and mainloop-safe DBus operations."""
 
+import os
 from gi.repository import GLib, Gio
 from pyanaconda.constants import DEFAULT_DBUS_TIMEOUT
 
 DBUS_PROPS_IFACE = "org.freedesktop.DBus.Properties"
-DBUS_SYSTEM_BUS_ADDR = Gio.dbus_address_get_for_bus_sync(Gio.BusType.SYSTEM,
-                                                         None)
 
 class SafeDBusError(Exception):
     """Class for exceptions defined in this module."""
@@ -42,8 +41,58 @@ class DBusPropertyError(DBusCallError):
 
     pass
 
-def dbus_call_safe_sync(service, obj_path, iface, method, args,
-                        connection=None):
+def get_new_system_connection():
+    """Return a new connection to the system bus."""
+
+    return Gio.DBusConnection.new_for_address_sync(
+        Gio.dbus_address_get_for_bus_sync(Gio.BusType.SYSTEM, None),
+        Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT|
+        Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION,
+        None, None)
+
+def get_new_session_connection():
+    """
+    Get a connection handle for the per-user-login-session message bus.
+
+    !!! RUN THIS EARLY !!! like, before any other threads start. Connections to
+    the session bus must be made with the effective UID of the login user,
+    which in live installs is not the UID of anaconda. This means we need to
+    call seteuid in this method, and doing that after threads have started will
+    probably do something weird.
+
+    Live installs use consolehelper to run as root, which sets the original
+    UID in $USERHELPER_UID.
+
+    :return: the session connection handle
+    :rtype: Gio.DBusConnection
+    :raise DBusCallError: if some DBus related error appears
+    :raise OSError: if unable to set the effective UID
+    """
+
+    old_euid = None
+    if "USERHELPER_UID" in os.environ:
+        old_euid = os.geteuid()
+        os.seteuid(int(os.environ["USERHELPER_UID"]))
+
+    try:
+        connection = Gio.DBusConnection.new_for_address_sync(
+            Gio.dbus_address_get_for_bus_sync(Gio.BusType.SESSION, None),
+            Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT|
+            Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION,
+            None, None)
+    except GLib.GError as gerr:
+        raise DBusCallError("Unable to connect to session bus: %s", gerr)
+    finally:
+        if old_euid is not None:
+            os.seteuid(old_euid)
+
+    if connection.is_closed():
+        raise DBusCallError("Connection is closed")
+
+    return connection
+
+def call_sync(service, obj_path, iface, method, args,
+                   connection=None):
     """
     Safely call a given method on a given object of a given service over DBus
     passing given arguments. If a connection is given, it is used, otherwise a
@@ -70,11 +119,10 @@ def dbus_call_safe_sync(service, obj_path, iface, method, args,
     """
 
     if not connection:
-        connection = Gio.DBusConnection.new_for_address_sync(
-                       DBUS_SYSTEM_BUS_ADDR,
-                       Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT|
-                       Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION,
-                       None, None)
+        try:
+            connection = get_new_system_connection()
+        except GLib.GError as gerr:
+            raise DBusCallError("Unable to connect to system bus: %s", gerr)
 
     if connection.is_closed():
         raise DBusCallError("Connection is closed")
@@ -88,10 +136,15 @@ def dbus_call_safe_sync(service, obj_path, iface, method, args,
                        (method, obj_path, args, gerr.message)
         raise DBusCallError(msg)
 
+    if ret is None:
+        msg = "No return from %s method on %s with %s arguments" % \
+                       (method, obj_path, args)
+        raise DBusCallError(msg)
+
     return ret.unpack()
 
-def dbus_get_property_safe_sync(service, obj_path, iface, prop_name,
-                                connection=None):
+def get_property_sync(service, obj_path, iface, prop_name,
+                      connection=None):
     """
     Get value of a given property of a given object provided by a given service.
 
@@ -116,8 +169,8 @@ def dbus_get_property_safe_sync(service, obj_path, iface, prop_name,
     """
 
     args = GLib.Variant('(ss)', (iface, prop_name))
-    ret = dbus_call_safe_sync(service, obj_path, DBUS_PROPS_IFACE, "Get", args,
-                              connection)
+    ret = call_sync(service, obj_path, DBUS_PROPS_IFACE, "Get", args,
+                    connection)
     if ret is None:
         msg = "No value for the %s object's property %s" % (obj_path, prop_name)
         raise DBusPropertyError(msg)
diff --git a/anaconda/pyanaconda/screensaver.py b/anaconda/pyanaconda/screensaver.py
new file mode 100644
index 0000000..f95a98f
--- /dev/null
+++ b/anaconda/pyanaconda/screensaver.py
@@ -0,0 +1,73 @@
+#
+# screensaver.py - Screensaver management methods and data
+#
+# Copyright (C) 2014 Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author(s): David Shea <dshea@redhat.com>
+#
+
+from pyanaconda import safe_dbus
+from gi.repository import GLib
+
+import logging
+log = logging.getLogger("anaconda")
+
+SCREENSAVER_SERVICE = "org.freedesktop.ScreenSaver"
+SCREENSAVER_PATH    = "/org/freedesktop/ScreenSaver"
+SCREENSAVER_IFACE   = "org.freedesktop.ScreenSaver"
+
+SCREENSAVER_INHIBIT_METHOD   = "Inhibit"
+SCREENSAVER_UNINHIBIT_METHOD = "UnInhibit"
+
+SCREENSAVER_APPLICATION = "anaconda"
+SCREENSAVER_REASON      = "Installing"
+
+def inhibit_screensaver(connection):
+    """
+    Inhibit the screensaver idle timer.
+
+    :param connection: A handle for the session message bus
+    :type connection: Gio.DBusConnection
+    :return: The inhibit ID or None
+    :rtype: int or None
+    """
+
+    try:
+        inhibit_id = safe_dbus.call_sync(SCREENSAVER_SERVICE, SCREENSAVER_PATH, SCREENSAVER_IFACE,
+                SCREENSAVER_INHIBIT_METHOD, GLib.Variant('(ss)',
+                    (SCREENSAVER_APPLICATION, SCREENSAVER_REASON)),
+                connection)
+        return inhibit_id[0]
+    except safe_dbus.DBusCallError as e:
+        log.info("Unable to inhibit the screensaver: %s", e)
+
+    return None
+
+def uninhibit_screensaver(connection, inhibit_id):
+    """
+    Re-enable the screensaver idle timer.
+
+    :param connection: A handle for the session message bus
+    :type connection: Gio.DBusConnection
+    :param inhibit_id: The ID returned by the inhibit method
+    :type inhibit_id: int
+    """
+
+    try:
+        safe_dbus.call_sync(SCREENSAVER_SERVICE, SCREENSAVER_PATH, SCREENSAVER_IFACE,
+                SCREENSAVER_UNINHIBIT_METHOD, GLib.Variant('(u)', (inhibit_id,)), connection)
+    except safe_dbus.DBusCallError as e:
+        log.info("Unable to uninhibit the screensaver: %s", e)
diff --git a/anaconda/pyanaconda/simpleconfig.py b/anaconda/pyanaconda/simpleconfig.py
index 3d017b6..47b7a95 100644
--- a/anaconda/pyanaconda/simpleconfig.py
+++ b/anaconda/pyanaconda/simpleconfig.py
@@ -1,26 +1,33 @@
 #
 # simpleconifg.py - representation of a simple configuration file (sh-like)
 #
-# Matt Wilson <msw@redhat.com>
-# Jeremy Katz <katzj@redhat.com>
-# Will Woods <wwoods@redhat.com>
-# Brian C. Lane <bcl@redhat.com>
+# Copyright (C) 1999-2014 Red Hat, Inc.
 #
-# Copyright 1999-2012 Red Hat, Inc.
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
 #
-# This software may be freely redistributed under the terms of the GNU
-# library public license.
-#
-# You should have received a copy of the GNU Library Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Author(s): Matt Wilson <msw@redhat.com>
+#            Jeremy Katz <katzj@redhat.com>
+#            Will Woods <wwoods@redhat.com>
+#            Brian C. Lane <bcl@redhat.com>
 #
 import os
 import shutil
 import shlex
 from pipes import _safechars
 import tempfile
-from pyanaconda.iutil import upperASCII
+from pyanaconda.iutil import upperASCII, eintr_retry_call
 
 def unquote(s):
     return ' '.join(shlex.split(s))
@@ -36,6 +43,30 @@ def quote(s, always=False):
             return s
     return '"'+s.replace('"', '\\"')+'"'
 
+def find_comment(s):
+    """ Look for a # comment outside of a quoted string.
+        If there are no quotes, find the last # in the string.
+
+        :param str s: string to check for comment and quotes
+        :returns: index of comment or None
+        :rtype: int or None
+
+        Handles comments inside quotes and quotes inside quotes.
+    """
+    q = None
+    for i in range(len(s)):
+        if not q and s[i] == '#':
+            return i
+
+        # Ignore quotes inside other quotes
+        if s[i] in "'\"":
+            if s[i] == q:
+                q = None
+            elif q is None:
+                q = s[i]
+    return None
+
+
 class SimpleConfigFile(object):
     """ Edit values in a configuration file without changing comments.
         Supports KEY=VALUE lines and ignores everything else.
@@ -66,7 +97,7 @@ class SimpleConfigFile(object):
         with open(filename) as f:
             for line in f:
                 self._lines.append(line)
-                key, value = self._parseline(line)
+                key, value, _comment = self._parseline(line)
                 if key:
                     self.info[key] = value
 
@@ -90,7 +121,7 @@ class SimpleConfigFile(object):
             else:
                 m = int('0100644', 8)
             shutil.move(tmpf.name, filename)
-            os.chmod(filename, m)
+            eintr_retry_call(os.chmod, filename, m)
         else:
             # write directly to the file
             with open(filename, "w") as fobj:
@@ -109,27 +140,40 @@ class SimpleConfigFile(object):
         return self.info.get(upperASCII(key), "")
 
     def _parseline(self, line):
-        """ parse a line into a key, value pair
+        """ parse a line into a key, value and comment
+
+            :param str line: Line to be parsed
+            :returns: Tuple of key, value, comment
+            :rtype: tuple
+
             Handle comments and optionally unquote quoted strings
-            Returns (key, value) or (None, None)
-            key is always UPPERCASE
+            Returns (key, value, comment) or (None, None, comment)
+            key is always UPPERCASE and comment may by "" if none was found.
         """
         s = line.strip()
-        if '#' in s:
-            s = s[:s.find('#')] # remove from comment to EOL
-            s = s.strip()       # and any unnecessary whitespace
+        # Look for a # outside any quotes
+        comment = ""
+        comment_index = find_comment(s)
+        if comment_index is not None:
+            comment = s[comment_index:]
+            s = s[:comment_index]   # remove from comment to EOL
+
         key, eq, val = s.partition('=')
+        key = key.strip()
+        val = val.strip()
         if self.read_unquote:
             val = unquote(val)
         if key != '' and eq == '=':
-            return (upperASCII(key), val)
+            return (upperASCII(key), val, comment)
         else:
-            return (None, None)
+            return (None, None, comment)
 
     def _kvpair(self, key, comment=""):
         value = self.info[key]
         if self.write_quote or self.always_quote:
             value = quote(value, self.always_quote)
+        if comment:
+            comment = " " + comment
         return key + '=' + value + comment + "\n"
 
     def __str__(self):
@@ -139,17 +183,13 @@ class SimpleConfigFile(object):
         oldkeys = []
         s = ""
         for line in self._lines:
-            key = self._parseline(line)[0]
+            key, _value, comment = self._parseline(line)
             if key is None:
                 s += line
             else:
                 if key not in self.info:
                     continue
                 oldkeys.append(key)
-                if "#" in line:
-                    comment = " " + line[line.find("#"):]
-                else:
-                    comment = ""
                 s += self._kvpair(key, comment)
 
         # Add new keys
@@ -158,5 +198,3 @@ class SimpleConfigFile(object):
                 s += self._kvpair(key)
 
         return s
-
-
diff --git a/anaconda/pyanaconda/sitecustomize.py b/anaconda/pyanaconda/sitecustomize.py
index f2bcd10..a5e1a29 100644
--- a/anaconda/pyanaconda/sitecustomize.py
+++ b/anaconda/pyanaconda/sitecustomize.py
@@ -19,5 +19,5 @@
 #
 
 import sys
-# pylint: disable-msg=E1101
+# pylint: disable=no-member
 sys.setdefaultencoding('utf-8')
diff --git a/anaconda/pyanaconda/startup_utils.py b/anaconda/pyanaconda/startup_utils.py
new file mode 100644
index 0000000..30d5974
--- /dev/null
+++ b/anaconda/pyanaconda/startup_utils.py
@@ -0,0 +1,80 @@
+#
+# startup.py - code used during early startup with minimal dependencies
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Martin Kolman <mkolman@redhat.com>
+#
+import imp
+
+
+def module_exists(module_path):
+    """Report is a given module exists in the current module import pth or not.
+    Supports checking bot modules ("foo") os submodules ("foo.bar.baz")
+
+    :param str module_path: (sub)module identifier
+
+    :returns: True if (sub)module exists in path, False if not
+    :rtype: bool
+    """
+
+    module_path_components = module_path.split(".")
+    module_name = module_path_components.pop()
+    parent_module_path = None
+    if module_path_components:
+        # the path specifies a submodule ("bar.foo")
+        # we need to chain-import all the modules in the submodule path before
+        # we can check if the submodule itself exists
+        for name in module_path_components:
+            module_info = imp.find_module(name, parent_module_path)
+            module = imp.load_module(name, *module_info)
+            if module:
+                parent_module_path = module.__path__
+            else:
+                # one of the parents was not found, abort search
+                return False
+    # if we got this far we should have either some path or the module is
+    # not a submodule and the default set of paths will be used (path=None)
+    try:
+        # if the module is not found imp raises an ImportError
+        imp.find_module(module_name, parent_module_path)
+        return True
+    except ImportError:
+        return False
+
+
+def get_anaconda_version_string():
+    """Return a string describing current Anaconda version.
+    If the current version can't be determined the string
+    "unknown" will be returned.
+
+    :returns: string describing Anaconda version
+    :rtype: str
+    """
+
+    # we are importing the version module directly so that we don't drag in any
+    # non-necessary stuff; we also need to handle the possibility of the
+    # import itself failing
+    if module_exists("pyanaconda.version"):
+        # Ignore pylint not finding the version module, since thanks to automake
+        # there's a good chance that version.py is not in the same directory as
+        # the rest of pyanaconda.
+        from pyanaconda import version # pylint: disable=no-name-in-module
+        return version.__version__
+    else:
+        return "unknown"
+
diff --git a/anaconda/pyanaconda/storage_utils.py b/anaconda/pyanaconda/storage_utils.py
new file mode 100644
index 0000000..410dfea
--- /dev/null
+++ b/anaconda/pyanaconda/storage_utils.py
@@ -0,0 +1,337 @@
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+"""UI-independent storage utility functions"""
+
+import re
+import locale
+
+from contextlib import contextmanager
+
+from blivet import arch
+from blivet import util
+from blivet.size import Size
+from blivet.platform import platform as _platform
+from blivet.devicefactory import DEVICE_TYPE_LVM
+from blivet.devicefactory import DEVICE_TYPE_LVM_THINP
+from blivet.devicefactory import DEVICE_TYPE_BTRFS
+from blivet.devicefactory import DEVICE_TYPE_MD
+from blivet.devicefactory import DEVICE_TYPE_PARTITION
+from blivet.devicefactory import DEVICE_TYPE_DISK
+
+from pyanaconda.i18n import _, N_
+from pyanaconda import isys
+from pyanaconda.constants import productName
+
+from pykickstart.constants import AUTOPART_TYPE_PLAIN, AUTOPART_TYPE_BTRFS
+from pykickstart.constants import AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP
+
+import logging
+log = logging.getLogger("anaconda")
+
+# TODO: all those constants and mappings should go to blivet
+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_DISK = N_("Disk")
+
+DEVICE_TEXT_MAP = {DEVICE_TYPE_LVM: DEVICE_TEXT_LVM,
+                   DEVICE_TYPE_MD: DEVICE_TEXT_MD,
+                   DEVICE_TYPE_PARTITION: DEVICE_TEXT_PARTITION,
+                   DEVICE_TYPE_BTRFS: DEVICE_TEXT_BTRFS,
+                   DEVICE_TYPE_LVM_THINP: DEVICE_TEXT_LVM_THINP,
+                   DEVICE_TYPE_DISK: DEVICE_TEXT_DISK}
+
+PARTITION_ONLY_FORMAT_TYPES = ("macefi", "prepboot", "biosboot", "appleboot")
+
+MOUNTPOINT_DESCRIPTIONS = {"Swap": N_("The 'swap' area on your computer is used by the operating\n"
+                                      "system when running low on memory."),
+                           "Boot": N_("The 'boot' area on your computer is where files needed\n"
+                                      "to start the operating system are stored."),
+                           "Root": N_("The 'root' area on your computer is where core system\n"
+                                      "files and applications are stored."),
+                           "Home": N_("The 'home' area on your computer is where all your personal\n"
+                                      "data is stored."),
+                           "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.")
+                            }
+
+AUTOPART_CHOICES = ((N_("Standard Partition"), AUTOPART_TYPE_PLAIN),
+                    (N_("BTRFS"), AUTOPART_TYPE_BTRFS),
+                    (N_("LVM"), AUTOPART_TYPE_LVM),
+                    (N_("LVM Thin Provisioning"), AUTOPART_TYPE_LVM_THINP))
+
+AUTOPART_DEVICE_TYPES = {AUTOPART_TYPE_LVM: DEVICE_TYPE_LVM,
+                         AUTOPART_TYPE_LVM_THINP: DEVICE_TYPE_LVM_THINP,
+                         AUTOPART_TYPE_PLAIN: DEVICE_TYPE_PARTITION,
+                         AUTOPART_TYPE_BTRFS: DEVICE_TYPE_BTRFS}
+
+NAMED_DEVICE_TYPES = (DEVICE_TYPE_BTRFS, DEVICE_TYPE_LVM, DEVICE_TYPE_MD, DEVICE_TYPE_LVM_THINP)
+CONTAINER_DEVICE_TYPES = (DEVICE_TYPE_LVM, DEVICE_TYPE_BTRFS, DEVICE_TYPE_LVM_THINP)
+
+def size_from_input(input_str):
+    """Get size from user's input"""
+
+    if not input_str:
+        # Nothing to parse
+        return None
+
+    # if no unit was specified, default to MiB. Assume that a string
+    # ending with anything other than a digit has a unit suffix
+    if re.search(r'[\d.%s]$' % locale.nl_langinfo(locale.RADIXCHAR), input_str):
+        input_str += "MiB"
+
+    try:
+        size = Size(input_str)
+    except ValueError:
+        return None
+    else:
+        # Minimium size for ui-created partitions is 1MiB.
+        if size.convertTo(spec="MiB") < 1:
+            size = Size("1 MiB")
+
+    return size
+
+def device_type_from_autopart(autopart_type):
+    """Get device type matching the given autopart type."""
+
+    return AUTOPART_DEVICE_TYPES.get(autopart_type, None)
+
+class UIStorageFilter(logging.Filter):
+    """Logging filter for UI storage events"""
+
+    def filter(self, record):
+        record.name = "storage.ui"
+        return True
+
+@contextmanager
+def ui_storage_logger():
+    """Context manager that applies the UIStorageFilter for its block"""
+
+    storage_log = logging.getLogger("blivet")
+    storage_filter = UIStorageFilter()
+    storage_log.addFilter(storage_filter)
+    yield
+    storage_log.removeFilter(storage_filter)
+
+class SanityException(Exception):
+    pass
+
+class SanityError(SanityException):
+    pass
+
+class SanityWarning(SanityException):
+    pass
+
+class LUKSDeviceWithoutKeyError(SanityError):
+    pass
+
+def sanity_check(storage, min_ram=isys.MIN_RAM):
+    """
+    Run a series of tests to verify the storage configuration.
+
+    This function is called at the end of partitioning so that
+    we can make sure you don't have anything silly (like no /,
+    a really small /, etc).
+
+    :param storage: an instance of the :class:`blivet.Blivet` class to check
+    :param min_ram: minimum RAM (in MiB) needed for the installation with swap
+                    space available
+    :rtype: a list of SanityExceptions
+    :return: a list of accumulated errors and warnings
+
+    """
+
+    exns = []
+
+    checkSizes = [('/usr', Size("250 MiB")), ('/tmp', Size("50 MiB")), ('/var', Size("384 MiB")),
+                  ('/home', Size("100 MiB")), ('/boot', Size("200 MiB"))]
+    mustbeonlinuxfs = ['/', '/var', '/tmp', '/usr', '/home', '/usr/share', '/usr/lib']
+    mustbeonroot = ['/bin','/dev','/sbin','/etc','/lib','/root', '/mnt', 'lost+found', '/proc']
+
+    filesystems = storage.mountpoints
+    root = storage.fsset.rootDevice
+    swaps = storage.fsset.swapDevices
+
+    if root:
+        if root.size < Size("250 MiB"):
+            exns.append(
+               SanityWarning(_("Your root partition is less than 250 "
+                              "megabytes which is usually too small to "
+                              "install %s.") % (productName,)))
+    else:
+        exns.append(
+           SanityError(_("You have not defined a root partition (/), "
+                        "which is required for installation of %s "
+                        "to continue.") % (productName,)))
+
+    # Prevent users from installing on s390x with (a) no /boot volume, (b) the
+    # root volume on LVM, and (c) the root volume not restricted to a single
+    # PV
+    # NOTE: There is not really a way for users to create a / volume
+    # restricted to a single PV.  The backend support is there, but there are
+    # no UI hook-ups to drive that functionality, but I do not personally
+    # care.  --dcantrell
+    if arch.isS390() and '/boot' not in storage.mountpoints and root:
+        if root.type == 'lvmlv' and not root.singlePV:
+            exns.append(
+               SanityError(_("This platform requires /boot on a dedicated "
+                            "partition or logical volume.  If you do not "
+                            "want a /boot volume, you must place / on a "
+                            "dedicated non-LVM partition.")))
+
+    # FIXME: put a check here for enough space on the filesystems. maybe?
+
+    for (mount, size) in checkSizes:
+        if mount in filesystems and filesystems[mount].size < size:
+            exns.append(
+               SanityWarning(_("Your %(mount)s partition is less than "
+                              "%(size)s which is lower than recommended "
+                              "for a normal %(productName)s install.")
+                            % {'mount': mount, 'size': size,
+                               'productName': productName}))
+
+    for (mount, device) in filesystems.items():
+        problem = filesystems[mount].checkSize()
+        if problem < 0:
+            exns.append(
+               SanityError(_("Your %(mount)s partition is too small for %(format)s formatting "
+                            "(allowable size is %(minSize)s to %(maxSize)s)")
+                          % {"mount": mount, "format": device.format.name,
+                             "minSize": device.minSize, "maxSize": device.maxSize}))
+        elif problem > 0:
+            exns.append(
+               SanityError(_("Your %(mount)s partition is too large for %(format)s formatting "
+                            "(allowable size is %(minSize)s to %(maxSize)s)")
+                          % {"mount":mount, "format": device.format.name,
+                             "minSize": device.minSize, "maxSize": device.maxSize}))
+
+    if storage.bootloader and not storage.bootloader.skip_bootloader:
+        stage1 = storage.bootloader.stage1_device
+        if not stage1:
+            exns.append(
+               SanityError(_("No valid bootloader target device found. "
+                            "See below for details.")))
+            pe = _platform.stage1MissingError
+            if pe:
+                exns.append(SanityError(_(pe)))
+        else:
+            storage.bootloader.is_valid_stage1_device(stage1)
+            exns.extend(SanityError(msg) for msg in storage.bootloader.errors)
+            exns.extend(SanityWarning(msg) for msg in storage.bootloader.warnings)
+
+        stage2 = storage.bootloader.stage2_device
+        if stage1 and not stage2:
+            exns.append(SanityError(_("You have not created a bootable partition.")))
+        else:
+            storage.bootloader.is_valid_stage2_device(stage2)
+            exns.extend(SanityError(msg) for msg in storage.bootloader.errors)
+            exns.extend(SanityWarning(msg) for msg in storage.bootloader.warnings)
+            if not storage.bootloader.check():
+                exns.extend(SanityError(msg) for msg in storage.bootloader.errors)
+
+        #
+        # check that GPT boot disk on BIOS system has a BIOS boot partition
+        #
+        if _platform.weight(fstype="biosboot") and \
+           stage1 and stage1.isDisk and \
+           getattr(stage1.format, "labelType", None) == "gpt":
+            missing = True
+            for part in [p for p in storage.partitions if p.disk == stage1]:
+                if part.format.type == "biosboot":
+                    missing = False
+                    break
+
+            if missing:
+                exns.append(
+                   SanityError(_("Your BIOS-based system needs a special "
+                                "partition to boot from a GPT disk label. "
+                                "To continue, please create a 1MiB "
+                                "'biosboot' type partition.")))
+
+    if not swaps:
+        installed = util.total_memory()
+        required = Size("%s MiB" % (min_ram + isys.NO_SWAP_EXTRA_RAM))
+
+        if installed < required:
+            exns.append(
+               SanityError(_("You have not specified a swap partition.  "
+                            "%(requiredMem)s of memory is required to continue installation "
+                            "without a swap partition, but you only have %(installedMem)s.")
+                          % {"requiredMem": required,
+                             "installedMem": installed}))
+        else:
+            exns.append(
+               SanityWarning(_("You have not specified a swap partition.  "
+                              "Although not strictly required in all cases, "
+                              "it will significantly improve performance "
+                              "for most installations.")))
+    no_uuid = [s for s in swaps if s.format.exists and not s.format.uuid]
+    if no_uuid:
+        exns.append(
+           SanityWarning(_("At least one of your swap devices does not have "
+                          "a UUID, which is common in swap space created "
+                          "using older versions of mkswap. These devices "
+                          "will be referred to by device path in "
+                          "/etc/fstab, which is not ideal since device "
+                          "paths can change under a variety of "
+                          "circumstances. ")))
+
+    for (mountpoint, dev) in filesystems.items():
+        if mountpoint in mustbeonroot:
+            exns.append(
+               SanityError(_("This mount point is invalid.  The %s directory must "
+                            "be on the / file system.") % mountpoint))
+
+        if mountpoint in mustbeonlinuxfs and (not dev.format.mountable or not dev.format.linuxNative):
+            exns.append(
+               SanityError(_("The mount point %s must be on a linux file system.") % mountpoint))
+
+    if storage.rootDevice and storage.rootDevice.format.exists:
+        e = storage.mustFormat(storage.rootDevice)
+        if e:
+            exns.append(SanityError(e))
+
+    exns += verify_LUKS_devices_have_key(storage)
+
+    return exns
+
+
+def verify_LUKS_devices_have_key(storage):
+    """
+    Verify that all non-existant LUKS devices have some way of obtaining
+    a key.
+
+    Note: LUKS device creation will fail without a key.
+
+    :rtype: generator of str
+    :returns: a generator of error messages, may yield no error messages
+
+    """
+
+    for dev in (d for d in storage.devices if \
+       d.format.type == "luks" and \
+       not d.format.exists and \
+       not d.format.hasKey):
+        yield LUKSDeviceWithoutKeyError(_("LUKS device %s has no encryption key") % (dev.name,))
diff --git a/anaconda/pyanaconda/threads.py b/anaconda/pyanaconda/threads.py
index bf2b2f8..eea1da6 100644
--- a/anaconda/pyanaconda/threads.py
+++ b/anaconda/pyanaconda/threads.py
@@ -24,6 +24,8 @@ log = logging.getLogger("anaconda")
 
 import threading
 
+_WORKER_THREAD_PREFIX = "AnaWorkerThread"
+
 class ThreadManager(object):
     """A singleton class for managing threads and processes.
 
@@ -57,9 +59,10 @@ class ThreadManager(object):
                 raise KeyError("Cannot add thread '%s', a thread with the same name already running" % obj.name)
 
             self._objs[obj.name] = obj
-            self._errors[obj.name] = None
             obj.start()
 
+        return obj.name
+
     def remove(self, name):
         """Removes a thread from the list of known objects.  This should only
            be called when a thread exits, or there will be no way to get a
@@ -117,6 +120,12 @@ class ThreadManager(object):
             log.debug("Waiting for thread %s to exit", name)
             self.wait(name)
 
+        if self.any_errors:
+            thread_names = ", ".join(thread_name for thread_name in self._errors.iterkeys()
+                                     if self._errors[thread_name])
+            msg = "Unhandled errors from the following threads detected: %s" % thread_names
+            raise RuntimeError(msg)
+
     def set_error(self, name, *exc_info):
         """Set the error data for a thread
 
@@ -129,6 +138,7 @@ class ThreadManager(object):
         """
         return self._errors.get(name)
 
+    @property
     def any_errors(self):
         """Return True of there have been any errors in any threads
         """
@@ -136,10 +146,15 @@ class ThreadManager(object):
 
     def raise_if_error(self, name):
         """If a thread has failed due to an exception, raise it into the main
-           thread.
+           thread and remove it from errors.
         """
-        if self._errors.get(name):
-            raise self._errors[name][0], self._errors[name][1], self._errors[name][2]
+        if name not in self._errors:
+            # no errors found for the thread
+            return
+
+        exc_info = self._errors.pop(name)
+        if exc_info:
+            raise exc_info[0], exc_info[1], exc_info[2]
 
     def in_main_thread(self):
         """Return True if it is run in the main thread."""
@@ -179,7 +194,27 @@ class AnacondaThread(threading.Thread):
        (3) All created threads are made daemonic, which means anaconda will quit
            when the main process is killed.
     """
+
+    # class-wide dictionary ensuring unique thread names
+    _prefix_thread_counts = dict()
+
     def __init__(self, *args, **kwargs):
+        # if neither name nor prefix is given, use the worker prefix
+        if "name" not in kwargs and "prefix" not in kwargs:
+            kwargs["prefix"] = _WORKER_THREAD_PREFIX
+
+        # if prefix is specified, use it to construct new thread name
+        prefix = kwargs.pop("prefix", None)
+        if prefix:
+            thread_num = self._prefix_thread_counts.get(prefix, 0) + 1
+            self._prefix_thread_counts[prefix] = thread_num
+            kwargs["name"] = prefix + str(thread_num)
+
+        if "fatal" in kwargs:
+            self._fatal = kwargs.pop("fatal")
+        else:
+            self._fatal = True
+
         threading.Thread.__init__(self, *args, **kwargs)
         self.daemon = True
 
@@ -190,10 +225,11 @@ class AnacondaThread(threading.Thread):
         log.info("Running Thread: %s (%s)", self.name, self.ident)
         try:
             threading.Thread.run(self, *args, **kwargs)
-        # pylint: disable-msg=W0702
+        # pylint: disable=bare-except
         except:
             threadMgr.set_error(self.name, *sys.exc_info())
-            sys.excepthook(*sys.exc_info())
+            if self._fatal:
+                sys.excepthook(*sys.exc_info())
         finally:
             threadMgr.remove(self.name)
             log.info("Thread Done: %s (%s)", self.name, self.ident)
diff --git a/anaconda/pyanaconda/timezone.py b/anaconda/pyanaconda/timezone.py
index 56cd644..9cc2c53 100644
--- a/anaconda/pyanaconda/timezone.py
+++ b/anaconda/pyanaconda/timezone.py
@@ -67,7 +67,7 @@ def time_initialize(timezone, storage, bootloader):
     """
 
     if arch.isS390():
-        # nothing to do on s390 where hwclock doesn't exist
+        # nothing to do on s390(x) were hwclock doesn't exist
         return
 
     if not timezone.isUtc and not flags.automatedInstall:
@@ -118,6 +118,10 @@ def write_timezone_config(timezone, root):
             log.error("Error when symlinking timezone (from %s): %s",
                       rooted_tz_file, oserr.strerror)
 
+    if arch.isS390():
+        # there is no HW clock on s390(x)
+        return
+
     try:
         fobj = open(os.path.normpath(root + "/etc/adjtime"), "r")
         lines = fobj.readlines()
diff --git a/anaconda/pyanaconda/ui/Makefile.am b/anaconda/pyanaconda/ui/Makefile.am
index ecb5b4c..28f2a5d 100644
--- a/anaconda/pyanaconda/ui/Makefile.am
+++ b/anaconda/pyanaconda/ui/Makefile.am
@@ -15,7 +15,7 @@
 #
 # Author: Chris Lumens <clumens@redhat.com>
 
-SUBDIRS = gui lib tui
+SUBDIRS = categories gui lib tui
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/anaconda/pyanaconda/ui/__init__.py b/anaconda/pyanaconda/ui/__init__.py
index 44f27e6..b1eb060 100644
--- a/anaconda/pyanaconda/ui/__init__.py
+++ b/anaconda/pyanaconda/ui/__init__.py
@@ -21,8 +21,21 @@
 
 __all__ = ["UserInterface"]
 
+import copy
 import os
-from pyanaconda.ui.common import collect, PathDict
+from pyanaconda.ui.common import collect
+
+class PathDict(dict):
+    """Dictionary class supporting + operator"""
+    def __add__(self, ext):
+        new_dict = copy.copy(self)
+        for key, value in ext.iteritems():
+            try:
+                new_dict[key].extend(value)
+            except KeyError:
+                new_dict[key] = value[:]
+
+        return new_dict
 
 class UserInterface(object):
     """This is the base class for all kinds of install UIs.  It primarily
diff --git a/anaconda/pyanaconda/ui/gui/categories/Makefile.am b/anaconda/pyanaconda/ui/categories/Makefile.am
similarity index 93%
rename from anaconda/pyanaconda/ui/gui/categories/Makefile.am
rename to anaconda/pyanaconda/ui/categories/Makefile.am
index ed3ecee..e7d0e34 100644
--- a/anaconda/pyanaconda/ui/gui/categories/Makefile.am
+++ b/anaconda/pyanaconda/ui/categories/Makefile.am
@@ -18,5 +18,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 pkgpyexecdir        = $(pyexecdir)/py$(PACKAGE_NAME)
-categoriesdir       = $(pkgpyexecdir)/ui/gui/categories
+categoriesdir       = $(pkgpyexecdir)/ui/categories
 categories_PYTHON   = $(srcdir)/*.py
diff --git a/anaconda/pyanaconda/ui/gui/categories/__init__.py b/anaconda/pyanaconda/ui/categories/__init__.py
similarity index 74%
rename from anaconda/pyanaconda/ui/gui/categories/__init__.py
rename to anaconda/pyanaconda/ui/categories/__init__.py
index 66bd5d4..6a0e270 100644
--- a/anaconda/pyanaconda/ui/gui/categories/__init__.py
+++ b/anaconda/pyanaconda/ui/categories/__init__.py
@@ -21,9 +21,8 @@
 
 import os.path
 from pyanaconda.i18n import N_
-from pyanaconda.ui.common import collect
 
-__all__ = ["SpokeCategory", "collect_categories"]
+__all__ = ["SpokeCategory"]
 
 class SpokeCategory(object):
     """A SpokeCategory is an object used to group multiple related Spokes
@@ -34,24 +33,17 @@ class SpokeCategory(object):
 
        Class attributes:
 
-       displayOnHub  -- The Hub subclass to display this Category on.  If
-                        None, this Category will be skipped.
+       displayOnHubGUI  -- The GUI Hub subclass to display this Category on.
+                           If None, this Category will be skipped.
+       displayOnHubTUI  -- The TUI Hub subclass to display this Category on.
+                           If None, this Category will be skipped.
        sortOrder     -- A number indicating the order in which this Category
                         will be displayed.  A lower number indicates display
                         higher up in the Hub.
        title         -- The title of this SpokeCategory, to be displayed above
                         the grid.
     """
-    displayOnHub = None
+    displayOnHubGUI = None
+    displayOnHubTUI = None
     sortOrder = 1000
     title = N_("DEFAULT TITLE")
-
-def collect_categories(mask_paths):
-    """Return a list of all category subclasses. Look for them in modules
-       imported as module_mask % basename(f) where f is name of all files in path.
-    """
-    categories = []
-    for mask, path in mask_paths:
-        categories.extend(collect(mask, path, lambda obj: getattr(obj, "displayOnHub", None) != None))
-
-    return categories
diff --git a/anaconda/pyanaconda/ui/gui/categories/customization.py b/anaconda/pyanaconda/ui/categories/customization.py
similarity index 89%
rename from anaconda/pyanaconda/ui/gui/categories/customization.py
rename to anaconda/pyanaconda/ui/categories/customization.py
index be59dec..fe95d12 100644
--- a/anaconda/pyanaconda/ui/gui/categories/customization.py
+++ b/anaconda/pyanaconda/ui/categories/customization.py
@@ -21,12 +21,12 @@
 #
 
 from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.progress import ProgressHub
+from pyanaconda.ui.categories import SpokeCategory
 
 __all__ = ["CustomizationCategory"]
 
 class CustomizationCategory(SpokeCategory):
-    displayOnHub = ProgressHub
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
     sortOrder = 100
     title = N_("CUSTOMIZATION")
diff --git a/anaconda/pyanaconda/ui/gui/categories/localization.py b/anaconda/pyanaconda/ui/categories/localization.py
similarity index 89%
rename from anaconda/pyanaconda/ui/gui/categories/localization.py
rename to anaconda/pyanaconda/ui/categories/localization.py
index 19a77ee..dd76ac1 100644
--- a/anaconda/pyanaconda/ui/gui/categories/localization.py
+++ b/anaconda/pyanaconda/ui/categories/localization.py
@@ -20,12 +20,12 @@
 #
 
 from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.summary import SummaryHub
+from pyanaconda.ui.categories import SpokeCategory
 
 __all__ = ["LocalizationCategory"]
 
 class LocalizationCategory(SpokeCategory):
-    displayOnHub = SummaryHub
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
     sortOrder = 100
     title = N_("LOCALIZATION")
diff --git a/anaconda/pyanaconda/ui/gui/categories/software.py b/anaconda/pyanaconda/ui/categories/software.py
similarity index 89%
rename from anaconda/pyanaconda/ui/gui/categories/software.py
rename to anaconda/pyanaconda/ui/categories/software.py
index 843f736..935c71d 100644
--- a/anaconda/pyanaconda/ui/gui/categories/software.py
+++ b/anaconda/pyanaconda/ui/categories/software.py
@@ -20,12 +20,12 @@
 #
 
 from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.summary import SummaryHub
+from pyanaconda.ui.categories import SpokeCategory
 
 __all__ = ["SoftwareCategory"]
 
 class SoftwareCategory(SpokeCategory):
-    displayOnHub = SummaryHub
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
     sortOrder = 200
     title = N_("SOFTWARE")
diff --git a/anaconda/pyanaconda/ui/gui/categories/system.py b/anaconda/pyanaconda/ui/categories/system.py
similarity index 89%
rename from anaconda/pyanaconda/ui/gui/categories/system.py
rename to anaconda/pyanaconda/ui/categories/system.py
index dd30688..90a421d 100644
--- a/anaconda/pyanaconda/ui/gui/categories/system.py
+++ b/anaconda/pyanaconda/ui/categories/system.py
@@ -21,12 +21,12 @@
 #
 
 from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.summary import SummaryHub
+from pyanaconda.ui.categories import SpokeCategory
 
 __all__ = ["SystemCategory"]
 
 class SystemCategory(SpokeCategory):
-    displayOnHub = SummaryHub
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
     sortOrder = 300
     title = N_("SYSTEM")
diff --git a/anaconda/pyanaconda/ui/gui/categories/user_settings.py b/anaconda/pyanaconda/ui/categories/user_settings.py
similarity index 89%
rename from anaconda/pyanaconda/ui/gui/categories/user_settings.py
rename to anaconda/pyanaconda/ui/categories/user_settings.py
index e025428..079bc30 100644
--- a/anaconda/pyanaconda/ui/gui/categories/user_settings.py
+++ b/anaconda/pyanaconda/ui/categories/user_settings.py
@@ -21,12 +21,12 @@
 #
 
 from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.progress import ProgressHub
+from pyanaconda.ui.categories import SpokeCategory
 
 __all__ = ["UserSettingsCategory"]
 
 class UserSettingsCategory(SpokeCategory):
-    displayOnHub = ProgressHub
+    displayOnHubGUI = "ProgressHub"
+    displayOnHubTUI = "SummaryHub"
     sortOrder = 200
     title = N_("USER SETTINGS")
diff --git a/anaconda/pyanaconda/ui/common.py b/anaconda/pyanaconda/ui/common.py
index e1dd3f1..e4f994e 100644
--- a/anaconda/pyanaconda/ui/common.py
+++ b/anaconda/pyanaconda/ui/common.py
@@ -1,6 +1,6 @@
 # Common classes for user interface
 #
-# Copyright (C) 2012  Red Hat, Inc.
+# Copyright (C) 2012-2014  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -23,29 +23,18 @@
 import os
 import imp
 import inspect
-import copy
 import sys
 import types
 
+from abc import ABCMeta, abstractproperty
+
 from pyanaconda.constants import ANACONDA_ENVIRON, FIRSTBOOT_ENVIRON
 from pyanaconda.errors import RemovedModuleError
-from pykickstart.constants import FIRSTBOOT_RECONFIG
+from pykickstart.constants import FIRSTBOOT_RECONFIG, DISPLAY_MODE_TEXT
 
 import logging
 log = logging.getLogger("anaconda")
 
-class PathDict(dict):
-    """Dictionary class supporting + operator"""
-    def __add__(self, ext):
-        new_dict = copy.copy(self)
-        for key, value in ext.iteritems():
-            try:
-                new_dict[key].extend(value)
-            except KeyError:
-                new_dict[key] = value[:]
-
-        return new_dict
-
 class UIObject(object):
     """This is the base class from which all other UI classes are derived.  It
        thus contains only attributes and methods that are common to everything
@@ -112,13 +101,6 @@ class UIObject(object):
         """
         pass
 
-    @property
-    def window(self):
-        """Return an object with show_all and hide methods that is to be used
-           to display this UI object.
-        """
-        raise TypeError("UIObject.window has to be overriden")
-
     @property
     def data(self):
         return self._data
@@ -177,7 +159,7 @@ class FirstbootOnlySpokeMixIn(object):
         else:
             return False
 
-class Spoke(UIObject):
+class Spoke(object):
     """A Spoke is a single configuration screen.  There are several different
        places where a Spoke can be displayed, each of which will have its own
        unique class.  A Spoke is typically used when an element in the Hub is
@@ -204,11 +186,14 @@ class Spoke(UIObject):
                      corresponding to this Spoke instance.  If no title is
                      given, the default from SpokeSelector will be used.
     """
+
+    __metaclass__ = ABCMeta
+
     category = None
     icon = None
     title = None
 
-    def __init__(self, data, storage, payload, instclass):
+    def __init__(self, storage, payload, instclass):
         """Create a new Spoke instance.
 
            The arguments this base class accepts defines the API that spokes
@@ -218,7 +203,9 @@ class Spoke(UIObject):
 
            data         -- An instance of a pykickstart Handler object.  The
                            Spoke uses this to populate its UI with defaults
-                           and to pass results back after it has run.
+                           and to pass results back after it has run. The data
+                           property must be implemented by classes inherting
+                           from Spoke.
            storage      -- An instance of storage.Storage.  This is useful for
                            determining what storage devices are present and how
                            they are configured.
@@ -230,16 +217,20 @@ class Spoke(UIObject):
                            installation information like default package
                            selections and default partitioning.
         """
-        if self.__class__ is Spoke:
-            raise TypeError("Spoke is an abstract class")
-
-        UIObject.__init__(self, data)
-        self.storage = storage
+        self._storage = storage
         self.payload = payload
         self.instclass = instclass
         self.applyOnSkip = False
 
-        self._visitedSinceApplied = True
+        self.visitedSinceApplied = True
+
+    @abstractproperty
+    def data(self):
+        pass
+
+    @property
+    def storage(self):
+        return self._storage
 
     @classmethod
     def should_run(cls, environment, data):
@@ -283,9 +274,26 @@ class Spoke(UIObject):
            spoke, and a highlighted message will be shown at the bottom of the
            Hub.  Installation will not be allowed to proceed until all mandatory
            spokes are complete.
+
+           WARNING: This can be called before the spoke is finished initializing
+           if the spoke starts a thread. It should make sure it doesn't access
+           things until they are completely setup.
         """
         return False
 
+    @property
+    def sensitive(self):
+        """May the user click on this spoke's selector and be taken to the spoke?
+           This is different from the showable property.  A spoke that is not
+           sensitive will still be shown on the hub, but the user may not enter it.
+           This is also different from the ready property.  A spoke that is not
+           ready may not be entered, but the spoke may become ready in the future.
+           A spoke that is not sensitive will likely not become so.
+
+           Most spokes will not want to override this method.
+        """
+        return True
+
     @property
     def mandatory(self):
         """Mark this spoke as mandatory. Installation will not be allowed
@@ -307,9 +315,6 @@ class Spoke(UIObject):
         """
         pass
 
-    def initialize(self):
-        UIObject.initialize(self)
-
     @property
     def status(self):
         """Given the current status of whatever this Spoke configures, return
@@ -329,6 +334,24 @@ class Spoke(UIObject):
         """
         raise NotImplementedError
 
+    def entry_logger(self):
+        """Log immediately before this spoke is about to be displayed on the
+           screen.  Subclasses may override this method if they want to log
+           more specific information, but an overridden method should finish
+           by calling this method so the entry will be logged.
+        """
+        log.debug("Entered spoke: %s", self.__class__.__name__)
+
+    def exit_logger(self):
+        """Log when a user leaves the spoke.  Subclasses may override this
+           method if they want to log more specific information, but an
+           overridden method should finish by calling this method so the
+           exit will be logged.
+        """
+        log.debug("Left spoke: %s", self.__class__.__name__)
+
+# Inherit abstract methods from Spoke
+# pylint: disable=abstract-method
 class NormalSpoke(Spoke):
     """A NormalSpoke is a Spoke subclass that is displayed when the user
        selects something on a Hub.  This is what most Spokes in anaconda will
@@ -340,12 +363,9 @@ class NormalSpoke(Spoke):
        installing, how to get back to the Hub) at the top of the screen.
     """
 
-    def __init__(self, data, storage, payload, instclass):
+    def __init__(self, storage, payload, instclass):
         """Create a NormalSpoke instance."""
-        if self.__class__ is NormalSpoke:
-            raise TypeError("NormalSpoke is an abstract class")
-
-        Spoke.__init__(self, data, storage, payload, instclass)
+        Spoke.__init__(self, storage, payload, instclass)
         self.selector = None
 
     @property
@@ -378,7 +398,9 @@ class NormalSpoke(Spoke):
         """
         return True
 
-class StandaloneSpoke(NormalSpoke):
+# Inherit abstract methods from NormalSpoke
+# pylint: disable=abstract-method
+class StandaloneSpoke(Spoke):
     """A StandaloneSpoke is a Spoke subclass that is displayed apart from any
        Hub.  It is suitable to be used as a Welcome screen.
 
@@ -404,34 +426,21 @@ class StandaloneSpoke(NormalSpoke):
     preForHub = None
     postForHub = None
 
-    def __init__(self, data, storage, payload, instclass):
+    def __init__(self, storage, payload, instclass):
         """Create a StandaloneSpoke instance."""
-        if self.__class__ is StandaloneSpoke:
-            raise TypeError("StandaloneSpoke is an abstract class")
-
         if self.preForHub and self.postForHub:
             raise AttributeError("StandaloneSpoke instance %s may not have both preForHub and postForHub set" % self)
 
-        NormalSpoke.__init__(self, data, storage, payload, instclass)
+        Spoke.__init__(self, storage, payload, instclass)
 
-class PersonalizationSpoke(Spoke):
-    """A PersonalizationSpoke is a Spoke subclass that is displayed when the
-       user selects something on the Hub during package installation.
+    # Standalone spokes are not part of a hub, and thus have no status.
+    # Provide a concrete implementation of status here so that subclasses
+    # don't need one.
+    @property
+    def status(self):
+        return None
 
-       From a layout perspective, a PersonalizationSpoke takes up the middle
-       of the screen therefore hiding the Hub but leaving its action area
-       displayed.  This allows the user to continue seeing package installation
-       progress being made.  The PersonalizationSpoke also provides the same
-       basic navigation information at the top of the screen as a NormalSpoke.
-    """
-    def __init__(self, data, storage, payload, instclass):
-        """Create a PersonalizationSpoke instance."""
-        if self.__class__ is PersonalizationSpoke:
-            raise TypeError("PersonalizationSpoke is an abstract class")
-
-        Spoke.__init__(self, data, storage, payload, instclass)
-
-class Hub(UIObject):
+class Hub(object):
     """A Hub is an overview UI screen.  A Hub consists of one or more grids of
        configuration options that the user may choose from.  Each grid is
        provided by a SpokeCategory, and each option is provided by a Spoke.
@@ -453,7 +462,9 @@ class Hub(UIObject):
        additional standalone screens either before or after them.
     """
 
-    def __init__(self, data, storage, payload, instclass):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, storage, payload, instclass):
         """Create a new Hub instance.
 
            The arguments this base class accepts defines the API that Hubs
@@ -463,7 +474,9 @@ class Hub(UIObject):
 
            data         -- An instance of a pykickstart Handler object.  The
                            Hub uses this to populate its UI with defaults
-                           and to pass results back after it has run.
+                           and to pass results back after it has run. The data
+                           property must be implemented by classes inheriting
+                           from Hub.
            storage      -- An instance of storage.Storage.  This is useful for
                            determining what storage devices are present and how
                            they are configured.
@@ -475,9 +488,7 @@ class Hub(UIObject):
                            installation information like default package
                            selections and default partitioning.
         """
-        UIObject.__init__(self, data)
-
-        self.storage = storage
+        self._storage = storage
         self.payload = payload
         self.instclass = instclass
 
@@ -487,11 +498,51 @@ class Hub(UIObject):
         # spokes for which environments this hub should collect?
         self._environs = [ANACONDA_ENVIRON]
 
+    @abstractproperty
+    def data(self):
+        pass
+
+    @property
+    def storage(self):
+        return self._storage
+
     def set_path(self, path_id, paths):
         """Update the paths attribute with list of tuples in the form (module
            name format string, directory name)"""
         self.paths[path_id] = paths
-        
+
+    def entry_logger(self):
+        """Log immediately before this hub is about to be displayed on the
+           screen.  Subclasses may override this method if they want to log
+           more specific information, but an overridden method should finish
+           by calling this method so the entry will be logged.
+
+           Note that due to how the GUI flows, hubs are only entered once -
+           when they are initially displayed.  Going to a spoke from a hub
+           and then coming back to the hub does not count as exiting and
+           entering.
+        """
+        log.debug("Entered hub: %s", self.__class__.__name__)
+
+    def _collectCategoriesAndSpokes(self):
+        """This method is provided so that is can be overridden in a subclass
+           by a custom collect method.
+           One example of such usage is the Initial Setup application.
+        """
+        return collectCategoriesAndSpokes(self.paths, self.__class__, self.data.displaymode.displayMode)
+
+    def exit_logger(self):
+        """Log when a user leaves the hub.  Subclasses may override this
+           method if they want to log more specific information, but an
+           overridden method should finish by calling this method so the
+           exit will be logged.
+
+           Note that due to how the GUI flows, hubs are not exited when the
+           user selects a spoke from the hub.  They are only exited when the
+           continue or quit button is clicked on the hub.
+        """
+        log.debug("Left hub: %s", self.__class__.__name__)
+
 def collect(module_pattern, path, pred):
     """Traverse the directory (given by path), import all files as a module
        module_pattern % filename and find all classes within that match
@@ -517,7 +568,7 @@ def collect(module_pattern, path, pred):
     # when the directory "path" does not exist
     except OSError:
         return []
-    
+
     for module_file in contents:
         if (not module_file.endswith(".py")) and \
            (not module_file.endswith(".so")):
@@ -533,6 +584,7 @@ def collect(module_pattern, path, pred):
 
         mod_info = None
         module = None
+        module_path = None
 
         try:
             imp.acquire_lock()
@@ -580,7 +632,7 @@ def collect(module_pattern, path, pred):
 
             # restore the extension dot eaten by split
             loaded_ext = "." + loaded_ext
-            
+
             # do not collect classes when the module is already imported
             # from different path than we are traversing
             # this condition checks the module name without file extension
@@ -602,10 +654,10 @@ def collect(module_pattern, path, pred):
             continue
 
         except ImportError as imperr:
-            if "pyanaconda" in module_path:
+            if module_path and "pyanaconda" in module_path:
                 # failure when importing our own module:
                 raise
-            log.error("Failed to import module in collect: %s", imperr)
+            log.error("Failed to import module %s from path %s in collect: %s", mod_name, module_path, imperr)
             continue
         finally:
             imp.release_lock()
@@ -622,9 +674,62 @@ def collect(module_pattern, path, pred):
             members = [(name, getattr(module, name))
                        for name in module.__all__
                        if p(getattr(module, name))]
-        
+
         for (name, val) in members:
             retval.append(val)
 
     return retval
 
+def collect_spokes(mask_paths, category):
+    """Return a list of all spoke subclasses that should appear for a given
+       category. Look for them in files imported as module_path % basename(f)
+
+       :param mask_paths: list of mask, path tuples to search for classes
+       :type mask_paths: list of (mask, path)
+
+       :return: list of Spoke classes belonging to category
+       :rtype: list of Spoke classes
+
+    """
+    spokes = []
+    for mask, path in mask_paths:
+        spokes.extend(collect(mask, path,
+                      lambda obj: hasattr(obj, "category") and obj.category is not None and obj.category.__name__ == category))
+
+    return spokes
+
+def collect_categories(mask_paths, displaymode):
+    """Return a list of all category subclasses. Look for them in modules
+       imported as module_mask % basename(f) where f is name of all files in path.
+    """
+    categories = []
+    if displaymode == DISPLAY_MODE_TEXT:
+        for mask, path in mask_paths:
+            categories.extend(collect(mask, path, lambda obj: getattr(obj, "displayOnHubTUI", None) is not None))
+    else:
+        for mask, path in mask_paths:
+            categories.extend(collect(mask, path, lambda obj: getattr(obj, "displayOnHubGUI", None) is not None))
+
+    return categories
+
+def collectCategoriesAndSpokes(paths, klass, displaymode):
+    """collects categories and spokes to be displayed on this Hub
+
+       :param paths: dictionary mapping categories, spokes, and hubs to their
+       their respective search path(s)
+       :return: dictionary mapping category class to list of spoke classes
+       :rtype: dictionary[category class] -> [ list of spoke classes ]
+    """
+    ret = {}
+    # Collect all the categories this hub displays, then collect all the
+    # spokes belonging to all those categories.
+    if displaymode == DISPLAY_MODE_TEXT:
+        categories = sorted(filter(lambda c: c.displayOnHubTUI == klass.__name__, collect_categories(paths["categories"], displaymode)),
+                            key=lambda c: c.sortOrder)
+    else:
+        categories = sorted(filter(lambda c: c.displayOnHubGUI == klass.__name__, collect_categories(paths["categories"], displaymode)),
+                            key=lambda c: c.sortOrder)
+    for c in categories:
+        ret[c] = collect_spokes(paths["spokes"], c.__name__)
+
+    return ret
diff --git a/anaconda/pyanaconda/ui/gui/Makefile.am b/anaconda/pyanaconda/ui/gui/Makefile.am
index 272cebb..013c550 100644
--- a/anaconda/pyanaconda/ui/gui/Makefile.am
+++ b/anaconda/pyanaconda/ui/gui/Makefile.am
@@ -15,7 +15,7 @@
 #
 # Author: Chris Lumens <clumens@redhat.com>
 
-SUBDIRS = categories hubs spokes tools
+SUBDIRS = hubs spokes tools
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/anaconda/pyanaconda/ui/gui/__init__.py b/anaconda/pyanaconda/ui/gui/__init__.py
index a452902..38d64a5 100644
--- a/anaconda/pyanaconda/ui/gui/__init__.py
+++ b/anaconda/pyanaconda/ui/gui/__init__.py
@@ -21,13 +21,16 @@
 import inspect, os, sys, time, site
 import meh.ui.gui
 
-from gi.repository import Gdk, Gtk, AnacondaWidgets
+from contextlib import contextmanager
+
+from gi.repository import Gdk, Gtk, AnacondaWidgets, Keybinder, GdkPixbuf, GLib, GObject
 
 from pyanaconda.i18n import _
 from pyanaconda import product
 
 from pyanaconda.ui import UserInterface, common
-from pyanaconda.ui.gui.utils import enlightbox, gtk_action_wait, busyCursor, unbusyCursor
+from pyanaconda.ui.gui.utils import gtk_action_wait, busyCursor, unbusyCursor
+from pyanaconda import ihelp
 import os.path
 
 import logging
@@ -36,99 +39,21 @@ log = logging.getLogger("anaconda")
 __all__ = ["GraphicalUserInterface", "QuitDialog"]
 
 _screenshotIndex = 0
+_last_screenshot_timestamp = 0
+SCREENSHOT_DELAY = 1  # in seconds
 
 ANACONDA_WINDOW_GROUP = Gtk.WindowGroup()
 
-class GUICheck(object):
-    """Handle an input validation check."""
+# Stylesheet priorities to use for product-specific stylesheets and our
+# missing icon overrides. The missing icon rules should be higher than
+# the regular stylesheet, applied at GTK_STYLE_PROVIDER_PRIORITY_APPLICATION,
+# and stylesheets from updates.img and product.img should be higher than that,
+# so that they can override background images and not get re-overriden by us.
+# Both should be lower than GTK_STYLE_PROVIDER_PRIORITY_USER.
+STYLE_PROVIDER_PRIORITY_MISSING_ICON = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 10
+STYLE_PROVIDER_PRIORITY_UPDATES = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 20
+assert STYLE_PROVIDER_PRIORITY_UPDATES < Gtk.STYLE_PROVIDER_PRIORITY_USER
 
-    # Use as a return value to indicate a passed check
-    CHECK_OK = None
-
-    def __init__(self, parent, editable, run_check, check_data, set_error):
-        """Create a new input validation check.
-
-           :param parent: The parent GUIObject. When a check state changes,
-                          the GUICheck will call set_error(check, check-state)
-           :type parent:  GUIObject
-           
-           :param editable: The input field being checked
-           :type editable:  GtkEditable
-
-           :param run_check: The check function. The function is called as
-                             check(editable, check_data). The return value is an
-                             error state object or CHECK_OK if the check succeeds.
-           :type run_check:  function
-
-           :param check_data: An optional parameter passed to check().
-
-           :param set_error: A function called when the state of this check
-                             changes. The parameters are (GUICheck, run_check_return).
-                             The return value is ignored.
-           :type set_error:  function
-        """
-
-        self._parent = parent
-        self._editable = editable
-        self._run_check = run_check
-        self._check_data = check_data
-        self._set_error = set_error
-
-        # Set to the Gtk handler ID in enable()
-        self._handler_id = None
-
-        # Initial check state
-        self._check_status = None
-
-        self.enable()
-
-    def enable(self):
-        """Enable the check.
-
-           enable() does not check the current state of the input field. To
-           check the current state, run update_check_status() after enable().
-        """
-        if not self._handler_id:
-            self._handler_id = self._editable.connect_after("changed", self.update_check_status)
-
-    def disable(self):
-        """Disable the check. The check will no longer appear in failed_checks,
-           but disabling the check does not call set_error to update the
-           GUIObject's state.
-        """
-        if self._handler_id:
-            self._editable.disconnect(self._handler_id)
-            self._handler_id = None
-            self._check_status = None
-
-    def update_check_status(self, editable=None, check_data=None):
-        """Run an input validation check."""
-
-        # Allow check parameters to be overriden in parameters
-        if editable is None:
-            editable = self._editable
-        if check_data is None:
-            check_data = self._check_data
-
-        new_check_status = self._run_check(editable, check_data)
-        check_status_changed = (self._check_status != new_check_status)
-        self._check_status = new_check_status
-
-        if check_status_changed:
-            self._set_error(self, self._check_status)
-
-    @property
-    def check_status(self):
-        return self._check_status
-
-    @property
-    def editable(self):
-        return self._editable
-
-    @property
-    def check_data(self):
-        return self._check_data
-        
 class GUIObject(common.UIObject):
     """This is the base class from which all other GUI classes are derived.  It
        thus contains only attributes and methods that are common to everything
@@ -154,14 +79,34 @@ class GUIObject(common.UIObject):
        mainWidgetName   -- The name of the top-level widget this object
                            object implements.  This will be the widget searched
                            for in uiFile by the window property.
+       focusWidgetName  -- The name of the widget to focus when the object is entered,
+                           or None.
        uiFile           -- The location of an XML file that describes the layout
                            of widgets shown by this object.  UI files are
                            searched for relative to the same directory as this
                            object's module.
+       translationDomain-- The gettext translation domain for the given GUIObject
+                           subclass. By default the "anaconda" translation domain
+                           is used, but external applications, such as Initial Setup,
+                           that use GUI elements (Hubs & Spokes) from Anaconda
+                           can override the translation domain with their own,
+                           so that their subclasses are properly translated.
+       helpFile         -- The location of the yelp-compatible help file for the
+                           given GUI object. The default value of "" indicates
+                           that the object has not specific help file assigned
+                           and the default help file should be used.
     """
     builderObjects = []
     mainWidgetName = None
+
+    # Since many of the builder files do not define top-level widgets, the usual
+    # {get,can,is,has}_{focus,default} properties don't work real good. Define the
+    # widget to be focused in python, instead.
+    focusWidgetName = None
+
     uiFile = ""
+    helpFile = None
+    translationDomain = "anaconda"
 
     screenshots_directory = "/tmp/anaconda-screenshots"
 
@@ -196,7 +141,7 @@ class GUIObject(common.UIObject):
         self.applyOnSkip = False
 
         self.builder = Gtk.Builder()
-        self.builder.set_translation_domain("anaconda")
+        self.builder.set_translation_domain(self.translationDomain)
         self._window = None
 
         if self.builderObjects:
@@ -204,11 +149,11 @@ class GUIObject(common.UIObject):
         else:
             self.builder.add_from_file(self._findUIFile())
 
-        ANACONDA_WINDOW_GROUP.add_window(self.window)
         self.builder.connect_signals(self)
-        self.window.connect("key-release-event", self._handlePrntScreen)
 
-        self._check_list = []
+        # Keybinder from GI needs to be initialized before use
+        Keybinder.init()
+        Keybinder.bind("<Shift>Print", self._handlePrntScreen, [])
 
     def _findUIFile(self):
         path = os.environ.get("UIPATH", "./:/tmp/updates/:/tmp/updates/ui/:/usr/share/anaconda/ui/")
@@ -224,31 +169,32 @@ class GUIObject(common.UIObject):
 
         raise IOError("Could not load UI file '%s' for object '%s'" % (self.uiFile, self))
 
-    def _handlePrntScreen(self, window, event):
+    def _handlePrntScreen(self, *args, **kwargs):
         global _screenshotIndex
+        global _last_screenshot_timestamp
+        # as a single press of the assigned key generates
+        # multiple callbacks, we need to skip additional
+        # callbacks for some time once a screenshot is taken
+        if (time.time() - _last_screenshot_timestamp) >= SCREENSHOT_DELAY:
+            # Make sure the screenshot directory exists.
+            if not os.access(self.screenshots_directory, os.W_OK):
+                os.makedirs(self.screenshots_directory)
 
-        if event.keyval != Gdk.KEY_Print:
-            return
-
-        # Make sure the screenshot directory exists.
-        if not os.access(self.screenshots_directory, os.W_OK):
-            os.mkdir(self.screenshots_directory)
-
-        fn = os.path.join(self.screenshots_directory,
-                          "screenshot-%04d.png" % _screenshotIndex)
-
-        win = window.get_window()
-        width = win.get_width()
-        height = win.get_height()
-
-        pixbuf = Gdk.pixbuf_get_from_window(win, 0, 0, width, height)
-        pixbuf.savev(fn, "png", [], [])
-
-        _screenshotIndex += 1
+            fn = os.path.join(self.screenshots_directory,
+                              "screenshot-%04d.png" % _screenshotIndex)
+            root_window = Gdk.get_default_root_window()
+            pixbuf = Gdk.pixbuf_get_from_window(root_window, 0, 0,
+                                                root_window.get_width(),
+                                                root_window.get_height())
+            pixbuf.savev(fn, 'png', [], [])
+            log.info("screenshot nr. %d taken", _screenshotIndex)
+            _screenshotIndex += 1
+            # start counting from the time the screenshot operation is done
+            _last_screenshot_timestamp = time.time()
 
     @property
     def window(self):
-        """Return the top-level object out of the GtkBuilder representation
+        """Return the object out of the GtkBuilder representation
            previously loaded by the load method.
         """
 
@@ -259,6 +205,11 @@ class GUIObject(common.UIObject):
 
         return self._window
 
+    @property
+    def main_window(self):
+        """Return the top-level window containing this GUIObject."""
+        return self.window.get_toplevel()
+
     def clear_info(self):
         """Clear any info bar from the bottom of the screen."""
         self.window.clear_info()
@@ -288,184 +239,6 @@ class GUIObject(common.UIObject):
         """
         self.window.set_warning(msg)
 
-    def add_check(self, editable, run_check, check_data=None, set_error=None):
-        """Add an input validation check to this object.
-
-           This function creates new GUICheck object and adds it to this
-           GUIObject. The check is run any time the input field changes.
-           If the result of a check changes, the check object will call
-           the set_error function. By default, set_error will call
-           self.set_warning with the status of the first failed check.
-
-           :param editable: the input field to validate
-           :type editable: GtkEditable
-
-           :param run_check: a function called to validate the input field. The
-                         parameters are (editable, check_data). The return
-                         value is an object used by update_check, or
-                         GUICheck.CHECK_OK if the check passes.
-           :type run_check: function
-           
-           :param check_data: additional data to pass to the check function
-
-           :param set_error: a function called when a check changes state. The
-                         parameters are (GUICheck, run_check_return).  The
-                         return value is ignored.
-           :type set_error: function
-           
-           :returns: A check object
-           :rtype: GUICheck
-        """
-
-        if not set_error:
-            set_error = self.set_check_error
-
-        checkRef = GUICheck(self, editable, run_check, check_data, set_error)
-        self._check_list.append(checkRef)
-        return checkRef
-
-    def add_re_check(self, editable, regex, message, set_error=None):
-        """Add a check using a regular expresion.
-           
-           :param editable: the input field to validate
-           :type editable:  GtkEditable
-
-           :param regex: the regular expression to use to check the input
-           :type regex:  re.RegexObject
-
-           :param message: The message to set if the regex does not match
-           :type message:  str
-
-           :param set_error: a function called when a check changes state. The
-                         parameters are (GUICheck, run_check_return).  The
-                         return value is ignored.
-           :type set_error: function
-
-           :returns: A check object
-           :rtype: GUICheck
-        """
-        if not set_error:
-            set_error = self.set_check_error
-        return self.add_check(editable=editable, run_check=check_re, 
-                check_data={'regex': regex, 'message': message}, set_error=set_error)
-
-    def update_check(self, check, check_status):
-        """This method is called when the state of a check in the check list changes.
-
-           :param check: The check object that changed
-           :type check:  GUICheck
-
-           :param check_status: The new status of the check
-        """
-        raise NotImplementedError()
-
-    def set_check_error(self, check, check_return):
-        """Update the warning with the input validation check error."""
-        # Grab the first failed check
-        failed_check = next(self.failed_checks, None)
-
-        self.clear_info()
-        if failed_check:
-            self.set_warning(failed_check.check_status)
-            self.window.show_all()
-
-    @property
-    def failed_checks(self):
-        """A generator of all failed input checks"""
-        return (c for c in self._check_list if c.check_status)
-
-    @property
-    def checks(self):
-        """An iterator over all input checks"""
-        return self._check_list.__iter__()
-
-class GUIDialog(GUIObject):
-    """This is an abstract for creating dialog windows. It implements the
-       update_check interface to display an error message when an input
-       validation fails.
-
-       GUIDialog does not define where errors are displayed, so classes
-       that derive from GUIDialog must define error labels and include them
-       as the check_data parameter to add_check. More than one check can use
-       the same label: the message from the first failed check will update the
-       label.
-    """
-
-    def __init__(self, data):
-        if self.__class__ is GUIDialog:
-            raise TypeError("GUIDialog is an abstract class")
-
-        GUIObject.__init__(self, data)
-
-    def add_check_with_error_label(self, editable, error_label, run_check, 
-            check_data=None, set_error=None):
-        """Add an input validation check to this dialog. The error_label will
-           be added to the check_data for the validation check and will be
-           used to display the error message if the check fails.
-
-           :param editable: the input field to validate
-           :type editable: GtkEditable
-
-           :param error_label: the label in which to display the error data
-           :type error_label:  GtkLabel
-
-           :param run_check: a function called to validate the input field. The
-                         parameters are (editable, check_data). The return
-                         value is an object used by update_check, or
-                         GUICheck.CHECK_OK if the check passes.
-           :type run_check: function
-           
-           :param check_data: additional data to pass to the check function
-
-           :param set_error: a function called when a check changes state. The
-                         parameters are (GUICheck, run_check_return).  The
-                         return value is ignored.
-           :type set_error: function
-           
-           :returns: A check object
-           :rtype: GUICheck
-        """
-        if not set_error:
-            set_error = self.set_check_error
-
-        return self.add_check(editable=editable, run_check=run_check, 
-                check_data={'error_label': error_label, 'message': check_data},
-                set_error=set_error)
-
-    def add_re_check_with_error_label(self, editable, error_label, regex, message, set_error=None):
-        """Add a check using a regular expression."""
-        # Use the GUIObject function so we can create the check_data dictionary here
-        if not set_error:
-            set_error = self.set_check_error
-
-        return self.add_check(editable=editable, run_check=check_re,
-                check_data={'error_label': error_label, 'message': message, 'regex': regex},
-                set_error=set_error)
-
-    def set_check_error(self, check, check_return):
-        """Update all input check failure messages.
-
-           If multiple checks use the same GtkLabel, only the first one will
-           be used.
-        """
-
-        # If the signaling check passed, clear its error label
-        if not check_return:
-            if 'error_label' in check.check_data:
-                check.check_data['error_label'].set_text('')
-
-        # Keep track of which labels have errors set. If we see an error for
-        # a label that's already been set, skip it.
-        labels_seen = []
-        for failed_check in self.failed_checks:
-            if not 'error_label' in failed_check.check_data:
-                continue
-
-            label = failed_check.check_data['error_label']
-            if label not in labels_seen:
-                labels_seen.append(label)
-                label.set_text(failed_check.check_status)
-
 class QuitDialog(GUIObject):
     builderObjects = ["quitDialog"]
     mainWidgetName = "quitDialog"
@@ -479,32 +252,232 @@ class QuitDialog(GUIObject):
         rc = self.window.run()
         return rc
 
+class ErrorDialog(GUIObject):
+    builderObjects = ["errorDialog", "errorTextBuffer"]
+    mainWidgetName = "errorDialog"
+    uiFile = "main.glade"
+
+    # pylint: disable=arguments-differ
+    def refresh(self, msg):
+        buf = self.builder.get_object("errorTextBuffer")
+        buf.set_text(msg, -1)
+
+    def run(self):
+        rc = self.window.run()
+        return rc
+
+class MainWindow(Gtk.Window):
+    """This is a top-level, full size window containing the Anaconda screens."""
+
+    def __init__(self):
+        Gtk.Window.__init__(self)
+
+        # Treat an attempt to close the window the same as hitting quit
+        self.connect("delete-event", self._on_delete_event)
+
+        # Create a black, 50% opacity pixel that will be scaled to fit the lightbox overlay
+        # The confusing list of unnamed parameters is:
+        # bytes, colorspace (there is no other colorspace), has-alpha,
+        # bits-per-sample (has to be 8), width, height,
+        # rowstride (bytes between row starts, but we only have one row)
+        self._transparent_base = GdkPixbuf.Pixbuf.new_from_bytes(GLib.Bytes.new([0, 0, 0, 127]),
+                GdkPixbuf.Colorspace.RGB, True, 8, 1, 1, 1)
+
+        # Contain everything in an overlay so the window can be overlayed with the transparency
+        # for the lightbox effect
+        self._overlay = Gtk.Overlay()
+        self._overlay_img = None
+        self._overlay.connect("get-child-position", self._on_overlay_get_child_position)
+
+        self._overlay_depth = 0
+
+        # Create a stack and a list of what's been added to the stack
+        self._stack = Gtk.Stack()
+        self._stack_contents = set()
+
+        # Create an accel group for the F12 accelerators added after window transitions
+        self._accel_group = Gtk.AccelGroup()
+        self.add_accel_group(self._accel_group)
+
+        # Connect to window-state-event changes to catch when the user
+        # maxmizes/unmaximizes the window.
+        self.connect("window-state-event", self._on_window_state_event)
+
+        # Start the window as full screen
+        self.fullscreen()
+
+        self._overlay.add(self._stack)
+        self.add(self._overlay)
+        self.show_all()
+
+        self._current_action = None
+
+    def _on_window_state_event(self, window, event, user_data=None):
+        # If the window is being maximized, fullscreen it instead
+        if (Gdk.WindowState.MAXIMIZED & event.changed_mask) and \
+                (Gdk.WindowState.MAXIMIZED & event.new_window_state):
+            self.fullscreen()
+
+            # Return true to stop the signal handler since we're changing
+            # state mid-stream here
+            return True
+
+        return False
+
+    def _on_delete_event(self, widget, event, user_data=None):
+        # Use the quit-clicked signal on the the current standalone, even if the
+        # standalone is not currently displayed.
+        if self.current_action:
+            self.current_action.window.emit("quit-clicked")
+
+        # Stop the window from being closed here
+        return True
+
+    def _on_overlay_get_child_position(self, overlay_container, overlayed_widget, allocation, user_data=None):
+        overlay_allocation = overlay_container.get_allocation()
+
+        # Scale the overlayed image's pixbuf to the size of the GtkOverlay
+        overlayed_widget.set_from_pixbuf(self._transparent_base.scale_simple(
+            overlay_allocation.width, overlay_allocation.height, GdkPixbuf.InterpType.NEAREST))
+
+        # Set the allocation for the overlayed image to the full size of the GtkOverlay
+        allocation.x = 0
+        allocation.y = 0
+        allocation.width = overlay_allocation.width
+        allocation.height = overlay_allocation.height
+
+        return True
+
+    @property
+    def current_action(self):
+        return self._current_action
+
+    def _setVisibleChild(self, child):
+        # Remove the F12 accelerator from the old window
+        old_screen = self._stack.get_visible_child()
+        if old_screen:
+            old_screen.remove_accelerator(self._accel_group, Gdk.KEY_F12, 0)
+            old_screen.remove_accelerator(self._accel_group, Gdk.KEY_F1, 0)
+            old_screen.remove_accelerator(self._accel_group, Gdk.KEY_F1, Gdk.ModifierType.MOD1_MASK)
+
+        # Check if the widget is already on the stack
+        if child not in self._stack_contents:
+            self._stack.add(child.window)
+            self._stack_contents.add(child)
+            child.window.show_all()
+
+        # It would be handy for F12 to continue to work like it did in the old
+        # UI, by skipping you to the next screen or sending you back to the hub
+        if isinstance(child.window, AnacondaWidgets.BaseStandalone):
+            child.window.add_accelerator("continue-clicked", self._accel_group,
+                    Gdk.KEY_F12, 0, 0)
+            child.window.add_accelerator("help-button-clicked", self._accel_group,
+                    Gdk.KEY_F1, 0, 0)
+            child.window.add_accelerator("help-button-clicked", self._accel_group,
+                    Gdk.KEY_F1, Gdk.ModifierType.MOD1_MASK, 0)
+        elif isinstance(child.window, AnacondaWidgets.SpokeWindow):
+            child.window.add_accelerator("button-clicked", self._accel_group,
+                    Gdk.KEY_F12, 0, 0)
+            child.window.add_accelerator("help-button-clicked", self._accel_group,
+                    Gdk.KEY_F1, 0, 0)
+            child.window.add_accelerator("help-button-clicked", self._accel_group,
+                    Gdk.KEY_F1, Gdk.ModifierType.MOD1_MASK, 0)
+
+        self._stack.set_visible_child(child.window)
+
+        if child.focusWidgetName:
+            child.builder.get_object(child.focusWidgetName).grab_focus()
+
+    def setCurrentAction(self, standalone):
+        """Set the current standalone widget.
+
+           This changes the currently displayed screen and, if the standalone
+           is a hub, sets the hub as the screen to which spokes will return.
+
+           :param AnacondaWidgets.BaseStandalone standalone: the new standalone action
+        """
+        self._current_action = standalone
+        self._setVisibleChild(standalone)
+
+    def enterSpoke(self, spoke):
+        """Enter a spoke.
+
+           The spoke will be displayed as the current screen, but the current-action
+           to which the spoke will return will not be changed.
+
+           :param AnacondaWidgets.SpokeWindow spoke: a spoke to enter
+        """
+        self._setVisibleChild(spoke)
+
+    def returnToHub(self):
+        """Exit a spoke and return to a hub."""
+        self._setVisibleChild(self._current_action)
+
+    def lightbox_on(self):
+        self._overlay_depth += 1
+        if not self._overlay_img:
+            # Add an overlay image that will be filled and scaled in get-child-position
+            self._overlay_img = Gtk.Image()
+            self._overlay_img.show_all()
+            self._overlay.add_overlay(self._overlay_img)
+
+    def lightbox_off(self):
+        self._overlay_depth -= 1
+        if self._overlay_depth == 0 and self._overlay_img:
+            # Remove the overlay image
+            self._overlay_img.destroy()
+            self._overlay_img = None
+
+    @contextmanager
+    def enlightbox(self, dialog):
+        """Display a dialog in a lightbox over the main window.
+
+           :param GtkDialog: the dialog to display
+        """
+        self.lightbox_on()
+
+        # Set the dialog as transient for ourself
+        ANACONDA_WINDOW_GROUP.add_window(dialog)
+        dialog.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
+        dialog.set_transient_for(self)
+
+        yield
+
+        self.lightbox_off()
+
 class GraphicalUserInterface(UserInterface):
     """This is the standard GTK+ interface we try to steer everything to using.
        It is suitable for use both directly and via VNC.
     """
     def __init__(self, storage, payload, instclass,
                  distributionText = product.distributionText, isFinal = product.isFinal,
-                 quitDialog = QuitDialog):
+                 quitDialog = QuitDialog, gui_lock = None):
 
         UserInterface.__init__(self, storage, payload, instclass)
 
         self._actions = []
         self._currentAction = None
         self._ui = None
+        self._gui_lock = gui_lock
 
         self.data = None
 
+        self.mainWindow = MainWindow()
+
         self._distributionText = distributionText
         self._isFinal = isFinal
         self._quitDialog = quitDialog
         self._mehInterface = GraphicalExceptionHandlingIface(
-                                    self.lightbox_over_current_action)
+                                    self.mainWindow.lightbox_on)
 
-    basemask = "pyanaconda.ui.gui"
+        ANACONDA_WINDOW_GROUP.add_window(self.mainWindow)
+        # we have a sensible initial value, just in case
+        self._saved_help_button_label = _("Help!")
+
+    basemask = "pyanaconda.ui"
     basepath = os.path.dirname(__file__)
-    updatepath = "/tmp/updates/pyanaconda/ui/gui"
-    sitepackages = [os.path.join(dir, "pyanaconda", "ui", "gui")
+    updatepath = "/tmp/updates/pyanaconda/ui"
+    sitepackages = [os.path.join(dir, "pyanaconda", "ui")
                     for dir in site.getsitepackages()]
     pathlist = set([updatepath, basepath] + sitepackages)
 
@@ -512,17 +485,102 @@ class GraphicalUserInterface(UserInterface):
             "categories": [(basemask + ".categories.%s",
                         os.path.join(path, "categories"))
                         for path in pathlist],
-            "spokes": [(basemask + ".spokes.%s",
-                        os.path.join(path, "spokes"))
+            "spokes": [(basemask + ".gui.spokes.%s",
+                        os.path.join(path, "gui/spokes"))
                         for path in pathlist],
-            "hubs": [(basemask + ".hubs.%s",
-                      os.path.join(path, "hubs"))
+            "hubs": [(basemask + ".gui.hubs.%s",
+                      os.path.join(path, "gui/hubs"))
                       for path in pathlist]
             }
 
+    def _assureLogoImage(self):
+        # make sure there is a logo image present,
+        # otherwise the console will get spammed by errors
+        replacement_image_path = None
+        logo_path = "/usr/share/anaconda/pixmaps/sidebar-logo.png"
+        header_path = "/usr/share/anaconda/pixmaps/anaconda_header.png"
+        sad_smiley_path = "/usr/share/icons/Adwaita/48x48/emotes/face-crying.png"
+        if not os.path.exists(logo_path):
+            # first try to replace the missing logo with the Anaconda header image
+            if os.path.exists(header_path):
+                replacement_image_path = header_path
+            # if the header image is not present, use a sad smiley from GTK icons
+            elif os.path.exists(sad_smiley_path):
+                replacement_image_path = sad_smiley_path
+
+            if replacement_image_path:
+                log.warning("logo image is missing, using a substitute")
+
+                # Add a new stylesheet overriding the background-image for .logo
+                provider = Gtk.CssProvider()
+                provider.load_from_data(".logo { background-image: url('%s'); }" % replacement_image_path)
+                Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider,
+                        STYLE_PROVIDER_PRIORITY_MISSING_ICON)
+            else:
+                log.warning("logo image is missing")
+
+        # Look for the top and sidebar images. If missing remove the background-image
+        topbar_path = "/usr/share/anaconda/pixmaps/topbar-bg.png"
+        sidebar_path = "/usr/share/anaconda/pixmaps/sidebar-bg.png"
+        if not os.path.exists(topbar_path):
+            provider = Gtk.CssProvider()
+            provider.load_from_data("AnacondaSpokeWindow #nav-box { background-image: none; }")
+            Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider,
+                    STYLE_PROVIDER_PRIORITY_MISSING_ICON)
+
+        if not os.path.exists(sidebar_path):
+            provider = Gtk.CssProvider()
+            provider.load_from_data(".logo-sidebar { background-image: none; }")
+            Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider,
+                    STYLE_PROVIDER_PRIORITY_MISSING_ICON)
+
+
+    def _widgetScale(self):
+        # First, check if the GDK_SCALE environment variable is already set. If so,
+        # leave it alone.
+        if "GDK_SCALE" in os.environ:
+            log.debug("GDK_SCALE already set to %s, not scaling", os.environ["GDK_SCALE"])
+            return
+
+        # Next, check if a scaling factor is already being applied via XSETTINGS,
+        # such as by gnome-settings-daemon
+        display = Gdk.Display.get_default()
+        screen = display.get_default_screen()
+        val = GObject.Value()
+        val.init(GObject.TYPE_INT)
+        if screen.get_setting("gdk-window-scaling-factor", val):
+            log.debug("Window scale set to %s by XSETTINGS, not scaling", val.get_int())
+            return
+
+        # Get the primary monitor dimensions in pixels and mm from Gdk
+        primary = screen.get_primary_monitor()
+        monitor_geometry = screen.get_monitor_geometry(primary)
+        monitor_scale = screen.get_monitor_scale_factor(primary)
+        monitor_width_mm = screen.get_monitor_width_mm(primary)
+        monitor_height_mm = screen.get_monitor_height_mm(primary)
+
+        # Sometimes gdk returns 0 for physical widths and heights
+        if monitor_height_mm == 0 or monitor_width_mm == 0:
+            return
+
+        # Check if this monitor is high DPI, using heuristics from gnome-settings-dpi.
+        # If the monitor has a height >= 1200 pixels and a resolution > 192 dpi in both
+        # x and y directions, apply a scaling factor of 2 so that anaconda isn't all tiny
+        monitor_width_px = monitor_geometry.width * monitor_scale
+        monitor_height_px = monitor_geometry.height * monitor_scale
+        monitor_dpi_x = monitor_width_px / (monitor_width_mm / 25.4)
+        monitor_dpi_y = monitor_height_px / (monitor_height_mm / 25.4)
+
+        log.debug("Detected primary monitor: %dx%d %ddpix %ddpiy", monitor_width_px,
+                monitor_height_px, monitor_dpi_x, monitor_dpi_y)
+        if monitor_height_px >= 1200 and monitor_dpi_x > 192 and monitor_dpi_y > 192:
+            display.set_window_scale(2)
+            # Export the scale so that Gtk programs launched by anaconda are also scaled
+            os.environ["GDK_SCALE"] = "2"
+
     @property
     def tty_num(self):
-        return 7
+        return 6
 
     @property
     def meh_interface(self):
@@ -557,22 +615,7 @@ class GraphicalUserInterface(UserInterface):
         # Second, order them according to their relationship
         return self._orderActionClasses(standalones, hubs)
 
-    def lightbox_over_current_action(self, window):
-        """
-        Creates lightbox over current action for the given window. Or
-        DOES NOTHING IF THERE ARE NO ACTIONS.
-
-        """
-
-        # if there are no actions (not populated yet), we can do nothing
-        if len(self._actions) > 0 and self._currentAction:
-            lightbox = AnacondaWidgets.Lightbox(parent_window=self._currentAction.window)
-            ANACONDA_WINDOW_GROUP.add_window(lightbox)
-            window.main_window.set_transient_for(lightbox)
-
     def _instantiateAction(self, actionClass):
-        from pyanaconda.ui.gui.spokes import StandaloneSpoke
-
         # Instantiate an action on-demand, passing the arguments defining our
         # spoke API and setting up continue/quit signal handlers.
         obj = actionClass(self.data, self.storage, self.payload, self.instclass)
@@ -589,8 +632,11 @@ class GraphicalUserInterface(UserInterface):
             del(obj)
             return None
 
-        obj.register_event_cb("continue", self._on_continue_clicked)
-        obj.register_event_cb("quit", self._on_quit_clicked)
+        # Use connect_after so classes can add actions before we change screens
+        obj.window.connect_after("continue-clicked", self._on_continue_clicked)
+        obj.window.connect_after("help-button-clicked", self._on_help_clicked, obj)
+        self.mainWindow.connect("notify::mnemonics-visible", self._on_mnemonics_visible_changed, obj)
+        obj.window.connect_after("quit-clicked", self._on_quit_clicked)
 
         return obj
 
@@ -599,7 +645,8 @@ class GraphicalUserInterface(UserInterface):
         if not success:
             raise RuntimeError("Failed to initialize Gtk")
 
-        if Gtk.main_level() > 0:
+        # Check if the GUI lock has already been taken
+        if self._gui_lock and not self._gui_lock.acquire(False):
             # Gtk main loop running. That means python-meh caught exception
             # and runs its main loop. Do not crash Gtk by running another one
             # from a different thread and just wait until python-meh is
@@ -607,10 +654,13 @@ class GraphicalUserInterface(UserInterface):
             unbusyCursor()
             log.error("Unhandled exception caught, waiting for python-meh to "\
                       "exit")
-            while Gtk.main_level() > 0:
-                time.sleep(2)
 
-            sys.exit(0)
+            # Loop forever, meh will call sys.exit() when it's done
+            while True:
+                time.sleep(10000)
+
+        # Apply a widget-scale to hidpi monitors
+        self._widgetScale()
 
         while not self._currentAction:
             self._currentAction = self._instantiateAction(self._actions[0])
@@ -621,6 +671,7 @@ class GraphicalUserInterface(UserInterface):
                 return
 
         self._currentAction.initialize()
+        self._currentAction.entry_logger()
         self._currentAction.refresh()
 
         self._currentAction.window.set_beta(not self._isFinal)
@@ -637,7 +688,19 @@ class GraphicalUserInterface(UserInterface):
         Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider,
                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 
-        self._currentAction.window.show_all()
+        # Look for updates to the stylesheet and apply them at a higher priority
+        for updates_dir in ("updates", "product"):
+            updates_css = "/run/install/%s/anaconda-gtk.css" % updates_dir
+            if os.path.exists(updates_css):
+                provider = Gtk.CssProvider()
+                provider.load_from_path(updates_css)
+                Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider,
+                        STYLE_PROVIDER_PRIORITY_UPDATES)
+
+        # try to make sure a logo image is present
+        self._assureLogoImage()
+
+        self.mainWindow.setCurrentAction(self._currentAction)
 
         # Do this at the last possible minute.
         unbusyCursor()
@@ -649,16 +712,15 @@ class GraphicalUserInterface(UserInterface):
     ###
     @gtk_action_wait
     def showError(self, message):
-        dlg = Gtk.MessageDialog(flags=Gtk.DialogFlags.MODAL,
-                                message_type=Gtk.MessageType.ERROR,
-                                buttons=Gtk.ButtonsType.NONE,
-                                message_format=message)
-        dlg.set_decorated(False)
-        dlg.add_button(_("_Exit Installer"), 0)
+        dlg = ErrorDialog(None)
 
-        with enlightbox(self._currentAction.window, dlg):
+        with self.mainWindow.enlightbox(dlg.window):
+            dlg.refresh(message)
             dlg.run()
-            dlg.destroy()
+            dlg.window.destroy()
+
+        # the dialog has the only button -- "Exit installer", so just do so
+        sys.exit(1)
 
     @gtk_action_wait
     def showDetailedError(self, message, details):
@@ -666,7 +728,7 @@ class GraphicalUserInterface(UserInterface):
         dlg = DetailedErrorDialog(None, buttons=[_("_Quit")],
                                   label=message)
 
-        with enlightbox(self._currentAction.window, dlg.window):
+        with self.mainWindow.enlightbox(dlg.window):
             dlg.refresh(details)
             rc = dlg.run()
             dlg.window.destroy()
@@ -681,7 +743,7 @@ class GraphicalUserInterface(UserInterface):
         dlg.add_buttons(_("_No"), 0, _("_Yes"), 1)
         dlg.set_default_response(1)
 
-        with enlightbox(self._currentAction.window, dlg):
+        with self.mainWindow.enlightbox(dlg):
             rc = dlg.run()
             dlg.destroy()
 
@@ -690,7 +752,10 @@ class GraphicalUserInterface(UserInterface):
     ###
     ### SIGNAL HANDLING METHODS
     ###
-    def _on_continue_clicked(self):
+    def _on_continue_clicked(self, win, user_data=None):
+        if not win.get_may_continue():
+            return
+
         # If we're on the last screen, clicking Continue quits.
         if len(self._actions) == 1:
             Gtk.main_quit()
@@ -734,25 +799,50 @@ class GraphicalUserInterface(UserInterface):
         if not nextAction.showable:
             self._currentAction.window.hide()
             self._actions.pop(0)
-            self._on_continue_clicked()
+            self._on_continue_clicked(nextAction)
             return
 
+        self._currentAction.exit_logger()
+        nextAction.entry_logger()
+
         nextAction.refresh()
 
         # Do this last.  Setting up curAction could take a while, and we want
         # to leave something on the screen while we work.
-        nextAction.window.show_all()
-        self._currentAction.window.hide()
+        self.mainWindow.setCurrentAction(nextAction)
         self._currentAction = nextAction
         self._actions.pop(0)
 
-    def _on_quit_clicked(self):
+    def _on_help_clicked(self, window, obj):
+        # the help button has been clicked, start the yelp viewer with
+        # content for the current screen
+        ihelp.start_yelp(ihelp.get_help_path(obj.helpFile, self.instclass))
+
+    def _on_mnemonics_visible_changed(self, window, property, obj):
+        # mnemonics display has been activated or deactivated,
+        # add or remove the F1 mnemonics display from the help button
+        help_button = obj.window.get_help_button()
+        if window.props.mnemonics_visible:
+            # save current label
+            old_label = help_button.get_label()
+            self._saved_help_button_label = old_label
+            # add the (F1) "mnemonics" to the help button
+            help_button.set_label("%s (F1)" % old_label)
+        else:
+            # restore the old label
+            help_button.set_label(self._saved_help_button_label)
+
+    def _on_quit_clicked(self, win, userData=None):
+        if not win.get_quit_button():
+            return
+
         dialog = self._quitDialog(None)
-        with enlightbox(self._currentAction.window, dialog.window):
+        with self.mainWindow.enlightbox(dialog.window):
             rc = dialog.run()
             dialog.window.destroy()
 
         if rc == 1:
+            self._currentAction.exit_logger()
             sys.exit(0)
 
 class GraphicalExceptionHandlingIface(meh.ui.gui.GraphicalIntf):
@@ -766,7 +856,7 @@ class GraphicalExceptionHandlingIface(meh.ui.gui.GraphicalIntf):
         """
         :param lightbox_func: a function that creates lightbox for a given
                               window
-        :type lightbox_func: GtkWindow -> None
+        :type lightbox_func: None -> None
 
         """
         meh.ui.gui.GraphicalIntf.__init__(self)
@@ -778,32 +868,11 @@ class GraphicalExceptionHandlingIface(meh.ui.gui.GraphicalIntf):
         exc_window = meh_intf.mainExceptionWindow(text, exn_file)
         exc_window.main_window.set_decorated(False)
 
-        self._lightbox_func(exc_window)
+        self._lightbox_func()
 
-        # without a new GtkWindowGroup, python-meh's window is insensitive if it
-        # appears above a spoke (Gtk.Window running its own Gtk.main loop)
-        window_group = Gtk.WindowGroup()
-        window_group.add_window(exc_window.main_window)
+        ANACONDA_WINDOW_GROUP.add_window(exc_window.main_window)
 
         # the busy cursor may be set
         unbusyCursor()
 
         return exc_window
-
-def check_re(editable, data):
-    """Perform an input validation check against a regular expression.
-
-       :param editable: The input field being checked
-       :type editable:  GtkEditable
-
-       :param data: The check_data set in add_check. This data must
-                    be a dictionary that includes the keys
-                    'regex' and 'message'.
-       :type data:  dict
-
-       :returns: error_data if the check fails, otherwise GUICheck.CHECK_OK.
-    """
-    if data['regex'].match(editable.get_text()):
-        return GUICheck.CHECK_OK
-    else:
-        return data['message']
diff --git a/anaconda/pyanaconda/ui/gui/helpers.py b/anaconda/pyanaconda/ui/gui/helpers.py
new file mode 100644
index 0000000..11b4b15
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/helpers.py
@@ -0,0 +1,124 @@
+# Abstract base classes for GUI classes
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dshea@redhat.com>
+#
+
+# This file contains abstract base classes that are specific to GUI
+# functionality. See also pyanaconda.ui.helpers.
+
+from abc import ABCMeta, abstractproperty, abstractmethod
+from gi.repository import Gtk
+
+from pyanaconda.ui.helpers import InputCheck, InputCheckHandler
+
+# Inherit abstract methods from InputCheckHandler
+# pylint: disable=abstract-method
+class GUIInputCheckHandler(InputCheckHandler):
+    """Provide InputCheckHandler functionality for Gtk input screens.
+
+       This class assumes that all input objects are of type GtkEditable and
+       attaches InputCheck.update_check_status to the changed signal.
+    """
+
+    __metaclass__ = ABCMeta
+
+    def _update_check_status(self, editable, inputcheck):
+        inputcheck.update_check_status()
+
+    def get_input(self, input_obj):
+        return input_obj.get_text()
+
+    def add_check(self, input_obj, run_check, data=None):
+        checkRef = InputCheckHandler.add_check(self, input_obj, run_check, data)
+        input_obj.connect_after("changed", self._update_check_status, checkRef)
+        return checkRef
+
+class GUIDialogInputCheckHandler(GUIInputCheckHandler):
+    """Provide InputCheckHandler functionality for Gtk dialogs.
+
+       This class provides a helper method for setting an error message
+       on an entry field. Implementors of this class must still provide
+       a set_status method in order to control the sensitivty of widgets or
+       ignore activated signals.
+    """
+
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def set_status(self, inputcheck):
+        if inputcheck.check_status in (InputCheck.CHECK_OK, InputCheck.CHECK_SILENT):
+            inputcheck.input_obj.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
+            inputcheck.input_obj.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, "")
+        else:
+            inputcheck.input_obj.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
+                    "dialog-error")
+            inputcheck.input_obj.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY,
+                inputcheck.check_status)
+
+class GUISpokeInputCheckHandler(GUIInputCheckHandler):
+    """Provide InputCheckHandler functionality for graphical spokes.
+
+       This class implements set_status to set a message in the warning area of
+       the spoke window and provides an implementation of on_back_clicked to
+       prevent the user from exiting a spoke with bad input.
+    """
+
+    __metaclass__ = ABCMeta
+
+    def set_status(self, inputcheck):
+        """Update the warning with the input validation error from the first
+           error message.
+        """
+        failed_check = next(self.failed_checks_with_message, None)
+
+        self.clear_info()
+        if failed_check:
+            self.set_warning(failed_check.check_status)
+            self.window.show_all()
+
+    # Implemented by GUIObject
+    @abstractmethod
+    def clear_info(self):
+        pass
+
+    # Implemented by GUIObject
+    @abstractmethod
+    def set_warning(self, msg):
+        pass
+
+    # Implemented by GUIObject
+    @abstractproperty
+    def window(self):
+        pass
+
+    @abstractmethod
+    def on_back_clicked(self, window):
+        """Check whether the input validation checks allow the spoke to be exited.
+
+           Unlike NormalSpoke.on_back_clicked, this function returns a boolean value.
+           Classes implementing this class should run GUISpokeInputCheckHandler.on_back_clicked,
+           and if it succeeded, run NormalSpoke.on_back_clicked.
+        """
+        failed_check = next(self.failed_checks, None)
+
+        if failed_check:
+            failed_check.input_obj.grab_focus()
+            return False
+        else:
+            return True
diff --git a/anaconda/pyanaconda/ui/gui/hubs/__init__.py b/anaconda/pyanaconda/ui/gui/hubs/__init__.py
index 0cc7d21..88c52bb 100644
--- a/anaconda/pyanaconda/ui/gui/hubs/__init__.py
+++ b/anaconda/pyanaconda/ui/gui/hubs/__init__.py
@@ -24,14 +24,13 @@ import os
 from gi.repository import GLib
 
 from pyanaconda.flags import flags
-from pyanaconda.i18n import _
+from pyanaconda.i18n import _, C_
 from pyanaconda.product import distributionText
 
 from pyanaconda.ui import common
 from pyanaconda.ui.gui import GUIObject
-from pyanaconda.ui.gui.categories import collect_categories
-from pyanaconda.ui.gui.spokes import StandaloneSpoke, collect_spokes
-from pyanaconda.ui.gui.utils import gtk_call_once
+from pyanaconda.ui.gui.spokes import StandaloneSpoke
+from pyanaconda.ui.gui.utils import gtk_call_once, escape_markup
 from pyanaconda.constants import ANACONDA_ENVIRON
 
 import logging
@@ -82,7 +81,7 @@ class Hub(GUIObject, common.Hub):
                            selections and default partitioning.
         """
         GUIObject.__init__(self, data)
-        common.Hub.__init__(self, data, storage, payload, instclass)
+        common.Hub.__init__(self, storage, payload, instclass)
 
         # enable the autoContinue feature if we are in kickstart
         # mode, but if the user interacts with the hub, it will be
@@ -96,54 +95,6 @@ class Hub(GUIObject, common.Hub):
 
         self._checker = None
 
-    def _runSpoke(self, action):
-        from gi.repository import Gtk
-
-        # This duplicates code in widgets/src/BaseWindow.c, but we want to make sure
-        # maximize gets called every time a spoke is displayed to prevent the 25%
-        # UI from showing up.
-        action.window.maximize()
-        action.window.set_property("expand", True)
-
-        action.refresh()
-
-        action.window.set_transient_for(self.window)
-        action.window.show_all()
-
-        # Start a recursive main loop for this spoke, which will prevent
-        # signals from going to the underlying (but still displayed) Hub and
-        # prevent the user from switching away.  It's up to the spoke's back
-        # button handler to kill its own layer of main loop.
-        Gtk.main()
-        action.window.set_transient_for(None)
-
-        action._visitedSinceApplied = True
-
-        # Don't take _visitedSinceApplied into account here.  It will always be
-        # True from the line above.
-        if action.changed and (not action.skipTo or (action.skipTo and action.applyOnSkip)):
-            action.apply()
-            action.execute()
-            action._visitedSinceApplied = False
-
-    def _collectCategoriesAndSpokes(self):
-        """collects categories and spokes to be displayed on this Hub
-
-           :return: dictionary mapping category class to list of spoke classes
-           :rtype: dictionary[category class] -> [ list of spoke classes ]
-        """
-
-        ret = {}
-
-        # Collect all the categories this hub displays, then collect all the
-        # spokes belonging to all those categories.
-        categories = sorted(filter(lambda c: c.displayOnHub == self.__class__, collect_categories(self.paths["categories"])),
-                            key=lambda c: c.sortOrder)
-        for c in categories:
-            ret[c] = collect_spokes(self.paths["spokes"], c.__name__)
-
-        return ret
-
     def _createBox(self):
         from gi.repository import Gtk, AnacondaWidgets
         from pyanaconda.ui.gui.utils import setViewportBackground
@@ -151,11 +102,8 @@ class Hub(GUIObject, common.Hub):
         cats_and_spokes = self._collectCategoriesAndSpokes()
         categories = cats_and_spokes.keys()
 
-        grid = Gtk.Grid()
-        grid.set_row_spacing(6)
-        grid.set_column_spacing(6)
-        grid.set_column_homogeneous(True)
-        grid.set_margin_bottom(12)
+        grid = Gtk.Grid(row_spacing=6, column_spacing=6, column_homogeneous=True,
+                        margin_bottom=12)
 
         row = 0
 
@@ -197,7 +145,8 @@ class Hub(GUIObject, common.Hub):
                     spoke.initialize()
                     continue
 
-                spoke.selector = AnacondaWidgets.SpokeSelector(_(spoke.title), spoke.icon)
+                spoke.selector = AnacondaWidgets.SpokeSelector(C_("GUI|Spoke", spoke.title),
+                        spoke.icon)
 
                 # Set all selectors to insensitive before initialize runs.  The call to
                 # _updateCompleteness later will take care of setting it straight.
@@ -209,26 +158,23 @@ class Hub(GUIObject, common.Hub):
 
                 # Set some default values on the associated selector that
                 # affect its display on the hub.
-                self._updateCompleteness(spoke)
+                self._updateCompleteness(spoke, update_continue=False)
                 spoke.selector.connect("button-press-event", self._on_spoke_clicked, spoke)
                 spoke.selector.connect("key-release-event", self._on_spoke_clicked, spoke)
 
                 # If this is a kickstart install, attempt to execute any provided ksdata now.
                 if flags.automatedInstall and spoke.ready and spoke.changed and \
-                   spoke._visitedSinceApplied:
+                   spoke.visitedSinceApplied:
                     spoke.execute()
-                    spoke._visitedSinceApplied = False
+                    spoke.visitedSinceApplied = False
 
                 selectors.append(spoke.selector)
 
             if not selectors:
                 continue
 
-            label = Gtk.Label("<span font-desc=\"Sans 14\">%s</span>" % _(obj.title))
-            label.set_use_markup(True)
-            label.set_halign(Gtk.Align.START)
-            label.set_margin_top(12)
-            label.set_margin_bottom(12)
+            label = Gtk.Label(label="<span font-desc=\"Sans 14\">%s</span>" % escape_markup(_(obj.title)),
+                              use_markup=True, halign=Gtk.Align.START, margin_top=12, margin_bottom=12)
             grid.attach(label, 0, row, 2, 1)
             row += 1
 
@@ -252,11 +198,12 @@ class Hub(GUIObject, common.Hub):
         spokeArea.add(viewport)
 
         setViewportBackground(viewport)
+        self._updateContinue()
 
     def _updateCompleteness(self, spoke, update_continue=True):
-        spoke.selector.set_sensitive(spoke.ready)
+        spoke.selector.set_sensitive(spoke.sensitive and spoke.ready)
         spoke.selector.set_property("status", spoke.status)
-        spoke.selector.set_tooltip_markup(GLib.markup_escape_text(spoke.status))
+        spoke.selector.set_tooltip_markup(escape_markup(spoke.status))
         spoke.selector.set_incomplete(not spoke.completed and spoke.mandatory)
         self._handleCompleteness(spoke, update_continue)
 
@@ -293,10 +240,7 @@ class Hub(GUIObject, common.Hub):
         return len(self._incompleteSpokes) == 0 and len(self._notReadySpokes) == 0 and getattr(self._checker, "success", True)
 
     def _updateContinueButton(self):
-        if not self.continueButton:
-            return
-
-        self.continueButton.set_sensitive(self.continuePossible)
+        self.window.set_may_continue(self.continuePossible)
 
     def _update_spokes(self):
         from pyanaconda.ui.communication import hubQ
@@ -304,10 +248,10 @@ class Hub(GUIObject, common.Hub):
 
         q = hubQ.q
 
-        if not self._spokes and self.continueButton:
+        if not self._spokes and self.window.get_may_continue():
             # no spokes, move on
             log.info("no spokes available on %s, continuing automatically", self)
-            gtk_call_once(self.continueButton.emit, "clicked")
+            gtk_call_once(self.window.emit, "continue-clicked")
 
         click_continue = False
         # Grab all messages that may have appeared since last time this method ran.
@@ -350,9 +294,9 @@ class Hub(GUIObject, common.Hub):
                     # _createBox skipped.  Now that it's become ready, do it.  Note
                     # that we also provide a way to skip this processing (see comments
                     # communication.py) to prevent getting caught in a loop.
-                    if not args[1] and spoke.changed and spoke._visitedSinceApplied:
+                    if not args[1] and spoke.changed and spoke.visitedSinceApplied:
                         spoke.execute()
-                        spoke._visitedSinceApplied = False
+                        spoke.visitedSinceApplied = False
 
                     if self.continuePossible:
                         if self._inSpoke:
@@ -367,10 +311,10 @@ class Hub(GUIObject, common.Hub):
             q.task_done()
 
         # queue is now empty, should continue be clicked?
-        if self._autoContinue and click_continue and self.continueButton:
+        if self._autoContinue and click_continue and self.window.get_may_continue():
             # enqueue the emit to the Gtk message queue
             log.info("_autoContinue clicking continue button")
-            gtk_call_once(self.continueButton.emit, "clicked")
+            gtk_call_once(self.window.emit, "continue-clicked")
 
         return True
 
@@ -380,22 +324,8 @@ class Hub(GUIObject, common.Hub):
 
         GLib.timeout_add(100, self._update_spokes)
 
-    @property
-    def continueButton(self):
-        return None
-
-    @property
-    def quitButton(self):
-        return None
-
     ### SIGNAL HANDLERS
 
-    def register_event_cb(self, event, cb):
-        if event == "continue" and self.continueButton:
-            self.continueButton.connect("clicked", lambda *args: cb())
-        elif event == "quit" and self.quitButton:
-            self.quitButton.connect("clicked", lambda *args: cb())
-
     def _on_spoke_clicked(self, selector, event, spoke):
         from gi.repository import Gdk
 
@@ -419,9 +349,25 @@ class Hub(GUIObject, common.Hub):
         # autoContinue feature and wait for the user to explicitly state
         # that he is done configuring by pressing the continue button.
         self._autoContinue = False
-        
+
+        # Enter the spoke
         self._inSpoke = True
-        self._runSpoke(spoke)
+        spoke.entry_logger()
+        spoke.refresh()
+        self.main_window.enterSpoke(spoke)
+
+    def spoke_done(self, spoke):
+        spoke.visitedSinceApplied = True
+
+        # Don't take visitedSinceApplied into account here.  It will always be
+        # True from the line above.
+        if spoke.changed and (not spoke.skipTo or (spoke.skipTo and spoke.applyOnSkip)):
+            spoke.apply()
+            spoke.execute()
+            spoke.visitedSinceApplied = False
+
+        spoke.exit_logger()
+
         self._inSpoke = False
 
         # Now update the selector with the current status and completeness.
@@ -440,5 +386,7 @@ class Hub(GUIObject, common.Hub):
             spoke.skipTo = None
 
             self._on_spoke_clicked(self._spokes[dest].selector, None, self._spokes[dest])
-
+        # Otherwise, switch back to the hub (that's us!)
+        else:
+            self.main_window.returnToHub()
 
diff --git a/anaconda/pyanaconda/ui/gui/hubs/progress.glade b/anaconda/pyanaconda/ui/gui/hubs/progress.glade
index cb52685..f459ce0 100644
--- a/anaconda/pyanaconda/ui/gui/hubs/progress.glade
+++ b/anaconda/pyanaconda/ui/gui/hubs/progress.glade
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="AnacondaWidgets" version="3.0"/>
   <object class="AnacondaHubWindow" id="progressWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">CONFIGURATION</property>
+    <property name="continue_button">rebootButton</property>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaHubWindow-main_box1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaHubWindow-nav_box1">
+            <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaHubWindow-nav_area1">
                 <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -126,19 +130,19 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">end</property>
-                                <property name="label" translatable="yes">%s is now successfully installed on your system, but some configuration still needs to be done.  Finish it and then click the Finish configuration button please.</property>
+                                <property name="label">%s is now successfully installed, but some configuration still needs to be done.
+Finish it and then click the Finish configuration button please.</property>
+                                <property name="justify">right</property>
                                 <property name="wrap">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="configureButton">
-                                <property name="label" translatable="yes">_Finish configuration</property>
+                                <property name="label" translatable="yes" context="GUI|Progress">_Finish configuration</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -146,15 +150,15 @@
                                 <property name="halign">end</property>
                                 <property name="valign">end</property>
                                 <property name="hexpand">True</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <signal name="clicked" handler="_do_configuration" swapped="no"/>
+                                <style>
+                                  <class name="suggested-action"/>
+                                </style>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -179,19 +183,19 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">end</property>
-                                <property name="label" translatable="yes">%s is now successfully installed on your system and ready for you to use!  Go ahead and reboot to start using it!</property>
+                                <property name="label">%s is now successfully installed and ready for you to use!
+Go ahead and reboot to start using it!</property>
+                                <property name="justify">right</property>
                                 <property name="wrap">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="rebootButton">
-                                <property name="label" translatable="yes">_Reboot</property>
+                                <property name="label" translatable="yes" context="GUI|Progress">_Reboot</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -199,14 +203,14 @@
                                 <property name="halign">end</property>
                                 <property name="valign">end</property>
                                 <property name="hexpand">True</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <style>
+                                  <class name="suggested-action"/>
+                                </style>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -248,5 +252,10 @@
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="progressWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">CONFIGURATION</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/hubs/progress.py b/anaconda/pyanaconda/ui/gui/hubs/progress.py
index 79daeee..95883ba 100644
--- a/anaconda/pyanaconda/ui/gui/hubs/progress.py
+++ b/anaconda/pyanaconda/ui/gui/hubs/progress.py
@@ -1,6 +1,6 @@
 # Progress hub classes
 #
-# Copyright (C) 2011-2012  Red Hat, Inc.
+# Copyright (C) 2011-2013  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -28,7 +28,7 @@ import os
 import sys
 import glob
 
-from pyanaconda.i18n import _
+from pyanaconda.i18n import _, C_
 from pyanaconda.localization import find_best_locale_match
 from pyanaconda.product import productName
 from pyanaconda.flags import flags
@@ -44,6 +44,7 @@ class ProgressHub(Hub):
     builderObjects = ["progressWindow"]
     mainWidgetName = "progressWindow"
     uiFile = "hubs/progress.glade"
+    helpFile = "ProgressHub.xml"
 
     def __init__(self, data, storage, payload, instclass):
         Hub.__init__(self, data, storage, payload, instclass)
@@ -102,15 +103,19 @@ class ProgressHub(Hub):
             elif code == progressQ.PROGRESS_CODE_MESSAGE:
                 self._update_progress_message(args[0])
             elif code == progressQ.PROGRESS_CODE_COMPLETE:
-                # There shouldn't be any more progress bar updates, so return False
-                # to indicate this method should be removed from the idle loop.  Also,
-                # stop the rnotes cycling and display the finished message.
-                self._progress_bar_complete()
                 q.task_done()
 
+                # we are done, stop the progress indication
+                gtk_call_once(self._progressBar.set_fraction, 1.0)
+                gtk_call_once(self._progressLabel.set_text, _("Complete!"))
+                gtk_call_once(self._spinner.stop)
+                gtk_call_once(self._spinner.hide)
+
                 if callback:
                     callback()
 
+                # There shouldn't be any more progress bar updates, so return False
+                # to indicate this method should be removed from the idle loop.
                 return False
             elif code == progressQ.PROGRESS_CODE_QUIT:
                 sys.exit(args[0])
@@ -129,8 +134,7 @@ class ProgressHub(Hub):
 
         # kickstart install, continue automatically if reboot or shutdown selected
         if flags.automatedInstall and self.data.reboot.action in [KS_REBOOT, KS_SHUTDOWN]:
-            self.continueButton.emit("clicked")
-
+            self.window.emit("continue-clicked")
 
     def _install_done(self):
         # package installation done, check personalization spokes
@@ -144,6 +148,11 @@ class ProgressHub(Hub):
             GLib.source_remove(self._rnotes_id)
             self._progressNotebook.set_current_page(0)
 
+    def _do_globs(self, path):
+        return glob.glob(path + "/*.png") + \
+               glob.glob(path + "/*.jpg") + \
+               glob.glob(path + "/*.svg")
+
     def _get_rnotes(self):
         # We first look for rnotes in paths containing the language, then in
         # directories without the language component.  You know, just in case.
@@ -154,7 +163,7 @@ class ProgressHub(Hub):
 
         all_lang_pixmaps = []
         for path in paths:
-            all_lang_pixmaps += glob.glob(path + "*/*.png") + glob.glob(path + "*/*.jpg")
+            all_lang_pixmaps += self._do_globs(path + "/*")
 
         pixmap_langs = [pixmap.split(os.path.sep)[-2] for pixmap in all_lang_pixmaps]
         best_lang = find_best_locale_match(os.environ["LANG"], pixmap_langs)
@@ -167,14 +176,13 @@ class ProgressHub(Hub):
             # nothing found even for the default language, try non-localized rnotes
             non_localized = []
             for path in paths:
-                non_localized += glob.glob(path + "*.png") + glob.glob(path + "*.jpg")
+                non_localized += self._do_globs(path)
 
             return non_localized
 
         best_lang_pixmaps = []
         for path in paths:
-            best_lang_pixmaps += (glob.glob(path + best_lang + "/*.png") +
-                                  glob.glob(path + best_lang + "/*.jpg"))
+            best_lang_pixmaps += self._do_globs(path + best_lang)
 
         return best_lang_pixmaps
 
@@ -183,7 +191,7 @@ class ProgressHub(Hub):
         # image's filename.  Note that self._rnotesPages is an infinite list,
         # so this will cycle through the images indefinitely.
         try:
-            nxt = self._rnotesPages.next()
+            nxt = next(self._rnotesPages)
         except StopIteration:
             # there are no rnotes
             pass
@@ -200,19 +208,25 @@ class ProgressHub(Hub):
             continueText.set_text(_("%s is now successfully installed on your system and ready "
                                     "for you to use!  When you are ready, reboot your system to start using it!"))
             continueText.set_line_wrap(True)
-            self.continueButton.set_label(_("_Quit"))
+            self.window.get_continue_button().set_label(C_("GUI|Progress", "_Quit"))
 
         self._progressBar = self.builder.get_object("progressBar")
         self._progressLabel = self.builder.get_object("progressLabel")
         self._progressNotebook = self.builder.get_object("progressNotebook")
+        self._spinner = self.builder.get_object("progressSpinner")
 
         lbl = self.builder.get_object("configurationLabel")
-        lbl.set_text(lbl.get_text() % productName)
+        lbl.set_text(_("%s is now successfully installed, but some configuration still needs to be done.\n"
+            "Finish it and then click the Finish configuration button please.") %
+            productName)
 
         lbl = self.builder.get_object("rebootLabel")
-        lbl.set_text(lbl.get_text() % productName)
+        lbl.set_text(_("%s is now successfully installed and ready for you to use!\n"
+                "Go ahead and reboot to start using it!") % productName)
 
         rnotes = self._get_rnotes()
+        # Get the start of the pages we're about to add to the notebook
+        rnotes_start = self._progressNotebook.get_n_pages()
         if rnotes:
             # Add a new page in the notebook for each ransom note image.
             for f in rnotes:
@@ -221,14 +235,15 @@ class ProgressHub(Hub):
                 self._progressNotebook.append_page(img, None)
 
             # An infinite list of the page numbers containing ransom notes images.
-            self._rnotesPages = itertools.cycle(range(2, self._progressNotebook.get_n_pages()-2))
+            self._rnotesPages = itertools.cycle(range(rnotes_start,
+                self._progressNotebook.get_n_pages()))
         else:
             # Add a blank page to the notebook and we'll just cycle to that
             # over and over again.
             blank = Gtk.Box()
             blank.show()
             self._progressNotebook.append_page(blank, None)
-            self._rnotesPages = itertools.cycle([2])
+            self._rnotesPages = itertools.cycle([rnotes_start])
 
     def refresh(self):
         from pyanaconda.install import doInstall
@@ -243,14 +258,10 @@ class ProgressHub(Hub):
 
     def _updateContinueButton(self):
         if self._configurationDone:
-            self.continueButton.set_sensitive(self.continuePossible)
+            self.window.set_may_continue(self.continuePossible)
         else:
             self.builder.get_object("configureButton").set_sensitive(self.continuePossible)
 
-    @property
-    def continueButton(self):
-        return self.builder.get_object("rebootButton")
-
     def _init_progress_bar(self, steps):
         self._totalSteps = steps
         self._currentStep = 0
@@ -272,15 +283,5 @@ class ProgressHub(Hub):
 
     @gtk_action_nowait
     def _restart_spinner(self):
-        spinner = self.builder.get_object("progressSpinner")
-        spinner.show()
-        spinner.start()
-
-    @gtk_action_nowait
-    def _progress_bar_complete(self):
-        self._progressBar.set_fraction(1.0)
-        self._progressLabel.set_text(_("Complete!"))
-
-        spinner = self.builder.get_object("progressSpinner")
-        spinner.stop()
-        spinner.hide()
+        self._spinner.show()
+        self._spinner.start()
diff --git a/anaconda/pyanaconda/ui/gui/hubs/summary.glade b/anaconda/pyanaconda/ui/gui/hubs/summary.glade
index a553102..8588791 100644
--- a/anaconda/pyanaconda/ui/gui/hubs/summary.glade
+++ b/anaconda/pyanaconda/ui/gui/hubs/summary.glade
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="AnacondaWidgets" version="3.0"/>
   <object class="AnacondaHubWindow" id="summaryWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
-    <property name="mnemonics_visible">False</property>
-    <property name="focus_visible">False</property>
     <property name="window_name" translatable="yes">INSTALLATION SUMMARY</property>
+    <property name="quit_button">quitButton</property>
+    <property name="continue_button">continueButton</property>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaHubWindow-main_box1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaHubWindow-nav_box1">
+            <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaHubWindow-nav_area1">
                 <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -35,7 +38,6 @@
             <property name="can_focus">False</property>
             <property name="yalign">0</property>
             <property name="xscale">0.5</property>
-            <property name="yscale">1.0</property>
             <child internal-child="action_area">
               <object class="GtkBox" id="summaryWindow-actionArea">
                 <property name="can_focus">False</property>
@@ -71,16 +73,16 @@
             <property name="can_focus">False</property>
             <property name="margin_left">6</property>
             <property name="margin_right">6</property>
+            <property name="spacing">12</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="quitButton">
-                <property name="label" translatable="yes">_Quit</property>
+                <property name="label" translatable="yes" context="GUI|Summary">_Quit</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">start</property>
                 <property name="hexpand">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -91,18 +93,20 @@
             </child>
             <child>
               <object class="GtkButton" id="continueButton">
-                <property name="label" translatable="yes">_Begin Installation</property>
+                <property name="label" translatable="yes" context="GUI|Summary">_Begin Installation</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -117,13 +121,13 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">1</property>
             <property name="margin_right">6</property>
             <property name="margin_bottom">6</property>
-            <property name="label" translatable="yes">We won't touch your disks until you hit this button.</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">We won't touch your disks until you click 'Begin Installation'.</property>
             <attributes>
               <attribute name="font-desc" value="Cantarell Italic"/>
-              <attribute name="foreground" value="grey"/>
+              <attribute name="foreground" value="#808080808080"/>
             </attributes>
           </object>
           <packing>
@@ -134,5 +138,10 @@
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="summaryWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">INSTALLATION SUMMARY</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/hubs/summary.py b/anaconda/pyanaconda/ui/gui/hubs/summary.py
index fe7eeb1..a967092 100644
--- a/anaconda/pyanaconda/ui/gui/hubs/summary.py
+++ b/anaconda/pyanaconda/ui/gui/hubs/summary.py
@@ -20,7 +20,8 @@
 #
 
 from pyanaconda.ui.gui.hubs import Hub
-from pyanaconda.ui.lib.space import FileSystemSpaceChecker
+from pyanaconda.ui.lib.space import FileSystemSpaceChecker, DirInstallSpaceChecker
+from pyanaconda.flags import flags
 
 __all__ = ["SummaryHub"]
 
@@ -28,6 +29,7 @@ class SummaryHub(Hub):
     builderObjects = ["summaryWindow"]
     mainWidgetName = "summaryWindow"
     uiFile = "hubs/summary.glade"
+    helpFile = "SummaryHub.xml"
 
     def __init__(self, data, storage, payload, instclass):
         """Create a new Hub instance.
@@ -53,12 +55,8 @@ class SummaryHub(Hub):
         """
         super(SummaryHub, self).__init__(data, storage, payload, instclass)
 
-        self._checker = FileSystemSpaceChecker(storage, payload)
+        if not flags.dirInstall:
+            self._checker = FileSystemSpaceChecker(storage, payload)
+        else:
+            self._checker = DirInstallSpaceChecker(storage, payload)
 
-    @property
-    def continueButton(self):
-        return self.builder.get_object("continueButton")
-
-    @property
-    def quitButton(self):
-        return self.builder.get_object("quitButton")
diff --git a/anaconda/pyanaconda/ui/gui/main.glade b/anaconda/pyanaconda/ui/gui/main.glade
index ab79345..3d3e2e6 100644
--- a/anaconda/pyanaconda/ui/gui/main.glade
+++ b/anaconda/pyanaconda/ui/gui/main.glade
@@ -1,6 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkTextBuffer" id="errorTextBuffer"/>
+  <object class="GtkDialog" id="errorDialog">
+    <property name="width_request">450</property>
+    <property name="height_request">350</property>
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox2">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="errorButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="exitButton">
+                <property name="label" translatable="yes">_Exit Installer</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTextView" id="errorTextView">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">word</property>
+                <property name="buffer">errorTextBuffer</property>
+                <property name="accepts_tab">False</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="errorDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Error</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">exitButton</action-widget>
+    </action-widgets>
+  </object>
   <object class="GtkDialog" id="quitDialog">
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
@@ -16,12 +91,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelButton">
-                <property name="label">gtk-no</property>
+                <property name="label" translatable="yes" context="GUI|Main">_No</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -31,12 +105,11 @@
             </child>
             <child>
               <object class="GtkButton" id="quitButton">
-                <property name="label">gtk-yes</property>
+                <property name="label" translatable="yes" context="GUI|Main">_Yes</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -62,8 +135,8 @@
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-quit</property>
-                <property name="icon-size">6</property>
+                <property name="icon_name">application-exit</property>
+                <property name="icon_size">6</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -97,5 +170,10 @@ installation process?</property>
       <action-widget response="0">cancelButton</action-widget>
       <action-widget response="1">quitButton</action-widget>
     </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="quitDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Quit</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/__init__.py b/anaconda/pyanaconda/ui/gui/spokes/__init__.py
index d0e56c5..f17b71c 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/__init__.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/__init__.py
@@ -20,95 +20,41 @@
 #                    Martin Sivak <msivak@redhat.com>
 
 from pyanaconda.ui import common
-from pyanaconda.ui.common import collect
 from pyanaconda.ui.gui import GUIObject
 import os.path
+from pyanaconda import ihelp
 
-__all__ = ["StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke",
-           "collect_spokes"]
+__all__ = ["StandaloneSpoke", "NormalSpoke"]
 
-class Spoke(GUIObject):
-    def __init__(self, data):
+# Inherit abstract methods from common.StandaloneSpoke
+# pylint: disable=abstract-method
+class StandaloneSpoke(GUIObject, common.StandaloneSpoke):
+    def __init__(self, data, storage, payload, instclass):
         GUIObject.__init__(self, data)
+        common.StandaloneSpoke.__init__(self, storage, payload, instclass)
 
-    def apply(self):
-        """Apply the selections made on this Spoke to the object's preset
-           data object.  This method must be provided by every subclass.
-        """
-        raise NotImplementedError
+        # Add a continue-clicked handler to save the data before leaving the window
+        self.window.connect("continue-clicked", self._on_continue_clicked)
 
-    @property
-    def completed(self):
-        """Has this spoke been visited and completed?  If not, a special warning
-           icon will be shown on the Hub beside the spoke, and a highlighted
-           message will be shown at the bottom of the Hub.  Installation will not
-           be allowed to proceed until all spokes are complete.
-        """
-        return False
-
-    def execute(self):
-        """Cause the data object to take effect on the target system.  This will
-           usually be as simple as calling one or more of the execute methods on
-           the data object.  This method does not need to be provided by all
-           subclasses.
-
-           This method will be called in two different places:  (1) Immediately
-           after initialize on kickstart installs.  (2) Immediately after apply
-           in all cases.
-        """
-        pass
-
-class StandaloneSpoke(Spoke, common.StandaloneSpoke):
-    def __init__(self, data, storage, payload, instclass):
-        Spoke.__init__(self, data)
-        common.StandaloneSpoke.__init__(self, data, storage, payload, instclass)
-
-    def _on_continue_clicked(self, cb):
+    def _on_continue_clicked(self, win, user_data=None):
         self.apply()
-        cb()
 
-    def register_event_cb(self, event, cb):
-        if event == "continue":
-            self.window.connect("continue-clicked", lambda *args: self._on_continue_clicked(cb))
-        elif event == "quit":
-            self.window.connect("quit-clicked", lambda *args: cb())
-
-class NormalSpoke(Spoke, common.NormalSpoke):
+# Inherit abstract methods from common.NormalSpoke
+# pylint: disable=abstract-method
+class NormalSpoke(GUIObject, common.NormalSpoke):
     def __init__(self, data, storage, payload, instclass):
-        Spoke.__init__(self, data)
-        common.NormalSpoke.__init__(self, data, storage, payload, instclass)
+        GUIObject.__init__(self, data)
+        common.NormalSpoke.__init__(self, storage, payload, instclass)
+
+        # Add a help handler
+        self.window.connect_after("help-button-clicked", self._on_help_clicked)
+
+    def _on_help_clicked(self, window):
+        # the help button has been clicked, start the yelp viewer with
+        # content for the current spoke
+        ihelp.start_yelp(ihelp.get_help_path(self.helpFile, self.instclass))
 
     def on_back_clicked(self, window):
-        from gi.repository import Gtk
-
-        # Look for failed checks
-        failed_check = next(self.failed_checks, None)
-        if failed_check:
-            # Set the focus to the first failed check and stay in the spoke
-            failed_check.editable.grab_focus()
-            return
-
-        self.window.hide()
-        Gtk.main_quit()
-
-class PersonalizationSpoke(Spoke, common.PersonalizationSpoke):
-    def __init__(self, data, storage, payload, instclass):
-        Spoke.__init__(self, data)
-        common.PersonalizationSpoke.__init__(self, data, storage, payload, instclass)
-
-def collect_spokes(mask_paths, category):
-    """Return a list of all spoke subclasses that should appear for a given
-       category. Look for them in files imported as module_path % basename(f)
-
-       :param mask_paths: list of mask, path tuples to search for classes
-       :type mask_paths: list of (mask, path)
-
-       :return: list of Spoke classes belonging to category
-       :rtype: list of Spoke classes
-
-    """
-    spokes = []
-    for mask, path in mask_paths:
-        spokes.extend(collect(mask, path, lambda obj: hasattr(obj, "category") and obj.category != None and obj.category.__name__ == category))
-        
-    return spokes
+        # Notify the hub that we're finished.
+        # The hub will be the current-action of the main window.
+        self.main_window.current_action.spoke_done(self)
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advanced_user.glade b/anaconda/pyanaconda/ui/gui/spokes/advanced_user.glade
index 05a352b..0063d9c 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/advanced_user.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/advanced_user.glade
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkAdjustment" id="gid">
+    <property name="lower">1000</property>
+    <property name="upper">4294967295</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="uid">
+    <property name="lower">1000</property>
+    <property name="upper">4294967295</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="advancedUserDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -14,14 +29,15 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
+            <property name="margin_top">12</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Advanced User">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -31,7 +47,7 @@
             </child>
             <child>
               <object class="GtkButton" id="save_button">
-                <property name="label" translatable="yes">_Save Changes</property>
+                <property name="label" translatable="yes" context="GUI|Advanced User">_Save Changes</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -75,40 +91,18 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">8</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Home Directory</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">16</property>
-                <property name="orientation">vertical</property>
+                <property name="margin_top">3</property>
                 <child>
-                  <object class="GtkCheckButton" id="c_home">
-                    <property name="label" translatable="yes">Create a _home directory for this user.</property>
+                  <object class="GtkLabel" id="l_home">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="margin_top">4</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="GUI|Advanced User">Home _directory:</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="_apply_checkboxes" swapped="no"/>
+                    <property name="mnemonic_widget">t_home</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -117,40 +111,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="box3">
+                  <object class="GtkEntry" id="t_home">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">42</property>
-                    <property name="margin_top">3</property>
-                    <child>
-                      <object class="GtkLabel" id="l_home">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Home _directory:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">t_home</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="t_home">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="margin_left">13</property>
-                        <property name="invisible_char">●</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="margin_left">8</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -160,9 +124,9 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -190,7 +154,7 @@
                 <property name="margin_top">3</property>
                 <child>
                   <object class="GtkCheckButton" id="c_uid">
-                    <property name="label" translatable="yes">Specify a _user ID manually:</property>
+                    <property name="label" translatable="yes" context="GUI|Advanced User">Specify a _user ID manually:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -202,13 +166,11 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="c_gid">
-                    <property name="label" translatable="yes">Specify a _group ID manually:</property>
+                    <property name="label" translatable="yes" context="GUI|Advanced User">Specify a _group ID manually:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -220,8 +182,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -238,8 +198,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -255,8 +213,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -284,20 +240,86 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box4">
+              <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">16</property>
-                <property name="margin_top">3</property>
-                <property name="orientation">vertical</property>
+                <property name="spacing">24</property>
                 <child>
-                  <object class="GtkLabel" id="label6">
+                  <object class="GtkBox" id="box5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Add user to the following groups:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">t_groups</property>
+                    <property name="margin_top">3</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes" context="GUI|Advanced User">_Add user to the following groups:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="t_groups">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="margin_top">3</property>
+                        <property name="invisible_char">●</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">3</property>
+                        <child>
+                          <object class="GtkLabel" id="label9">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Example:</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label7">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">5</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">wheel, my-team (1245), project-x (29935)</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -306,11 +328,50 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="t_groups">
+                  <object class="GtkBox" id="box6">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_top">3</property>
-                    <property name="invisible_char">●</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">3</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">Tip:</property>
+                        <attributes>
+                          <attribute name="style" value="italic"/>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="scale" value="0.90000000000000002"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">You may input a comma-separated list of group names and group IDs here. Groups that do not already exist will be created; specify their GID in parentheses. </property>
+                        <property name="wrap">True</property>
+                        <property name="width_chars">35</property>
+                        <property name="max_width_chars">35</property>
+                        <attributes>
+                          <attribute name="scale" value="0.90000000000000002"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -318,105 +379,11 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="groups_error">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">3</property>
-                    <child>
-                      <object class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">wheel, my-team (1245), project-x (29935)</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_top">3</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">You may input a comma-separated list of group names and group IDs here.
-Groups that do not already exist will be created; specify their GID in parentheses. </property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Example:</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label10">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_top">3</property>
-                        <property name="xalign">1</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Tip:</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">6</property>
+                <property name="position">5</property>
               </packing>
             </child>
           </object>
@@ -433,18 +400,4 @@ Groups that do not already exist will be created; specify their GID in parenthes
       <action-widget response="1">save_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="gid">
-    <property name="lower">1000</property>
-    <property name="upper">32535</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="uid">
-    <property name="lower">1000</property>
-    <property name="upper">32535</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advstorage/dasd.glade b/anaconda/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
new file mode 100644
index 0000000..791af79
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkDialog" id="dasdDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelButton">
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="use_underline">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="okButton">
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_OK</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="use_underline">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ADD DASD STORAGE TARGET</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkNotebook" id="dasdNotebook">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="show_tabs">False</property>
+                <property name="show_border">False</property>
+                <child>
+                  <object class="GtkGrid" id="configureGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">To use DASD disks, you must provide the device number.</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">3</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="deviceEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="invisible_char">?</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <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|DASD|Configure">_Device number:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">deviceEntry</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkNotebook" id="conditionNotebook">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="show_tabs">False</property>
+                        <property name="show_border">False</property>
+                        <child>
+                          <object class="GtkButton" id="startButton">
+                            <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Start Discovery</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="halign">center</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" handler="on_start_clicked" swapped="no"/>
+                          </object>
+                        </child>
+                        <child type="tab">
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="waitBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">center</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkSpinner" id="waitSpinner">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="active">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label13">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Discovering DASD devices.  This may take a moment...</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child type="tab">
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <object class="GtkGrid" id="errorBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">center</property>
+                            <property name="row_spacing">6</property>
+                            <property name="column_spacing">6</property>
+                            <child>
+                              <object class="GtkImage" id="image3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="icon_name">gtk-dialog-error</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label14">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Device discovery failed.</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label22">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">The following error occurred discovering DASD devices.  Please double check your configuration information and try again.</property>
+                                <property name="wrap">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="deviceErrorLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label">Error message goes here.</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="retryButton">
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Retry Discovery</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                                <property name="use_underline">True</property>
+                                <signal name="clicked" handler="on_start_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child type="tab">
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">3</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">cancelButton</action-widget>
+      <action-widget response="1">okButton</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="nodeStore">
+    <columns>
+      <!-- column-name nodeSelected -->
+      <column type="gboolean"/>
+      <!-- column-name nodeNotLoggedIn -->
+      <column type="gboolean"/>
+      <!-- column-name nodeName -->
+      <column type="gchararray"/>
+      <!-- column-name nodeIface -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelFilter" id="nodeStoreFiltered">
+    <property name="child_model">nodeStore</property>
+  </object>
+</interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advstorage/dasd.py b/anaconda/pyanaconda/ui/gui/spokes/advstorage/dasd.py
new file mode 100644
index 0000000..88e1a01
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/advstorage/dasd.py
@@ -0,0 +1,133 @@
+# DASD configuration dialog
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Samantha N. Bueno <sbueno@redhat.com>
+#
+
+from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.utils import gtk_action_nowait
+
+from blivet.devicelibs.dasd import sanitize_dasd_dev_input, online_dasd
+
+__all__ = ["DASDDialog"]
+
+class DASDDialog(GUIObject):
+    """ Gtk dialog which allows users to manually add DASD devices without
+        having previously specified them in a parm file.
+    """
+    builderObjects = ["dasdDialog"]
+    mainWidgetName = "dasdDialog"
+    uiFile = "spokes/advstorage/dasd.glade"
+
+    def __init__(self, data, storage):
+        GUIObject.__init__(self, data)
+        self.storage = storage
+        self.dasd = self.storage.dasd
+
+        self._discoveryError = None
+
+        self._update_devicetree = False
+
+        # grab all of the ui objects
+        self._dasdNotebook = self.builder.get_object("dasdNotebook")
+
+        self._configureGrid = self.builder.get_object("configureGrid")
+        self._conditionNotebook = self.builder.get_object("conditionNotebook")
+
+        self._startButton = self.builder.get_object("startButton")
+        self._okButton = self.builder.get_object("okButton")
+        self._cancelButton = self.builder.get_object("cancelButton")
+
+        self._deviceEntry = self.builder.get_object("deviceEntry")
+
+        self._spinner = self.builder.get_object("waitSpinner")
+
+    def refresh(self):
+        self._deviceEntry.set_text("")
+        self._deviceEntry.set_sensitive(True)
+        self._startButton.set_sensitive(True)
+
+    def run(self):
+        rc = self.window.run()
+        self.window.destroy()
+        # We need to call this to get the device nodes to show up
+        # in our devicetree.
+        if self._update_devicetree:
+            self.storage.devicetree.populate()
+        return rc
+
+    def on_start_clicked(self, *args):
+        """ Go through the process of validating entry contents and then
+            attempt to add the device.
+        """
+        # First update widgets
+        self._startButton.hide()
+        self._cancelButton.set_sensitive(False)
+        self._okButton.set_sensitive(False)
+
+        self._conditionNotebook.set_current_page(1)
+
+        try:
+            device = sanitize_dasd_dev_input(self._deviceEntry.get_text())
+        except ValueError as e:
+            _config_error = str(e)
+            self.builder.get_object("deviceErrorLabel").set_text(_config_error)
+            self._conditionNotebook.set_current_page(2)
+            self._configureGrid.set_sensitive(True)
+            self._cancelButton.set_sensitive(True)
+            return
+
+        self._spinner.start()
+
+        self._discover(device)
+        self._check_discover()
+
+    @gtk_action_nowait
+    def _check_discover(self):
+        """ After the DASD discover thread runs, check to see whether a valid
+            device was discovered. Display an error message if not.
+        """
+
+        self._spinner.stop()
+
+        if self._discoveryError:
+            # Failure, display a message and leave the user on the dialog so
+            # they can try again (or cancel)
+            self.builder.get_object("deviceErrorLabel").set_text(self._discoveryError)
+            self._discoveryError = None
+            self._conditionNotebook.set_current_page(2)
+        else:
+            # Great success. Just return to the advanced storage window and let the
+            # UI update with the newly-added device
+            self.window.response(1)
+            return True
+
+        self._cancelButton.set_sensitive(True)
+        return False
+
+    def _discover(self, device):
+        """ Given the configuration options from a user, attempt to discover
+            a DASD device. This includes searching black-listed devices.
+        """
+        # attempt to add the device
+        try:
+            online_dasd(device)
+            self._update_devicetree = True
+        except ValueError as e:
+            self._discoveryError = str(e)
+            return
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade b/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
index 176fb7d..90221ab 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="fcoeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -19,11 +20,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelButton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|FCoE">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -43,6 +44,7 @@
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_right">5</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
@@ -58,7 +60,6 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -66,15 +67,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_NIC:</property>
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|FCoE">_NIC:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nicCombo</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -82,19 +81,15 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="dcbCheckbox">
-                <property name="label" translatable="yes">Use _DCB</property>
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|FCoE">Use _DCB</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -106,12 +101,11 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="autoCheckbox">
-                <property name="label" translatable="yes">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>
@@ -124,7 +118,6 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -148,7 +141,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="addButton">
-                    <property name="label" translatable="yes">_Add FCoE Disk(s)</property>
+                    <property name="label" translatable="yes" context="GUI|Advanced Storage|FCoE">_Add FCoE Disk(s)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -166,8 +159,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -181,13 +172,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="stock">gtk-dialog-error</property>
+                    <property name="icon_name">dialog-error</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -195,14 +184,14 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Error adding FCoE SAN.&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Error adding FCoE SAN.</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -216,8 +205,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -231,8 +218,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -246,7 +231,6 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">5</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.py b/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
index 34a0789..c624f5a 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
@@ -39,6 +39,7 @@ class FCoEDialog(GUIObject):
 
         self.storage = storage
         self.fcoe = self.storage.fcoe()
+        self._update_devicetree = False
 
         self._addButton = self.builder.get_object("addButton")
         self._cancelButton = self.builder.get_object("cancelButton")
@@ -62,6 +63,8 @@ class FCoEDialog(GUIObject):
     def run(self):
         rc = self.window.run()
         self.window.destroy()
+        if self._update_devicetree:
+            self.storage.devicetree.populate()
         return rc
 
     @property
@@ -79,7 +82,7 @@ class FCoEDialog(GUIObject):
 
     def _add(self):
         try:
-            self.fcoe.addSan(self.nic, self.use_dcb, self.use_auto_vlan)
+            self._addError = self.fcoe.addSan(self.nic, self.use_dcb, self.use_auto_vlan)
         except (IOError, OSError) as e:
             self._addError = str(e)
 
@@ -110,6 +113,8 @@ class FCoEDialog(GUIObject):
             self._cancelButton.set_sensitive(True)
         else:
             # Success.  There's nothing else the user can do on this dialog.
+            self.fcoe.added_nics.append(self.nic)
+            self._update_devicetree = True
             self.window.response(1)
 
     def on_add_clicked(self, *args):
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
index d1597d3..1fb2f08 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkListStore" id="nodeStore">
+    <columns>
+      <!-- column-name nodeSelected -->
+      <column type="gboolean"/>
+      <!-- column-name nodeNotLoggedIn -->
+      <column type="gboolean"/>
+      <!-- column-name nodeName -->
+      <column type="gchararray"/>
+      <!-- column-name nodeIface -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelFilter" id="nodeStoreFiltered">
+    <property name="child_model">nodeStore</property>
+  </object>
   <object class="GtkDialog" id="iscsiDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="modal">True</property>
+    <property name="default_width">600</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
     <child internal-child="vbox">
@@ -18,11 +35,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelButton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -32,12 +49,12 @@
             </child>
             <child>
               <object class="GtkButton" id="okButton">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_OK</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -100,7 +117,6 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                         <property name="width">3</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -115,7 +131,6 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -123,15 +138,13 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Target IP Address:</property>
+                        <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_Target IP Address:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">targetEntry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -146,7 +159,6 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -154,15 +166,13 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">iSCSI _Initiator Name:</property>
+                        <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">iSCSI _Initiator Name:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">initiatorEntry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -171,8 +181,6 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="active">0</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
                         <items>
                           <item translatable="yes">No credentials (discovery authentication disabled)</item>
                           <item translatable="yes">CHAP pair</item>
@@ -184,7 +192,6 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">4</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -192,15 +199,13 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Discovery Authentication Type:</property>
+                        <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_Discovery Authentication Type:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">authTypeCombo</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">4</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -215,21 +220,17 @@
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="stock">gtk-info</property>
+                        <property name="icon_name">dialog-information</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -258,15 +259,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CHAP _Username:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|CHAP">CHAP _Username:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">chapUsernameEntry</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -274,15 +273,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CHAP _Password:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|CHAP">CHAP _Password:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">chapPasswordEntry</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -296,8 +293,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -312,8 +307,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                           </object>
@@ -341,8 +334,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -357,8 +348,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -372,8 +361,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -388,8 +375,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -397,15 +382,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CHAP _Username:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">CHAP _Username:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapUsernameEntry</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -413,15 +396,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CHAP _Password:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">CHAP _Password:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapPasswordEntry</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -429,15 +410,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">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>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -445,15 +424,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Reverse CHAP Pass_word:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">Reverse CHAP Pass_word:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapReversePassword</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                           </object>
@@ -469,7 +446,6 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">5</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -481,7 +457,7 @@
                         <property name="show_border">False</property>
                         <child>
                           <object class="GtkButton" id="startButton">
-                            <property name="label" translatable="yes">_Start Discovery</property>
+                            <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Start">_Start Discovery</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -546,13 +522,11 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
-                                <property name="stock">gtk-dialog-error</property>
+                                <property name="icon_name">dialog-error</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -560,14 +534,14 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Discovery login rejected.&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Discovery login rejected.</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -581,8 +555,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -595,13 +567,11 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="retryButton">
-                                <property name="label" translatable="yes">_Retry Discovery</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Retry">_Retry Discovery</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -613,8 +583,6 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -639,12 +607,11 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">7</property>
                         <property name="width">3</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="bindCheckbutton">
-                        <property name="label" translatable="yes">_Bind targets to network interfaces</property>
+                        <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_Bind targets to network interfaces</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -656,7 +623,6 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">6</property>
                         <property name="width">3</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -680,7 +646,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">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 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="use_markup">True</property>
                         <property name="wrap">True</property>
                       </object>
@@ -688,7 +654,6 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -748,7 +713,6 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -762,23 +726,19 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_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>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="loginAuthTypeCombo">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="entry_text_column">0</property>
-                            <property name="id_column">1</property>
                             <items>
                               <item translatable="yes">No credentials (discovery authentication disabled)</item>
                               <item translatable="yes">CHAP pair</item>
@@ -790,8 +750,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -820,15 +778,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">CHAP _Username:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|CHAP">CHAP _Username:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginChapUsernameEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -836,15 +792,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">CHAP _Password:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|CHAP">CHAP _Password:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginChapPasswordEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -853,14 +807,11 @@
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="invisible_char_set">True</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -868,15 +819,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
+                                    <property name="visibility">False</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="invisible_char_set">True</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -899,14 +848,11 @@
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="invisible_char_set">True</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -914,15 +860,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
+                                    <property name="visibility">False</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="invisible_char_set">True</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -931,14 +875,11 @@
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="invisible_char_set">True</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -946,15 +887,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
+                                    <property name="visibility">False</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="invisible_char_set">True</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">3</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -962,15 +901,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">CHAP _Username:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">CHAP _Username:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapUsernameEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -978,15 +915,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">CHAP _Password:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">CHAP _Password:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapPasswordEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -994,15 +929,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Reverse CHAP Username:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">_Reverse CHAP Username:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapReverseUsername</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1010,15 +943,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Reverse CHAP Pass_word:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">Reverse CHAP Pass_word:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapReversePassword</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">3</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -1045,8 +976,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1062,7 +991,7 @@
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkButton" id="loginButton">
-                                    <property name="label" translatable="yes">_Log In</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Login">_Log In</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -1106,13 +1035,11 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">1</property>
-                                    <property name="stock">gtk-dialog-error</property>
+                                    <property name="icon_name">dialog-error</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1120,14 +1047,14 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Node login failed.&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Node login failed.</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1141,8 +1068,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1155,13 +1080,11 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="retryLoginButton">
-                                    <property name="label" translatable="yes">Retry _Log In</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Retry">Retry _Log In</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -1173,8 +1096,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">3</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1205,7 +1126,6 @@
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1216,7 +1136,6 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
@@ -1254,19 +1173,4 @@
       <action-widget response="1">okButton</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="nodeStore">
-    <columns>
-      <!-- column-name nodeSelected -->
-      <column type="gboolean"/>
-      <!-- column-name nodeNotLoggedIn -->
-      <column type="gboolean"/>
-      <!-- column-name nodeName -->
-      <column type="gchararray"/>
-      <!-- column-name nodeIface -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkTreeModelFilter" id="nodeStoreFiltered">
-    <property name="child_model">nodeStore</property>
-  </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
index b2abccc..987b0eb 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
@@ -26,6 +26,8 @@ from gi.repository import GLib
 from pyanaconda import constants
 from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.utils import escape_markup
+from pyanaconda.i18n import _
 from pyanaconda import nm
 
 __all__ = ["ISCSIDialog"]
@@ -141,6 +143,7 @@ class ISCSIDialog(GUIObject):
         self._initiatorEntry = self.builder.get_object("initiatorEntry")
 
         self._store = self.builder.get_object("nodeStore")
+        self._storeFilter = self.builder.get_object("nodeStoreFiltered")
 
     def refresh(self):
         self._bindCheckbox.set_active(bool(self.iscsi.ifaces))
@@ -151,7 +154,7 @@ class ISCSIDialog(GUIObject):
 
         self._loginAuthTypeCombo.set_active(0)
 
-        self.builder.get_object("nodeStoreFiltered").set_visible_column(1)
+        self._storeFilter.set_visible_column(1)
 
         self._initiatorEntry.set_text(self.iscsi.initiator)
         self._initiatorEntry.set_sensitive(not self.iscsi.initiatorSet)
@@ -264,9 +267,15 @@ class ISCSIDialog(GUIObject):
         # Now get the node discovery credentials.
         credentials = discoverMap[self._authNotebook.get_current_page()](self.builder)
 
+        discoveredLabelText = _("The following nodes were discovered using the iSCSI initiator "\
+                                "<b>%(initiatorName)s</b> using the target IP address "\
+                                "<b>%(targetAddress)s</b>.  Please select which nodes you "\
+                                "wish to log into:") % \
+                                {"initiatorName": escape_markup(credentials.initiator),
+                                 "targetAddress": escape_markup(credentials.targetIP)}
+
         discoveredLabel = self.builder.get_object("discoveredLabel")
-        discoveredLabel.set_markup(discoveredLabel.get_label() % {"initiatorName": credentials.initiator,
-                                                                  "targetAddress": credentials.targetIP})
+        discoveredLabel.set_markup(discoveredLabelText)
 
         bind = self._bindCheckbox.get_active()
 
@@ -326,7 +335,8 @@ class ISCSIDialog(GUIObject):
             return
 
         # Then, go back and mark just this row as selected.
-        itr = self._store.get_iter(path)
+        itr = self._storeFilter.get_iter(path)
+        itr = self._storeFilter.convert_iter_to_child_iter(itr)
         self._store[itr][0] = not self._store[itr][0]
 
     def _login(self, credentials):
diff --git a/anaconda/pyanaconda/ui/gui/spokes/custom.glade b/anaconda/pyanaconda/ui/gui/spokes/custom.glade
index 9a8ab90..2cf6e70 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/custom.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/custom.glade
@@ -1,719 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
-  <object class="GtkDialog" id="addDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="margin_top">24</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="addCancelButton">
-                <property name="label" translatable="yes">_Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="addConfirmButton">
-                <property name="label" translatable="yes">_Add mount point</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_add_confirm_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="grid4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="column_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">6</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;_Desired Capacity:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">addSizeEntry</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Mount _Point:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">addMountPointEntry</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">12</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ADD A NEW MOUNT POINT</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                  <attribute name="scale" value="1.2"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">12</property>
-                <property name="label" translatable="yes">More customization options are available
-after creating the mount point below.</property>
-                <attributes>
-                  <attribute name="font-desc" value="Cantarell 11"/>
-                  <attribute name="scale" value="1"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="addLabelWarningBox">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-dialog-warning</property>
-                    <property name="icon-size">2</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="mountPointWarningLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">That mount point is already in
-use.  Try something else?</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 10"/>
-                      <attribute name="scale" value="1"/>
-                      <attribute name="foreground" value="#ffff00000000"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="addSizeEntry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">eg: "20 GB", "500mb" (minus the quotation marks)</property>
-                <property name="invisible_char">●</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="addMountPointEntry">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_entry">True</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
-                <child internal-child="entry">
-                  <object class="GtkEntry" id="comboboxtext-entry">
-                    <property name="can_focus">True</property>
-                    <property name="buffer">mountPointEntryBuffer</property>
-                    <property name="completion">mountPointCompletion</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">addCancelButton</action-widget>
-      <action-widget response="1">addConfirmButton</action-widget>
-    </action-widgets>
+  <requires lib="gtk+" version="3.2"/>
+  <requires lib="AnacondaWidgets" version="3.0"/>
+  <object class="GtkListStore" id="containerStore">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name freeSpace -->
+      <column type="gchararray"/>
+    </columns>
   </object>
-  <object class="GtkDialog" id="confirmDeleteDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkLabel" id="confirmLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="wrap">True</property>
-            <attributes>
-              <attribute name="font-desc" value="Cantarell 11"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="removeAllCheckbox">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="use_underline">True</property>
-            <property name="xalign">0</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="deleteCancelButton">
-                <property name="label" translatable="yes">_Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="deleteConfirmButton">
-                <property name="label" translatable="yes">_Delete It</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_delete_confirm_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">deleteCancelButton</action-widget>
-      <action-widget response="1">deleteConfirmButton</action-widget>
-    </action-widgets>
+  <object class="GtkListStore" id="deviceTypeStore">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name const_name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Standard Partition</col>
+        <col id="1">DEVICE_TYPE_PARTITION</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Btrfs</col>
+        <col id="1">DEVICE_TYPE_BTRFS</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">LVM</col>
+        <col id="1">DEVICE_TYPE_LVM</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID</col>
+        <col id="1">DEVICE_TYPE_MD</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">LVM Thin Provisioning</col>
+        <col id="1">DEVICE_TYPE_LVM_THINP</col>
+      </row>
+    </data>
   </object>
-  <object class="GtkDialog" id="container_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox5">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area5">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="container_cancel_button">
-                <property name="label" translatable="yes">_Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="container_save_button">
-                <property name="label" translatable="yes">_Save</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_save_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="container_dialog_title_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">CONFIGURE CONTAINER</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="container_dialog_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Please create a name for this container and select at least one disk below.</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="nameLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Name:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">container_name_entry</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="container_name_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                    <accelerator key="n" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="height_request">150</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkViewport" id="viewport2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkTreeView" id="container_disk_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">disk_store</property>
-                        <property name="search_column">0</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="treeview-selection3">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="disk_column1">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Disk</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="disk_renderer1"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="capacity_column1">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Capacity</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="capacity_renderer1"/>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="free_column1">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Free</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="free_renderer1"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="id_column1">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">ID</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="id_renderer1"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="containerRaidLevelLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">RAID Level:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="containerRaidLevelCombo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="model">containerRaidStoreFiltered</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="containerRaidLevelRenderer"/>
-                      <attributes>
-                        <attribute name="markup">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="containerEncryptedCheckbox">
-                    <property name="label" translatable="yes">Encrypt</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="containerErrorBox">
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="containerErrorImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-dialog-warning</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="containerErrorLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Please enter a valid name.</property>
-                    <property name="wrap">True</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 10"/>
-                      <attribute name="scale" value="1"/>
-                      <attribute name="foreground" value="#ffff00000000"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="containerSizeBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="containerSizeLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Si_ze policy:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">containerSizeCombo</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="containerSizeCombo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
-                    <items>
-                      <item translatable="yes">Automatic</item>
-                      <item translatable="yes">As large as possible</item>
-                      <item translatable="yes">Fixed</item>
-                    </items>
-                    <signal name="changed" handler="on_size_changed" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="containerSizeEntry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">container_cancel_button</action-widget>
-      <action-widget response="1">container_save_button</action-widget>
-    </action-widgets>
+  <object class="GtkListStore" id="mountPointStore">
+    <columns>
+      <!-- column-name path -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkEntryCompletion" id="mountPointCompletion">
+    <property name="model">mountPointStore</property>
+  </object>
+  <object class="GtkListStore" id="raidLevelStore">
+    <columns>
+      <!-- column-name raidLevel -->
+      <column type="gchararray"/>
+      <!-- column-name canonRaidLevel -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">RAID0 &lt;span foreground="grey"&gt;(Performance)&lt;/span&gt;</col>
+        <col id="1">raid0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID1 &lt;span foreground="grey"&gt;(Redundancy)&lt;/span&gt;</col>
+        <col id="1">raid1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID4 &lt;span foreground="grey"&gt;(Error Checking)&lt;/span&gt;</col>
+        <col id="1">raid4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID5 &lt;span foreground="grey"&gt;(Distributed Error Checking)&lt;/span&gt;</col>
+        <col id="1">raid5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID6 &lt;span foreground="grey"&gt;(Redundant Error Checking)&lt;/span&gt;</col>
+        <col id="1">raid6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID10 &lt;span foreground="grey"&gt;(Performance, Redundancy)&lt;/span&gt;</col>
+        <col id="1">raid10</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkTreeModelFilter" id="raidStoreFiltered">
+    <property name="child_model">raidLevelStore</property>
   </object>
   <object class="AnacondaSpokeWindow" id="customStorageWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
     <property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">MANUAL PARTITIONING</property>
+    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/>
     <signal name="key-release-event" handler="on_key_pressed" swapped="no"/>
-    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
         <property name="can_focus">False</property>
@@ -728,6 +108,9 @@ use.  Try something else?</property>
                 <property name="margin_left">6</property>
                 <property name="margin_right">6</property>
                 <property name="margin_top">6</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -744,7 +127,6 @@ use.  Try something else?</property>
             <property name="vexpand">True</property>
             <property name="yalign">0</property>
             <property name="left_padding">24</property>
-            <property name="right_padding">24</property>
             <child internal-child="action_area">
               <object class="GtkBox" id="customStorageWindow-actionArea">
                 <property name="can_focus">False</property>
@@ -783,823 +165,6 @@ use.  Try something else?</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkNotebook" id="partitionsNotebook">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="show_tabs">False</property>
-                        <child>
-                          <object class="GtkLabel" id="whenCreateLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="wrap">True</property>
-                          </object>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="configureBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkBox" id="box2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkLabel" id="selectedDeviceLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="yalign">0</property>
-                                    <property name="label" translatable="yes">Selected Device</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.2"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="selectedDeviceDescLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="yalign">0</property>
-                                    <property name="label" translatable="yes">Device description</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSeparator" id="separator1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="padding">6</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="mountPointLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Mount _Point:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">mountPointEntry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="mountPointEntry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="invisible_char">●</property>
-                                    <property name="completion">mountPointCompletion</property>
-                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="labelLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;_Label:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">labelEntry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="labelEntry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="invisible_char">●</property>
-                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="nameLabel1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Name:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">nameEntry</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="nameEntry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="sizeLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;_Desired Capacity:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">sizeEntry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="sizeEntry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="invisible_char">●</property>
-                                    <property name="width_chars">10</property>
-                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">6</property>
-                                    <property name="column_spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="deviceTypeLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Device _Type:&lt;/b&gt;</property>
-                                        <property name="use_markup">True</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">deviceTypeCombo</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="fileSystemTypeLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;File _System:&lt;/b&gt;</property>
-                                        <property name="use_markup">True</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">fileSystemTypeCombo</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBoxText" id="deviceTypeCombo">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="entry_text_column">0</property>
-                                        <property name="id_column">1</property>
-                                        <items>
-                                          <item translatable="yes">Standard Partition</item>
-                                          <item translatable="yes">BTRFS</item>
-                                          <item translatable="yes">LVM</item>
-                                          <item translatable="yes">RAID</item>
-                                          <item translatable="yes">LVM Thin Provisioning</item>
-                                        </items>
-                                        <signal name="changed" handler="on_device_type_changed" swapped="no"/>
-                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBoxText" id="fileSystemTypeCombo">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="entry_text_column">0</property>
-                                        <property name="id_column">1</property>
-                                        <signal name="changed" handler="on_fs_type_changed" swapped="no"/>
-                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="encryptCheckbox">
-                                        <property name="label" translatable="yes">_Encrypt</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="halign">start</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_value_changed" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="reformatCheckbox">
-                                        <property name="label" translatable="yes">Re_format</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_reformat_toggled" swapped="no"/>
-                                        <signal name="toggled" handler="on_value_changed" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="containerLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Volume Group:</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">containerCombo</property>
-                                        <attributes>
-                                          <attribute name="weight" value="bold"/>
-                                        </attributes>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBoxText" id="containerCombo">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="entry_text_column">0</property>
-                                        <property name="id_column">1</property>
-                                        <signal name="changed" handler="on_container_changed" swapped="no"/>
-                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="modifyContainerButton">
-                                        <property name="label" translatable="yes">_Modify...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                        <signal name="clicked" handler="on_modify_container_clicked" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="raidLevelLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">R_AID Level:</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">raidLevelCombo</property>
-                                        <attributes>
-                                          <attribute name="weight" value="bold"/>
-                                        </attributes>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="raidLevelCombo">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="model">raidStoreFiltered</property>
-                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="raidLevelRenderer"/>
-                                          <attributes>
-                                            <attribute name="markup">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">4</property>
-                                    <property name="width">2</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="applyButton">
-                                <property name="label" translatable="yes">_Update Settings</property>
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="halign">end</property>
-                                <property name="valign">start</property>
-                                <property name="margin_top">30</property>
-                                <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_apply_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Note:  The settings you make on this screen will not be applied
-until you click on the main menu's 'Begin Installation' button.</property>
-                                <property name="justify">right</property>
-                                <attributes>
-                                  <attribute name="font-desc" value="Cantarell Italic 10"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="encryptedDeviceBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkBox" id="box6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="encryptedDeviceLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Selected Device</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell Bold 10"/>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.2"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="encryptedDeviceDescriptionLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="label" translatable="yes">Device description</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell Italic 10"/>
-                                      <attribute name="style" value="italic"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSeparator" id="separator2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="unlockLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">This device is encrypted and cannot be read without a valid passphrase. You may unlock it below.</property>
-                                <property name="wrap">True</property>
-                                <attributes>
-                                  <attribute name="font-desc" value="Cantarell 11"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="passphraseLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Passphrase:</property>
-                                    <property name="use_underline">True</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell 11"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="passphraseEntry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="visibility">False</property>
-                                    <property name="invisible_char">●</property>
-                                    <accelerator key="p" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="unlockButton">
-                                    <property name="label" translatable="yes">_Unlock</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="use_underline">True</property>
-                                    <signal name="clicked" handler="on_unlock_clicked" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="uneditableDeviceBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkBox" id="box17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="uneditableDeviceLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Selected Device</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell Bold 10"/>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.2"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="uneditableDeviceDescriptionLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="label" translatable="yes">Device description</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell Italic 10"/>
-                                      <attribute name="style" value="italic"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSeparator" id="separator3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="uneditableDeviceOptionsLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">This device cannot be edited directly. You can remove it or select a different device.</property>
-                                <property name="wrap">True</property>
-                                <attributes>
-                                  <attribute name="font-desc" value="Cantarell 11"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="incompleteDeviceBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkBox" id="box5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="incompleteDeviceLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Selected Device</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell Bold 10"/>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.2"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="incompleteDeviceDescriptionLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="label" translatable="yes">Device description</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="Cantarell Italic 10"/>
-                                      <attribute name="style" value="italic"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSeparator" id="separator4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="incompleteDeviceOptionsLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="yalign">0.43000000715255737</property>
-                                <property name="wrap">True</property>
-                                <attributes>
-                                  <attribute name="font-desc" value="Cantarell 11"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">2</property>
                       </packing>
                     </child>
                     <child>
@@ -1610,18 +175,14 @@ until you click on the main menu's 'Begin Installation' button.</property>
                         <property name="toolbar_style">icons</property>
                         <property name="show_arrow">False</property>
                         <property name="icon_size">1</property>
-                        <style>
-                          <class name="inline-toolbar"/>
-                        </style>
                         <child>
                           <object class="GtkToolButton" id="addButton">
                             <property name="width_request">42</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="label" translatable="yes">Add</property>
-                            <property name="use_underline">True</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="icon_name">list-add-symbolic</property>
                             <signal name="clicked" handler="on_add_clicked" swapped="no"/>
                           </object>
@@ -1636,9 +197,8 @@ 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="label" translatable="yes">Remove</property>
-                            <property name="use_underline">True</property>
+                            <property name="tooltip_text" translatable="yes">Remove the selected mount point(s).</property>
+                            <property name="label" translatable="yes" context="GUI|Custom Partitioning">Remove</property>
                             <property name="icon_name">list-remove-symbolic</property>
                             <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
                           </object>
@@ -1647,23 +207,6 @@ until you click on the main menu's 'Begin Installation' button.</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkToolButton" id="configureButton">
-                            <property name="width_request">42</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="label" translatable="yes">Configure</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">preferences-system-symbolic</property>
-                            <signal name="clicked" handler="on_configure_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
                         <child>
                           <object class="GtkToolButton" id="refreshButton">
                             <property name="width_request">42</property>
@@ -1671,8 +214,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">Reload storage configuration from disk.</property>
-                            <property name="label" translatable="yes">Refresh</property>
-                            <property name="use_underline">True</property>
+                            <property name="label" translatable="yes" context="GUI|Custom Partitioning">Refresh</property>
                             <property name="icon_name">view-refresh-symbolic</property>
                             <signal name="clicked" handler="on_refresh_clicked" swapped="no"/>
                           </object>
@@ -1681,29 +223,1106 @@ until you click on the main menu's 'Begin Installation' button.</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkToolButton" id="helpButton">
-                            <property name="width_request">42</property>
-                            <property name="height_request">36</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Click for help.</property>
-                            <property name="label" translatable="yes">Help</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">system-help-symbolic</property>
-                            <signal name="clicked" handler="on_help_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
+                        <style>
+                          <class name="inline-toolbar"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="partitionsNotebookScrolledWindow">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <child>
+                          <object class="GtkViewport" id="partitionsNotebookViewport">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_right">24</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkNotebook" id="partitionsNotebook">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="show_tabs">False</property>
+                                <property name="show_border">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="whenCreateLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="wrap">True</property>
+                                  </object>
+                                </child>
+                                <child type="tab">
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="configSpecBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkBox" id="headerBox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                          <object class="GtkBox" id="titleBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <child>
+                                              <object class="GtkLabel" id="selectedDeviceLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="yalign">0</property>
+                                                <property name="label" translatable="yes">Selected Device</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                  <attribute name="scale" value="1.2"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="selectedDeviceDescLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="halign">end</property>
+                                                <property name="yalign">0</property>
+                                                <property name="label" translatable="yes">Device description</property>
+                                                <attributes>
+                                                  <attribute name="style" value="italic"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSeparator" id="separator1">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="padding">6</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkGrid" id="grid4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="row_spacing">36</property>
+                                        <property name="column_spacing">24</property>
+                                        <child>
+                                          <object class="GtkBox" id="firstLeftBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">6</property>
+                                            <child>
+                                              <object class="GtkBox" id="mountPointBox">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="orientation">vertical</property>
+                                                <property name="spacing">3</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="mountPointLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Mount _Point:</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">mountPointEntry</property>
+                                                    <attributes>
+                                                      <attribute name="weight" value="bold"/>
+                                                    </attributes>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="mountPointEntry">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="invisible_char">●</property>
+                                                    <property name="width_chars">20</property>
+                                                    <property name="completion">mountPointCompletion</property>
+                                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkBox" id="capacityBox">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="orientation">vertical</property>
+                                                <property name="spacing">3</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="sizeLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">_Desired Capacity:</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">sizeEntry</property>
+                                                    <attributes>
+                                                      <attribute name="weight" value="bold"/>
+                                                    </attributes>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="sizeEntry">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="invisible_char">●</property>
+                                                    <property name="width_chars">10</property>
+                                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="labelBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="labelLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">_Label:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">labelEntry</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEntry" id="labelEntry">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="halign">start</property>
+                                                <property name="max_length">20</property>
+                                                <property name="invisible_char">●</property>
+                                                <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="devicesBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">start</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="devicesLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">start</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Device(s):</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="deviceDescLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="valign">start</property>
+                                                <property name="xalign">0</property>
+                                                <property name="wrap">True</property>
+                                                <property name="width_chars">35</property>
+                                                <property name="angle">0.01</property>
+                                                <property name="max_width_chars">35</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton" id="configureButton">
+                                                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure|Devices">_Modify...</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">start</property>
+                                                <property name="use_underline">True</property>
+                                                <signal name="clicked" handler="on_configure_clicked" swapped="no"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="nameBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="nameLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">_Name:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">nameEntry</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEntry" id="nameEntry">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="halign">start</property>
+                                                <property name="invisible_char">●</property>
+                                                <property name="width_chars">20</property>
+                                                <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="secondLeftBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">6</property>
+                                            <child>
+                                              <object class="GtkBox" id="deviceSpecBox">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="spacing">6</property>
+                                                <child>
+                                                  <object class="GtkBox" id="deviceTypeBox">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="orientation">vertical</property>
+                                                    <property name="spacing">3</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="deviceTypeLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">Device _Type:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="mnemonic_widget">deviceTypeCombo</property>
+                                                        <attributes>
+                                                          <attribute name="weight" value="bold"/>
+                                                        </attributes>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="deviceTypeCombo">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="model">deviceTypeStore</property>
+                                                        <signal name="changed" handler="on_device_type_changed" swapped="no"/>
+                                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                                        <child>
+                                                          <object class="GtkCellRendererText" id="deviceTypeRenderer"/>
+                                                          <attributes>
+                                                            <attribute name="text">0</attribute>
+                                                          </attributes>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="encryptCheckbox">
+                                                    <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">_Encrypt</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="valign">end</property>
+                                                    <property name="margin_bottom">3</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="on_value_changed" swapped="no"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkBox" id="fsSpecBox">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="spacing">6</property>
+                                                <child>
+                                                  <object class="GtkBox" id="fsBox">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="orientation">vertical</property>
+                                                    <property name="spacing">3</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="fileSystemTypeLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">File S_ystem:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="mnemonic_widget">fileSystemTypeCombo</property>
+                                                        <attributes>
+                                                          <attribute name="weight" value="bold"/>
+                                                        </attributes>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBoxText" id="fileSystemTypeCombo">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <signal name="changed" handler="on_fs_type_changed" swapped="no"/>
+                                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="reformatCheckbox">
+                                                    <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">Ref_ormat</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="valign">end</property>
+                                                    <property name="margin_bottom">3</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="on_reformat_toggled" swapped="no"/>
+                                                    <signal name="toggled" handler="on_value_changed" swapped="no"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="secondRightBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">6</property>
+                                            <child>
+                                              <object class="GtkBox" id="vgSpecBox">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="orientation">vertical</property>
+                                                <property name="spacing">6</property>
+                                                <child>
+                                                  <object class="GtkBox" id="vgBox">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="orientation">vertical</property>
+                                                    <property name="spacing">3</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="containerLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">_Volume Group:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="mnemonic_widget">containerCombo</property>
+                                                        <attributes>
+                                                          <attribute name="weight" value="bold"/>
+                                                        </attributes>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="containerCombo">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="model">containerStore</property>
+                                                        <signal name="changed" handler="on_container_changed" swapped="no"/>
+                                                        <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                                        <child>
+                                                          <object class="GtkCellRendererText" id="descRenderer"/>
+                                                          <attributes>
+                                                            <attribute name="text">0</attribute>
+                                                          </attributes>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCellRendererText" id="freeSpaceRenderer">
+                                                            <property name="xalign">1</property>
+                                                            <property name="foreground">grey</property>
+                                                          </object>
+                                                          <attributes>
+                                                            <attribute name="markup">1</attribute>
+                                                          </attributes>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkButton" id="modifyContainerButton">
+                                                    <!-- check_accelerators: configureButton -->
+                                                    <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">_Modify...</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">True</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="use_underline">True</property>
+                                                    <signal name="clicked" handler="on_modify_container_clicked" swapped="no"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkBox" id="raidBox">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="orientation">vertical</property>
+                                                <property name="spacing">3</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="raidLevelLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">RA_ID Level:</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">raidLevelCombo</property>
+                                                    <attributes>
+                                                      <attribute name="weight" value="bold"/>
+                                                    </attributes>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBox" id="raidLevelCombo">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="model">raidStoreFiltered</property>
+                                                    <signal name="changed" handler="on_value_changed" swapped="no"/>
+                                                    <child>
+                                                      <object class="GtkCellRendererText" id="raidLevelRenderer"/>
+                                                      <attributes>
+                                                        <attribute name="markup">0</attribute>
+                                                      </attributes>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox" id="updateBox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">end</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkButton" id="applyButton">
+                                            <property name="label" translatable="yes">_Update Settings</property>
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <property name="margin_top">30</property>
+                                            <property name="use_underline">True</property>
+                                            <signal name="clicked" handler="on_update_settings_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Note:  The settings you make on this screen will not be applied until you click on the main menu's 'Begin Installation' button.</property>
+                                            <property name="justify">right</property>
+                                            <property name="wrap">True</property>
+                                            <property name="width_chars">39</property>
+                                            <property name="max_width_chars">39</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="encryptedDeviceBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkBox" id="box6">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="encryptedDeviceLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Selected Device</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Bold 10"/>
+                                              <attribute name="weight" value="bold"/>
+                                              <attribute name="scale" value="1.2"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="encryptedDeviceDescriptionLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="label" translatable="yes">Device description</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                              <attribute name="style" value="italic"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSeparator" id="separator2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="unlockLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">This device is encrypted and cannot be read without a valid passphrase. You may unlock it below.</property>
+                                        <property name="wrap">True</property>
+                                        <attributes>
+                                          <attribute name="font-desc" value="Cantarell 11"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox" id="box7">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="passphraseLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="GUI|Custom Partitioning|Encrypted">_Passphrase:</property>
+                                            <property name="use_underline">True</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell 11"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="passphraseEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="visibility">False</property>
+                                            <property name="invisible_char">●</property>
+                                            <signal name="activate" handler="on_unlock_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="unlockButton">
+                                            <property name="label" translatable="yes" context="GUI|Custom Partitioning|Encrypted">_Unlock</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_underline">True</property>
+                                            <signal name="clicked" handler="on_unlock_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="uneditableDeviceBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkBox" id="box17">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="uneditableDeviceLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Selected Device</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Bold 10"/>
+                                              <attribute name="weight" value="bold"/>
+                                              <attribute name="scale" value="1.2"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="uneditableDeviceDescriptionLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="label" translatable="yes">Device description</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                              <attribute name="style" value="italic"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSeparator" id="separator3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="uneditableDeviceOptionsLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">This device cannot be edited directly. You can remove it or select a different device.</property>
+                                        <property name="wrap">True</property>
+                                        <attributes>
+                                          <attribute name="font-desc" value="Cantarell 11"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="incompleteDeviceBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkBox" id="box5">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="incompleteDeviceLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Selected Device</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Bold 10"/>
+                                              <attribute name="weight" value="bold"/>
+                                              <attribute name="scale" value="1.2"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="incompleteDeviceDescriptionLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="label" translatable="yes">Device description</property>
+                                            <attributes>
+                                              <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                              <attribute name="style" value="italic"/>
+                                            </attributes>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSeparator" id="separator4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="incompleteDeviceOptionsLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="yalign">0.43000000715255737</property>
+                                        <property name="wrap">True</property>
+                                        <attributes>
+                                          <attribute name="font-desc" value="Cantarell 11"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <placeholder/>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="height">2</property>
                       </packing>
                     </child>
                   </object>
@@ -1736,8 +1355,11 @@ until you click on the main menu's 'Begin Installation' button.</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;span size="small" foreground="white"&gt;AVAILABLE SPACE&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">AVAILABLE SPACE</property>
+                                <attributes>
+                                  <attribute name="scale" value="0.83333333333329995"/>
+                                  <attribute name="foreground" value="#ffffffffffff"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1768,8 +1390,6 @@ until you click on the main menu's 'Begin Installation' button.</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1788,8 +1408,11 @@ until you click on the main menu's 'Begin Installation' button.</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;span size="small" foreground="white"&gt;TOTAL SPACE&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">TOTAL SPACE</property>
+                                <attributes>
+                                  <attribute name="scale" value="0.83333333333329995"/>
+                                  <attribute name="foreground" value="#ffffffffffff"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1821,14 +1444,13 @@ until you click on the main menu's 'Begin Installation' button.</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="resetButton">
-                        <property name="label" translatable="yes">_Reset All</property>
+                        <property name="label" translatable="yes" context="GUI|Custom Partitioning">_Reset All</property>
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="halign">end</property>
@@ -1840,13 +1462,10 @@ until you click on the main menu's 'Begin Installation' button.</property>
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="summary_button">
-                        <property name="label" translatable="yes">summary</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1856,12 +1475,23 @@ until you click on the main menu's 'Begin Installation' button.</property>
                         <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                         <signal name="clicked" handler="on_summary_clicked" swapped="no"/>
+                        <child>
+                          <object class="GtkLabel" id="summary_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" context="GUI|Custom Partitioning">%d _storage devices selected</property>
+                            <property name="use_underline">True</property>
+                            <attributes>
+                              <attribute name="underline" value="True"/>
+                              <attribute name="foreground" value="#00000000ffff"/>
+                            </attributes>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1886,357 +1516,4 @@ until you click on the main menu's 'Begin Installation' button.</property>
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="disk_store">
-    <columns>
-      <!-- column-name disk_col -->
-      <column type="gchararray"/>
-      <!-- column-name capacity_col -->
-      <column type="gchararray"/>
-      <!-- column-name free_col -->
-      <column type="gchararray"/>
-      <!-- column-name serial_col -->
-      <column type="gchararray"/>
-      <!-- column-name id_col -->
-      <column type="gint"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="disks_dialog">
-    <property name="width_request">400</property>
-    <property name="height_request">200</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox4">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area4">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">_Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="select_button">
-                <property name="label" translatable="yes">_Select</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_select_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="disk_selection_title_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">CONFIGURE MOUNT POINT</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Select one or more disks this device may reside on.</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkViewport" id="viewport1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkTreeView" id="disk_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">disk_store</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="disk_view_selection">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="disk_column">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Disk</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="disk_renderer"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="capacity_column">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Capacity</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="capacity_renderer"/>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="free_column">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Free</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="free_renderer"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="id_column">
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes">ID</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="id_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">cancel_button</action-widget>
-      <action-widget response="1">select_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkTextBuffer" id="help_text_buffer"/>
-  <object class="GtkDialog" id="help_dialog">
-    <property name="width_request">600</property>
-    <property name="height_request">400</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes">Help</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <signal name="close" handler="on_close" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox6">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area6">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="help_close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_close" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow3">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTextView" id="help_text_view">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="editable">False</property>
-                <property name="wrap_mode">word</property>
-                <property name="cursor_visible">False</property>
-                <property name="buffer">help_text_buffer</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">help_close_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkEntryCompletion" id="mountPointCompletion">
-    <property name="model">mountPointStore</property>
-  </object>
-  <object class="GtkEntryBuffer" id="mountPointEntryBuffer"/>
-  <object class="GtkListStore" id="mountPointStore">
-    <columns>
-      <!-- column-name path -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="raidLevelStore">
-    <columns>
-      <!-- column-name raidLevel -->
-      <column type="gchararray"/>
-      <!-- column-name validForLVM -->
-      <column type="gboolean"/>
-      <!-- column-name validForRAID -->
-      <column type="gboolean"/>
-      <!-- column-name validForBTRFS -->
-      <column type="gboolean"/>
-      <!-- column-name validForVG -->
-      <column type="gboolean"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">None</col>
-        <col id="1">True</col>
-        <col id="2">False</col>
-        <col id="3">True</col>
-        <col id="4">True</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">RAID0 &lt;span foreground="grey"&gt;(Performance)&lt;/span&gt;</col>
-        <col id="1">True</col>
-        <col id="2">True</col>
-        <col id="3">True</col>
-        <col id="4">True</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">RAID1 &lt;span foreground="grey"&gt;(Redundancy)&lt;/span&gt;</col>
-        <col id="1">True</col>
-        <col id="2">True</col>
-        <col id="3">True</col>
-        <col id="4">True</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">RAID4 &lt;span foreground="grey"&gt;(Error Checking)&lt;/span&gt;</col>
-        <col id="1">False</col>
-        <col id="2">True</col>
-        <col id="3">False</col>
-        <col id="4">True</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">RAID5 &lt;span foreground="grey"&gt;(Distributed Error Checking)&lt;/span&gt;</col>
-        <col id="1">False</col>
-        <col id="2">True</col>
-        <col id="3">False</col>
-        <col id="4">True</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">RAID6 &lt;span foreground="grey"&gt;(Redundant Error Checking)&lt;/span&gt;</col>
-        <col id="1">False</col>
-        <col id="2">True</col>
-        <col id="3">False</col>
-        <col id="4">True</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">RAID10 &lt;span foreground="grey"&gt;(Performance, Redundancy)&lt;/span&gt;</col>
-        <col id="1">False</col>
-        <col id="2">True</col>
-        <col id="3">False</col>
-        <col id="4">True</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkTreeModelFilter" id="raidStoreFiltered">
-    <property name="child_model">raidLevelStore</property>
-  </object>
-  <object class="GtkTreeModelFilter" id="containerRaidStoreFiltered">
-    <property name="child_model">raidLevelStore</property>
-  </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/custom.py b/anaconda/pyanaconda/ui/gui/spokes/custom.py
index 009a375..77f3414 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/custom.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/custom.py
@@ -1,7 +1,7 @@
-# vim: set fileencoding=utf-8
+#
 # Custom partitioning classes.
 #
-# Copyright (C) 2012, 2013  Red Hat, Inc.
+# Copyright (C) 2012-2014  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -29,24 +29,21 @@
 # - Implement striping and mirroring for LVM.
 # - Activating reformat should always enable resize for existing devices.
 
-from contextlib import contextmanager
-import re
-import unicodedata
+from pykickstart.constants import CLEARPART_TYPE_NONE
 
-from pykickstart.constants import CLEARPART_TYPE_NONE, AUTOPART_TYPE_PLAIN, AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP
-
-from pyanaconda.i18n import _, N_, P_
-from pyanaconda.product import productName, productVersion
+from pyanaconda.i18n import _, N_, CP_
+from pyanaconda.product import productName, productVersion, translated_new_install_name
 from pyanaconda.threads import AnacondaThread, threadMgr
 from pyanaconda.constants import THREAD_EXECUTE_STORAGE, THREAD_STORAGE, THREAD_CUSTOM_STORAGE_INIT
 from pyanaconda.iutil import lowerASCII
 from pyanaconda.bootloader import BootLoaderError
+from pyanaconda.kickstart import refreshAutoSwapSize
+from pyanaconda import isys
 
 from blivet import devicefactory
 from blivet.formats import device_formats
 from blivet.formats import getFormat
 from blivet.formats.fs import FS
-from blivet.platform import platform
 from blivet.size import Size
 from blivet import Root
 from blivet.devicefactory import DEVICE_TYPE_LVM
@@ -55,35 +52,46 @@ from blivet.devicefactory import DEVICE_TYPE_PARTITION
 from blivet.devicefactory import DEVICE_TYPE_MD
 from blivet.devicefactory import DEVICE_TYPE_DISK
 from blivet.devicefactory import DEVICE_TYPE_LVM_THINP
-from blivet.devicefactory import get_raid_level
 from blivet.devicefactory import SIZE_POLICY_AUTO
-from blivet.devicefactory import SIZE_POLICY_MAX
 from blivet import findExistingInstallations
 from blivet.partitioning import doAutoPartition
 from blivet.errors import StorageError
 from blivet.errors import NoDisksError
 from blivet.errors import NotEnoughFreeSpaceError
-from blivet.errors import SizeParamsError, SizeNotPositiveError
-from blivet.devicelibs import mdraid
+from blivet.devicelibs import raid, crypto
 from blivet.devices import LUKSDevice
 
+from pyanaconda.storage_utils import ui_storage_logger, device_type_from_autopart
+from pyanaconda.storage_utils import DEVICE_TEXT_PARTITION, DEVICE_TEXT_MAP, DEVICE_TEXT_MD
+from pyanaconda.storage_utils import PARTITION_ONLY_FORMAT_TYPES, MOUNTPOINT_DESCRIPTIONS
+from pyanaconda.storage_utils import NAMED_DEVICE_TYPES, CONTAINER_DEVICE_TYPES
+from pyanaconda.storage_utils import SanityError, SanityWarning, LUKSDeviceWithoutKeyError
+from pyanaconda import storage_utils
+
 from pyanaconda.ui.communication import hubQ
-from pyanaconda.ui.gui import GUIObject
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui.spokes.storage import StorageChecker
+from pyanaconda.ui.helpers import StorageChecker
 from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
 from pyanaconda.ui.gui.spokes.lib.passphrase import PassphraseDialog
-from pyanaconda.ui.gui.spokes.lib.accordion import selectorFromDevice, Accordion, Page, CreateNewPage, UnknownPage
+from pyanaconda.ui.gui.spokes.lib.accordion import updateSelectorFromDevice, Accordion, Page, CreateNewPage, UnknownPage
 from pyanaconda.ui.gui.spokes.lib.refresh import RefreshDialog
 from pyanaconda.ui.gui.spokes.lib.summary import ActionSummaryDialog
-from pyanaconda.ui.gui.utils import setViewportBackground, gtk_action_wait, enlightbox, fancy_set_sensitive, ignoreEscape,\
-        really_hide, really_show
-from pyanaconda.ui.gui.categories.system import SystemCategory
-from pyanaconda.ui.lib.disks import size_str
+
+from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import size_from_entry
+from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import validate_label, validate_mountpoint, get_raid_level
+from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import selectedRaidLevel, raidLevelSelection, defaultRaidLevel, requiresRaidSelection, containerRaidLevelsSupported, raidLevelsSupported, defaultContainerRaidLevel
+from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import get_container_type_name, RAID_NOT_ENOUGH_DISKS
+from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import AddDialog, ConfirmDeleteDialog, DisksDialog, ContainerDialog
+
+from pyanaconda.ui.gui.utils import setViewportBackground, fancy_set_sensitive, ignoreEscape
+from pyanaconda.ui.gui.utils import really_hide, really_show, GtkActionList, timed_action
+from pyanaconda.ui.categories.system import SystemCategory
 
 from gi.repository import Gdk, Gtk
 from gi.repository.AnacondaWidgets import MountpointSelector
 
+from functools import wraps
+
 import logging
 log = logging.getLogger("anaconda")
 
@@ -95,557 +103,54 @@ NOTEBOOK_LUKS_PAGE = 2
 NOTEBOOK_UNEDITABLE_PAGE = 3
 NOTEBOOK_INCOMPLETE_PAGE = 4
 
-new_install_name = N_("New %(name)s %(version)s Installation")
-new_container_text = N_("Create a new %(container_type)s ...")
-container_tooltip = N_("Create or select %(container_type)s")
-container_dialog_title = N_("CONFIGURE %(container_type)s")
-container_dialog_text = N_("Please create a name for this %(container_type)s "
-                           "and select at least one disk below.")
-lvm_container_name = N_("Volume Group")
-btrfs_container_name = N_("Volume")
-unrecoverable_error_msg = N_("Storage configuration reset due to unrecoverable "
-                             "error. Click for details.")
-device_configuration_error_msg = N_("Device reconfiguration failed. Click for "
+NEW_CONTAINER_TEXT = N_("Create a new %(container_type)s ...")
+CONTAINER_TOOLTIP = N_("Create or select %(container_type)s")
+
+DEVICE_CONFIGURATION_ERROR_MSG = N_("Device reconfiguration failed. Click for "
                                     "details.")
+UNRECOVERABLE_ERROR_MSG = N_("Storage configuration reset due to unrecoverable "
+                             "error. Click for details.")
 
-empty_mountpoint_msg = N_("Please enter a valid mountpoint.")
-invalid_mountpoint_msg = N_("That mount point is invalid. Try something else?")
-mountpoint_in_use_msg = N_("That mount point is already in use. Try something else?")
+def dev_type_from_const(dev_type_const):
+    return getattr(devicefactory, dev_type_const, None)
 
-raid_level_not_enough_disks_msg = N_("The RAID level you have selected (%(level)s) "
-                                     "requires more disks (%(min)d) than you "
-                                     "currently have selected (%(count)d).")
-empty_name_msg = N_("Please enter a valid name.")
-invalid_name_msg = N_("That name is invalid. Try something else?")
+def ui_storage_logged(func):
+    @wraps(func)
+    def decorated(*args, **kwargs):
+        with ui_storage_logger():
+            return func(*args, **kwargs)
 
-container_type_names = {DEVICE_TYPE_LVM: lvm_container_name,
-                        DEVICE_TYPE_LVM_THINP: lvm_container_name,
-                        DEVICE_TYPE_BTRFS: btrfs_container_name}
-
-MOUNTPOINT_OK = 0
-MOUNTPOINT_INVALID = 1
-MOUNTPOINT_IN_USE = 2
-MOUNTPOINT_EMPTY = 3
-
-mountpoint_validation_msgs = {MOUNTPOINT_OK: "",
-                              MOUNTPOINT_INVALID: invalid_mountpoint_msg,
-                              MOUNTPOINT_IN_USE: mountpoint_in_use_msg,
-                              MOUNTPOINT_EMPTY: empty_mountpoint_msg}
-
-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_DISK = N_("Disk")
-
-device_text_map = {DEVICE_TYPE_LVM: DEVICE_TEXT_LVM,
-                   DEVICE_TYPE_MD: DEVICE_TEXT_MD,
-                   DEVICE_TYPE_PARTITION: DEVICE_TEXT_PARTITION,
-                   DEVICE_TYPE_BTRFS: DEVICE_TEXT_BTRFS,
-                   DEVICE_TYPE_LVM_THINP: DEVICE_TEXT_LVM_THINP}
-
-partition_only_format_types = ["efi", "macefi", "prepboot", "biosboot",
-                               "appleboot"]
-
-def size_from_entry(entry):
-    size_text = entry.get_text().decode("utf-8").strip()
-
-    try:
-        # if no unit was specified, default to MB. Assume that a string
-        # ending with any kind of a letter has a unit suffix.
-        if size_text and unicodedata.category(size_text[-1]).startswith("L"):
-            size = Size(spec=size_text)
-        else:
-            size = Size(en_spec="%sMB" % size_text)
-    except (SizeParamsError, SizeNotPositiveError, ValueError):
-        return None
-    else:
-        # Minimium size for ui-created partitions is 1MB.
-        if size.convertTo(en_spec="mb") < 1:
-            size = Size(en_spec="1mb")
-
-    return size
-
-class UIStorageFilter(logging.Filter):
-    def filter(self, record):
-        record.name = "storage.ui"
-        return True
-
-@contextmanager
-def ui_storage_logger():
-    storage_log = logging.getLogger("blivet")
-    f = UIStorageFilter()
-    storage_log.addFilter(f)
-    yield
-    storage_log.removeFilter(f)
-
-def populate_mountpoint_store(store, used_mountpoints):
-    # sure, add whatever you want to this list. this is just a start.
-    paths = ["/", "/boot", "/home", "/var"] + \
-            platform.bootStage1ConstraintDict["mountpoints"]
-
-    # Sort the list now so all the real mountpoints go to the front, then
-    # add all the pseudo mountpoints we have.
-    paths.sort()
-    paths += ["swap"]
-
-    for fmt in ["appleboot", "biosboot", "prepboot"]:
-        if getFormat(fmt).supported:
-            paths += [fmt]
-
-    for path in paths:
-        if path not in used_mountpoints:
-            store.append([path])
-
-def validate_mountpoint(mountpoint, used_mountpoints, strict=True):
-    if strict:
-        fake_mountpoints = []
-    else:
-        fake_mountpoints = ["swap", "biosboot", "prepboot"]
-
-    valid = MOUNTPOINT_OK
-    if mountpoint in used_mountpoints:
-        valid = MOUNTPOINT_IN_USE
-    elif not mountpoint:
-        valid = MOUNTPOINT_EMPTY
-    elif mountpoint.startswith("/dev") or mountpoint.startswith("/proc") or \
-         mountpoint.startswith("/sys"):
-        valid = MOUNTPOINT_INVALID
-    elif (lowerASCII(mountpoint) not in fake_mountpoints and
-          ((len(mountpoint) > 1 and mountpoint.endswith("/")) or
-           not mountpoint.startswith("/") or
-           " " in mountpoint or
-           re.search(r'/\.*/', mountpoint) or
-           re.search(r'/\.+$', mountpoint))):
-        # - does not end with '/' unless mountpoint _is_ '/'
-        # - starts with '/' except for "swap", &c
-        # - does not contain spaces
-        # - does not contain pairs of '/' enclosing zero or more '.'
-        # - does not end with '/' followed by one or more '.'
-        valid = MOUNTPOINT_INVALID
-
-    return valid
-
-def selectedRaidLevel(raidLevelCombo):
-    """Interpret the selection of a RAID level combo box."""
-    if not raidLevelCombo.get_property("visible"):
-        # the combo is hidden when raid level isn't applicable
-        return None
-
-    itr = raidLevelCombo.get_active_iter()
-    store = raidLevelCombo.get_model()
-
-    if not itr:
-        return
-
-    selected_level_string = store[itr][0]   # eg: "RAID1 (Redundancy)"
-    level = selected_level_string.split()[0]    # -> "RAID1"
-
-    # The RAID level strings are not translated, but the "None" string in
-    # the container dialog is. Transformations in relation to "None" need
-    # to happen within the locale settings, but transformations in
-    # relation to "RAID* ..." need to happen only within ASCII. For example,
-    # "RAID1".lower() in Turkish would become "raıd1", which is not what
-    # we want.
-    levelLocale = level.lower()
-    levelASCII = lowerASCII(level)
-
-    if levelASCII == "none" or levelLocale == _("None").lower():
-        return None
-
-    return levelASCII
-
-class AddDialog(GUIObject):
-    builderObjects = ["addDialog", "mountPointStore", "mountPointCompletion", "mountPointEntryBuffer"]
-    mainWidgetName = "addDialog"
-    uiFile = "spokes/custom.glade"
-
-    def __init__(self, *args, **kwargs):
-        self.mountpoints = kwargs.pop("mountpoints", [])
-        GUIObject.__init__(self, *args, **kwargs)
-        self.size = Size(bytes=0)
-        self.mountpoint = ""
-        self._error = False
-
-        store = self.builder.get_object("mountPointStore")
-        populate_mountpoint_store(store, self.mountpoints)
-        self.builder.get_object("addMountPointEntry").set_model(store)
-
-        completion = self.builder.get_object("mountPointCompletion")
-        completion.set_text_column(0)
-        completion.set_popup_completion(True)
-
-        self._warningLabel = self.builder.get_object("mountPointWarningLabel")
-
-    def on_add_confirm_clicked(self, button, *args):
-        self.mountpoint = self.builder.get_object("addMountPointEntry").get_active_text()
-        self._error = validate_mountpoint(self.mountpoint, self.mountpoints,
-                                          strict=False)
-        self._warningLabel.set_text(_(mountpoint_validation_msgs[self._error]))
-        self.window.show_all()
-        if self._error:
-            return
-
-        self.size = size_from_entry(self.builder.get_object("addSizeEntry"))
-        self.window.destroy()
-
-    def refresh(self):
-        GUIObject.refresh(self)
-        self._warningLabel.set_text("")
-
-    def run(self):
-        while True:
-            self._error = None
-            rc = self.window.run()
-            if not self._error:
-                return rc
-
-class ConfirmDeleteDialog(GUIObject):
-    builderObjects = ["confirmDeleteDialog"]
-    mainWidgetName = "confirmDeleteDialog"
-    uiFile = "spokes/custom.glade"
-
-    def __init__(self, *args, **kwargs):
-        GUIObject.__init__(self, *args, **kwargs)
-        self._removeAll = self.builder.get_object("removeAllCheckbox")
-
-    @property
-    def deleteAll(self):
-        return self._removeAll.get_active()
-
-    def on_delete_confirm_clicked(self, button, *args):
-        self.window.destroy()
-
-    # pylint: disable-msg=W0221
-    def refresh(self, mountpoint, device, rootName, subvols=False):
-        GUIObject.refresh(self)
-        label = self.builder.get_object("confirmLabel")
-
-        if rootName and "_" in rootName:
-            rootName = rootName.replace("_", "__")
-        self._removeAll.set_label(
-                _("Delete _all other filesystems in the %s root as well.") % rootName)
-        self._removeAll.set_sensitive(rootName is not None)
-
-        if mountpoint:
-            txt = "%s (%s)" % (mountpoint, device)
-        else:
-            txt = device
-
-        if not subvols:
-            label_text = _("Are you sure you want to delete all of the data on %s?") % txt
-        else:
-            label_text = _("Are you sure you want to delete all of the data on %s, including subvolumes and/or snapshots?") % txt
-
-        label.set_text(label_text)
-
-    def run(self):
-        return self.window.run()
-
-class DisksDialog(GUIObject):
-    builderObjects = ["disks_dialog", "disk_store", "disk_view"]
-    mainWidgetName = "disks_dialog"
-    uiFile = "spokes/custom.glade"
-
-    def __init__(self, *args, **kwargs):
-        self._disks = kwargs.pop("disks")
-        free = kwargs.pop("free")
-        self.selected = kwargs.pop("selected")[:]
-        GUIObject.__init__(self, *args, **kwargs)
-        self._store = self.builder.get_object("disk_store")
-        # populate the store
-        for disk in self._disks:
-            self._store.append([disk.description,
-                                str(Size(en_spec="%dMB" % disk.size)),
-                                str(free[disk.name][0]),
-                                disk.serial,
-                                disk.id])
-
-        treeview = self.builder.get_object("disk_view")
-        model = treeview.get_model()
-        itr = model.get_iter_first()
-        selected_ids = [d.id for d in self.selected]
-        selection = treeview.get_selection()
-        while itr:
-            disk_id = model.get_value(itr, 4)
-            if disk_id in selected_ids:
-                selection.select_iter(itr)
-
-            itr = model.iter_next(itr)
-
-    def on_cancel_clicked(self, button):
-        self.window.destroy()
-
-    def _get_disk_by_id(self, disk_id):
-        for disk in self._disks:
-            if disk.id == disk_id:
-                return disk
-
-    def on_select_clicked(self, button):
-        treeview = self.builder.get_object("disk_view")
-        model, paths = treeview.get_selection().get_selected_rows()
-        self.selected = []
-        for path in paths:
-            itr = model.get_iter(path)
-            disk_id = model.get_value(itr, 4)
-            self.selected.append(self._get_disk_by_id(disk_id))
-
-        self.window.destroy()
-
-    def run(self):
-        return self.window.run()
-
-class ContainerDialog(GUIObject):
-    builderObjects = ["container_dialog", "disk_store", "container_disk_view",
-                      "containerRaidStoreFiltered", "containerRaidLevelLabel",
-                      "containerRaidLevelCombo", "raidLevelStore",
-                      "containerSizeCombo", "containerSizeEntry",
-                      "containerSizeLabel", "containerEncryptedCheckbox"]
-    mainWidgetName = "container_dialog"
-    uiFile = "spokes/custom.glade"
-
-    def __init__(self, *args, **kwargs):
-        # these are all absolutely required. not getting them is fatal.
-        self._disks = kwargs.pop("disks")
-        free = kwargs.pop("free")
-        self.selected = kwargs.pop("selected")[:]
-        self.name = kwargs.pop("name") or "" # make sure it's a string
-        self.device_type = kwargs.pop("device_type")
-
-        # these are less critical
-        self.raid_level = kwargs.pop("raid_level", None) or None # not ""
-        self.encrypted = kwargs.pop("encrypted", False)
-        self.exists = kwargs.pop("exists", False)
-
-        self.size_policy = kwargs.pop("size_policy", SIZE_POLICY_AUTO)
-        self.size = kwargs.pop("size", 0)
-
-        self._error = None
-        GUIObject.__init__(self, *args, **kwargs)
-
-        self._grabObjects()
-
-        # set up the dialog labels with device-type-specific text
-        container_type = container_type_names.get(self.device_type,
-                                                  _("container"))
-        title_text = container_dialog_title % {"container_type": container_type.upper()}
-        self._title_label.set_text(title_text)
-
-        dialog_text = container_dialog_text % {"container_type": container_type.lower()}
-        self._dialog_label.set_text(dialog_text)
-
-        # populate the dialog widgets
-        self._name_entry.set_text(self.name)
-
-        # populate the store
-        for disk in self._disks:
-            self._store.append([disk.description,
-                                str(Size(en_spec="%dMB" % disk.size)),
-                                str(free[disk.name][0]),
-                                disk.serial,
-                                disk.id])
-
-        model = self._treeview.get_model()
-        itr = model.get_iter_first()
-
-        selected_ids = [d.id for d in self.selected]
-        selection = self._treeview.get_selection()
-        while itr:
-            disk_id = model.get_value(itr, 4)
-            if disk_id in selected_ids:
-                selection.select_iter(itr)
-
-            itr = model.iter_next(itr)
-
-        # XXX how will this be related to the device encryption setting?
-        self._encryptCheckbutton.set_active(self.encrypted)
-
-        # set up the raid level combo
-        # XXX how will this be related to the device raid level setting?
-        self._raidStoreFilter.set_visible_func(self._raid_level_visible)
-        self._raidStoreFilter.refilter()
-        self._populate_raid()
-
-        size = Size(en_spec="%d mb" % self.size)
-        self._sizeEntry.set_text(size.humanReadable(max_places=None))
-        if self.size_policy == SIZE_POLICY_AUTO:
-            self._sizeCombo.set_active(0)
-        elif self.size_policy == SIZE_POLICY_MAX:
-            self._sizeCombo.set_active(1)
-        else:
-            self._sizeCombo.set_active(2)
-
-        if self.exists:
-            fancy_set_sensitive(self._name_entry, False)
-            self._treeview.set_sensitive(False)
-            fancy_set_sensitive(self._encryptCheckbutton, False)
-            fancy_set_sensitive(self._sizeCombo, False)
-            self._sizeEntry.set_sensitive(False)
-
-    def _grabObjects(self):
-        self._title_label = self.builder.get_object("container_dialog_title_label")
-        self._dialog_label = self.builder.get_object("container_dialog_label")
-        self._error_label = self.builder.get_object("containerErrorLabel")
-
-        self._name_entry = self.builder.get_object("container_name_entry")
-
-        self._encryptCheckbutton = self.builder.get_object("containerEncryptedCheckbox")
-        self._raidStoreFilter = self.builder.get_object("containerRaidStoreFiltered")
-
-        self._store = self.builder.get_object("disk_store")
-        self._treeview = self.builder.get_object("container_disk_view")
-
-        self._sizeCombo = self.builder.get_object("containerSizeCombo")
-        self._sizeEntry = self.builder.get_object("containerSizeEntry")
-
-        self._raidLevelCombo = self.builder.get_object("containerRaidLevelCombo")
-        self._raidLevelLabel = self.builder.get_object("containerRaidLevelLabel")
-
-    def _get_disk_by_id(self, disk_id):
-        for disk in self._disks:
-            if disk.id == disk_id:
-                return disk
-
-    def on_save_clicked(self, button):
-        if self.exists:
-            self.window.destroy()
-            return
-
-        # If no name was entered, quit the dialog as if they did nothing.
-        name = self._name_entry.get_text().strip()
-        if not name:
-            self._error = _(empty_name_msg)
-            self._error_label.set_text(self._error)
-            self.window.show_all()
-            return
-
-        model, paths = self._treeview.get_selection().get_selected_rows()
-
-        raid_level = selectedRaidLevel(self._raidLevelCombo)
-        if raid_level:
-            md_level = mdraid.raidLevel(raid_level)
-            min_disks = mdraid.get_raid_min_members(md_level)
-            if len(paths) < min_disks:
-                self._error = (_(raid_level_not_enough_disks_msg)
-                                 % {"level" : raid_level,
-                                     "min" : min_disks,
-                                     "count" : len(paths)})
-                self._error_label.set_text(self._error)
-                self.window.show_all()
-                return
-
-        idx = self._sizeCombo.get_active()
-        if idx == 0:
-            size = SIZE_POLICY_AUTO
-        elif idx == 1:
-            size = SIZE_POLICY_MAX
-        elif idx == 2:
-            size = size_from_entry(self._sizeEntry)
-            if size:
-                size = int(size.convertTo(en_spec="MB"))
-            elif size is None:
-                size = SIZE_POLICY_MAX
-
-        # now save the changes
-
-        self.selected = []
-        for path in paths:
-            itr = model.get_iter(path)
-            disk_id = model.get_value(itr, 4)
-            self.selected.append(self._get_disk_by_id(disk_id))
-
-        self.name = name
-        self.raid_level = raid_level
-        self.encrypted = self._encryptCheckbutton.get_active()
-        self.size_policy = size
-
-        self._error_label.set_text("")
-        self.window.destroy()
-
-    def run(self):
-        while True:
-            self._error = None
-            rc = self.window.run()
-            if not self._error:
-                return rc
-
-    def on_size_changed(self, combo):
-        active_index = combo.get_active()
-        if active_index == 0:
-            self._sizeEntry.set_sensitive(False)
-        elif active_index == 1:
-            self._sizeEntry.set_sensitive(False)
-        else:
-            self._sizeEntry.set_sensitive(True)
-
-    def _raid_level_visible(self, model, itr, user_data):
-        # This is weird because for lvm's container-wide raid we use md.
-        if self.device_type in (DEVICE_TYPE_LVM, DEVICE_TYPE_LVM_THINP):
-            return model[itr][4]
-        elif self.device_type == DEVICE_TYPE_BTRFS:
-            return model[itr][3]
-
-    def _populate_raid(self):
-        """ Set up the raid-specific portion of the device details. """
-        if self.device_type not in [DEVICE_TYPE_LVM, DEVICE_TYPE_BTRFS, DEVICE_TYPE_LVM_THINP]:
-            map(really_hide, [self._raidLevelLabel, self._raidLevelCombo])
-            return
-
-        raid_level = self.raid_level
-        if not raid_level or raid_level == "single":
-            raid_level = _("None")
-
-        # Set a default RAID level in the combo.
-        for (i, row) in enumerate(self._raidLevelCombo.get_model()):
-            log.debug("container dialog: raid level %s", row[0])
-            if row[0].upper().startswith(raid_level.upper()):
-                self._raidLevelCombo.set_active(i)
-                break
-
-        map(really_show, [self._raidLevelLabel, self._raidLevelCombo])
-        fancy_set_sensitive(self._raidLevelCombo, not self.exists)
-
-class HelpDialog(GUIObject):
-    builderObjects = ["help_dialog", "help_text_view", "help_text_buffer"]
-    mainWidgetName = "help_dialog"
-    uiFile = "spokes/custom.glade"
-
-    def run(self):
-        help_text = help_text_template % {"productName": productName}
-        help_buffer = self.builder.get_object("help_text_buffer")
-        help_buffer.set_text(_(help_text))
-        self.window.run()
-
-    def on_close(self, button):
-        self.window.destroy()
+    return decorated
 
 class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
-    builderObjects = ["customStorageWindow",
+    builderObjects = ["customStorageWindow", "containerStore", "deviceTypeStore",
                       "partitionStore", "raidStoreFiltered", "raidLevelStore",
                       "addImage", "removeImage", "settingsImage",
                       "mountPointCompletion", "mountPointStore"]
     mainWidgetName = "customStorageWindow"
     uiFile = "spokes/custom.glade"
+    helpFile = "CustomSpoke.xml"
 
     category = SystemCategory
     title = N_("MANUAL PARTITIONING")
 
     def __init__(self, data, storage, payload, instclass):
-        StorageChecker.__init__(self)
+        StorageChecker.__init__(self, min_ram=isys.MIN_GUI_RAM)
         NormalSpoke.__init__(self, data, storage, payload, instclass)
 
-        self.__storage = None
+        self._back_already_clicked = False
+        self._storage_playground = None
 
         self.passphrase = ""
 
         self._current_selector = None
         self._devices = []
         self._error = None
-        self._media_disks = []
+        self._hidden_disks = []
         self._fs_types = []             # list of supported fstypes
-        self._free_space = Size(bytes=0)
+        self._free_space = Size(0)
 
+        self._device_size_text = None
         self._device_disks = []
         self._device_container_name = None
         self._device_container_raid_level = None
@@ -663,27 +168,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     def apply(self):
         self.clear_errors()
 
-        # unhide any removable install media we hid prior to partitioning
-        with ui_storage_logger():
-            for disk in reversed(self._media_disks):
-                self.__storage.devicetree.unhide(disk)
+        self._unhide_unusable_disks()
 
-        # We can't overwrite the main Storage instance because all the other
-        # spokes have references to it that would get invalidated, but we can
-        # achieve the same effect by updating/replacing a few key attributes.
-        self.storage.devicetree._devices = self.__storage.devicetree._devices
-        self.storage.devicetree._actions = self.__storage.devicetree._actions
-        self.storage.devicetree._hidden = self.__storage.devicetree._hidden
-        self.storage.devicetree.names = self.__storage.devicetree.names
-        self.storage.roots = self.__storage.roots
-
-        new_swaps = (dev for dev in self.new_devices if dev.format.type == "swap")
+        new_swaps = (dev for dev in self.get_new_devices() if dev.format.type == "swap")
         self.storage.setFstabSwaps(new_swaps)
 
         # update the global passphrase
         self.data.autopart.passphrase = self.passphrase
 
-        # make sure any device/passphrase pairs we've obtained are remebered
+        # make sure any device/passphrase pairs we've obtained are remembered
         for device in self.storage.devices:
             if device.format.type == "luks" and not device.format.exists:
                 if not device.format.hasKey:
@@ -691,22 +184,17 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
                 self.storage.savePassphrase(device)
 
-        StorageChecker.errors = []
-        # set up bootloader and check the configuration
-        try:
-            self.storage.setUpBootLoader()
-        except BootLoaderError as e:
-            log.error("storage configuration failed: %s", e)
-            StorageChecker.errors = str(e).split("\n")
-            self.data.bootloader.bootDrive = ""
-
-        StorageChecker.run(self)
         hubQ.send_ready("StorageSpoke", True)
 
     @property
     def indirect(self):
         return True
 
+    # This spoke has no status since it's not in a hub
+    @property
+    def status(self):
+        return None
+
     def _grabObjects(self):
         self._configureBox = self.builder.get_object("configureBox")
 
@@ -717,13 +205,14 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         self._availableSpaceLabel = self.builder.get_object("availableSpaceLabel")
         self._totalSpaceLabel = self.builder.get_object("totalSpaceLabel")
-        self._summaryButton = self.builder.get_object("summary_button")
+        self._summaryLabel = self.builder.get_object("summary_label")
 
         # Buttons
         self._addButton = self.builder.get_object("addButton")
         self._applyButton = self.builder.get_object("applyButton")
         self._configButton = self.builder.get_object("configureButton")
         self._removeButton = self.builder.get_object("removeButton")
+        self._resetButton = self.builder.get_object("resetButton")
 
         # Detailed configuration stuff
         self._encryptCheckbox = self.builder.get_object("encryptCheckbox")
@@ -735,9 +224,12 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._raidLevelLabel = self.builder.get_object("raidLevelLabel")
         self._reformatCheckbox = self.builder.get_object("reformatCheckbox")
         self._sizeEntry = self.builder.get_object("sizeEntry")
+        self._typeStore = self.builder.get_object("deviceTypeStore")
         self._typeCombo = self.builder.get_object("deviceTypeCombo")
         self._modifyContainerButton = self.builder.get_object("modifyContainerButton")
         self._containerCombo = self.builder.get_object("containerCombo")
+        self._containerStore = self.builder.get_object("containerStore")
+        self._deviceDescLabel = self.builder.get_object("deviceDescLabel")
 
         self._passphraseEntry = self.builder.get_object("passphraseEntry")
 
@@ -776,11 +268,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         threadMgr.add(AnacondaThread(name=THREAD_CUSTOM_STORAGE_INIT, target=self._initialize))
 
     def _initialize(self):
-        @gtk_action_wait
-        def gtk_action(name):
-            self._fsCombo.append_text(name)
-
         self._fs_types = []
+        actions = GtkActionList()
         for cls in device_formats.itervalues():
             obj = cls()
 
@@ -791,21 +280,22 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                             (isinstance(obj, FS) or
                              obj.type in ["biosboot", "prepboot", "swap"]))
             if supported_fs:
-                gtk_action(obj.name)
+                actions.add_action(self._fsCombo.append_text, obj.name)
                 self._fs_types.append(obj.name)
 
+        actions.fire()
+
     @property
     def _clearpartDevices(self):
         return [d for d in self._devices if d.name in self.data.clearpart.drives and d.partitioned]
 
     @property
     def unusedDevices(self):
-        unused_devices = [d for d in self.__storage.unusedDevices
+        unused_devices = [d for d in self._storage_playground.unusedDevices
                                 if d.disks and d.mediaPresent and
-                                not d.partitioned and
-                                (d.isleaf or d.type.startswith("btrfs"))]
+                                not d.partitioned and d.direct]
         # add incomplete VGs and MDs
-        incomplete = [d for d in self.__storage.devicetree._devices
+        incomplete = [d for d in self._storage_playground.devicetree._devices
                             if not getattr(d, "complete", True)]
         unused_devices.extend(incomplete)
         return unused_devices
@@ -818,15 +308,17 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             if device.format.type not in format_types:
                 continue
 
-            disk_names = [d.name for d in device.disks]
-            if self.data.bootloader.bootDrive in disk_names:
+            disk_names = (d.name for d in device.disks)
+            # bootDrive may not be setup because it IS one of these.
+            if not self.data.bootloader.bootDrive or \
+               self.data.bootloader.bootDrive in disk_names:
                 devices.append(device)
 
         return devices
 
     @property
     def _currentFreeInfo(self):
-        return self.__storage.getFreeSpace(clearPartType=CLEARPART_TYPE_NONE)
+        return self._storage_playground.getFreeSpace(clearPartType=CLEARPART_TYPE_NONE)
 
     def _setCurrentFreeSpace(self):
         """Add up all the free space on selected disks and return it as a Size."""
@@ -834,12 +326,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
     def _currentTotalSpace(self):
         """Add up the sizes of all selected disks and return it as a Size."""
-        totalSpace = 0
-
-        for disk in self._clearpartDevices:
-            totalSpace += disk.size
-
-        return Size(en_spec="%f MB" % totalSpace)
+        totalSpace = sum((disk.size for disk in self._clearpartDevices),
+                         Size(0))
+        return totalSpace
 
     def _updateSpaceDisplay(self):
         # Set up the free space/available space displays in the bottom left.
@@ -848,27 +337,33 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._availableSpaceLabel.set_text(str(self._free_space))
         self._totalSpaceLabel.set_text(str(self._currentTotalSpace()))
 
-        summaryLabel = self._summaryButton.get_children()[0]
         count = len(self.data.clearpart.drives)
-        summary = P_("%d _storage device selected",
-                     "%d _storage devices selected",
-                     count) % count
+        summary = CP_("GUI|Custom Partitioning",
+                "%d _storage device selected",
+                "%d _storage devices selected",
+                count) % count
 
-        summaryLabel.set_use_markup(True)
-        summaryLabel.set_markup("<span foreground='blue'><u>%s</u></span>" % summary)
-        summaryLabel.set_use_underline(True)
+        self._summaryLabel.set_text(summary)
+        self._summaryLabel.set_use_underline(True)
+
+    @ui_storage_logged
+    def _hide_unusable_disks(self):
+        self._hidden_disks = []
+
+        for disk in self._storage_playground.disks:
+            if disk.protected or not disk.mediaPresent:
+                # hide removable disks containing install media
+                self._hidden_disks.append(disk)
+                self._storage_playground.devicetree.hide(disk)
+
+    def _unhide_unusable_disks(self):
+        for disk in reversed(self._hidden_disks):
+            self._storage_playground.devicetree.unhide(disk)
 
     def _reset_storage(self):
-        self.__storage = self.storage.copy()
-        self._media_disks = []
-
-        # hide removable disks containing install media
-        for disk in self.__storage.disks:
-            if disk.removable and disk.protected:
-                self._media_disks.append(disk)
-                self.__storage.devicetree.hide(disk)
-
-        self._devices = self.__storage.devices
+        self._storage_playground = self.storage.copy()
+        self._hide_unusable_disks()
+        self._devices = self._storage_playground.devices
 
     def refresh(self):
         self.clear_errors()
@@ -879,19 +374,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         for thread_name in [THREAD_EXECUTE_STORAGE, THREAD_STORAGE]:
             threadMgr.wait(thread_name)
 
+        self._back_already_clicked = False
+
         self.passphrase = self.data.autopart.passphrase
         self._reset_storage()
         self._do_refresh()
-        # update our free space number based on Storage
-        self._setCurrentFreeSpace()
 
         self._updateSpaceDisplay()
         self._applyButton.set_sensitive(False)
 
-    @property
-    def translated_new_install_name(self):
-        return _(new_install_name) % {"name" : productName, "version" : productVersion}
-
     @property
     def _current_page(self):
         # The current page is really a function of the current selector.
@@ -913,77 +404,90 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             self._current_selector.set_chosen(False)
             self._current_selector = None
 
-    @property
-    def new_devices(self):
+    def _get_autopart_type(self, autopartTypeCombo):
+        itr = autopartTypeCombo.get_active_iter()
+        if not itr:
+            return None
+
+        model = autopartTypeCombo.get_model()
+        return model[itr][1]
+
+    def _change_autopart_type(self, autopartTypeCombo):
+        """
+        This is called when the autopart type combo on the left hand side of
+        custom partitioning is changed.  We already know how to handle the case
+        where the user changes the type and then clicks the autopart link
+        button.  This handles the case where the user changes the type and then
+        clicks the '+' button.
+
+        """
+
+        self.data.autopart.type = self._get_autopart_type(autopartTypeCombo)
+
+    def get_new_devices(self):
         # A device scheduled for formatting only belongs in the new root.
-        new_devices = [d for d in self._devices if (d.isleaf or
-                                                    d.type.startswith("btrfs"))
-                                                   and
+        new_devices = [d for d in self._devices if d.direct and
                                                    not d.format.exists and
                                                    not d.partitioned]
 
         # If mountpoints have been assigned to any existing devices, go ahead
         # and pull those in along with any existing swap devices. It doesn't
         # matter if the formats being mounted exist or not.
-        new_mounts = [d for d in self.__storage.mountpoints.values() if d.exists]
+        new_mounts = [d for d in self._storage_playground.mountpoints.values() if d.exists]
         if new_mounts or new_devices:
-            new_devices.extend(self.__storage.mountpoints.values())
+            new_devices.extend(self._storage_playground.mountpoints.values())
             new_devices.extend(self.bootLoaderDevices)
 
         new_devices = list(set(new_devices))
 
         return new_devices
 
-    def _do_refresh(self, mountpointToShow=None):
-        # block mountpoint selector signal handler for now
-        self._initialized = False
-        self._clear_current_selector()
-
-        # Make sure we start with a clean slate.
+    def _populate_accordion(self):
+        # Make sure we start with a clean state.
         self._accordion.removeAllPages()
 
-        # Start with buttons disabled, since nothing is selected.
-        self._removeButton.set_sensitive(False)
-        self._configButton.set_sensitive(False)
+        new_devices = self.get_new_devices()
 
         # Now it's time to populate the accordion.
         log.debug("ui: devices=%s", [d.name for d in self._devices])
         log.debug("ui: unused=%s", [d.name for d in self.unusedDevices])
-        log.debug("ui: new_devices=%s", [d.name for d in self.new_devices])
+        log.debug("ui: new_devices=%s", [d.name for d in new_devices])
 
-        ui_roots = self.__storage.roots[:]
+        ui_roots = self._storage_playground.roots[:]
 
         # If we've not yet run autopart, add an instance of CreateNewPage.  This
         # ensures it's only added once.
-        if not self.new_devices:
-            page = CreateNewPage(self.translated_new_install_name,
+        if not new_devices:
+            page = CreateNewPage(translated_new_install_name(),
                                  self.on_create_clicked,
-                                 partitionsToReuse=bool(ui_roots))
+                                 self._change_autopart_type,
+                                 partitionsToReuse=bool(ui_roots) or bool(self.unusedDevices))
             self._accordion.addPage(page, cb=self.on_page_clicked)
 
             self._partitionsNotebook.set_current_page(NOTEBOOK_LABEL_PAGE)
-            self._whenCreateLabel.set_text(
-                    _("When you create mount points for your %(name)s %(version)s installation, you'll be able to view their details here.") %\
-                            {"name" : productName, "version" : productVersion})
+            self._whenCreateLabel.set_text(_("When you create mount points for "
+                    "your %(name)s %(version)s installation, you'll be able to "
+                    "view their details here.") % {"name" : productName,
+                                                   "version" : productVersion})
         else:
-            swaps = [d for d in self.new_devices if d.format.type == "swap"]
-            mounts = dict((d.format.mountpoint, d) for d in self.new_devices
+            swaps = [d for d in new_devices if d.format.type == "swap"]
+            mounts = dict((d.format.mountpoint, d) for d in new_devices
                                 if getattr(d.format, "mountpoint", None))
 
-            for device in self.new_devices:
+            for device in new_devices:
                 if device in self.bootLoaderDevices:
                     mounts[device.format.type] = device
 
-            new_root = Root(mounts=mounts, swaps=swaps, name=self.translated_new_install_name)
+            new_root = Root(mounts=mounts, swaps=swaps, name=translated_new_install_name())
             ui_roots.insert(0, new_root)
 
         # Add in all the existing (or autopart-created) operating systems.
         for root in ui_roots:
             # Don't make a page if none of the root's devices are left.
             # Also, only include devices in an old page if the format is intact.
-            if not [d for d in root.swaps + root.mounts.values()
+            if not any(d for d in root.swaps + root.mounts.values()
                         if d in self._devices and d.disks and
-                           (root.name == self.translated_new_install_name or d.format.exists)]:
+                           (root.name == translated_new_install_name() or d.format.exists)):
                 continue
 
             page = Page(root.name)
@@ -991,20 +495,20 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             for (mountpoint, device) in root.mounts.iteritems():
                 if device not in self._devices or \
                    not device.disks or \
-                   (root.name != self.translated_new_install_name and not device.format.exists):
+                   (root.name != translated_new_install_name() and not device.format.exists):
                     continue
 
                 selector = page.addSelector(device, self.on_selector_clicked,
                                             mountpoint=mountpoint)
-                selector._root = root
+                selector.root = root
 
             for device in root.swaps:
                 if device not in self._devices or \
-                   (root.name != self.translated_new_install_name and not device.format.exists):
+                   (root.name != translated_new_install_name() and not device.format.exists):
                     continue
 
                 selector = page.addSelector(device, self.on_selector_clicked)
-                selector._root = root
+                selector.root = root
 
             page.show_all()
             self._accordion.addPage(page, cb=self.on_page_clicked)
@@ -1019,6 +523,18 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             page.show_all()
             self._accordion.addPage(page, cb=self.on_page_clicked)
 
+    def _do_refresh(self, mountpointToShow=None):
+        # block mountpoint selector signal handler for now
+        self._initialized = False
+        self._clear_current_selector()
+
+        # Start with buttons disabled, since nothing is selected.
+        self._removeButton.set_sensitive(False)
+        self._configButton.set_sensitive(False)
+
+        # populate the accorion with roots and mount points
+        self._populate_accordion()
+
         # And then open the first page by default.  Most of the time, this will
         # be fine since it'll be the new installation page.
         self._initialized = True
@@ -1027,47 +543,26 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._show_mountpoint(page=firstPage, mountpoint=mountpointToShow)
 
         self._applyButton.set_sensitive(False)
+        self._resetButton.set_sensitive(len(self._storage_playground.devicetree.findActions()) > 0)
 
     ###
     ### RIGHT HAND SIDE METHODS
     ###
-
-    def _description(self, name):
-        if name == "Swap":
-            return _("The 'swap' area on your computer is used by the operating\n" \
-                     "system when running low on memory.")
-        elif name == "Boot":
-            return _("The 'boot' area on your computer is where files needed\n" \
-                     "to start the operating system are stored.")
-        elif name == "Root":
-            return _("The 'root' area on your computer is where core system\n" \
-                     "files and applications are stored.")
-        elif name == "Home":
-            return _("The 'home' area on your computer is where all your personal\n" \
-                     "data is stored.")
-        elif name == "BIOS Boot":
-            return _("The BIOS boot partition is required to enable booting\n"
-                     "from GPT-partitioned disks on BIOS hardware.")
-        elif name == "PReP Boot":
-            return _("The PReP boot partition is required as part of the\n"
-                     "bootloader configuration on some PPC platforms.")
-        else:
-            return ""
-
     def add_new_selector(self, device):
         """ Add an entry for device to the new install Page. """
-        page = self._accordion._find_by_title(self.translated_new_install_name).get_child()
+        page = self._accordion._find_by_title(translated_new_install_name()).get_child()
         devices = [device]
         if not page.members:
             # remove the CreateNewPage and replace it with a regular Page
-            expander = self._accordion._find_by_title(self.translated_new_install_name)
+            expander = self._accordion._find_by_title(translated_new_install_name())
             expander.remove(expander.get_child())
 
-            page = Page(self.translated_new_install_name)
+            page = Page(translated_new_install_name())
             expander.add(page)
 
             # also pull in biosboot and prepboot that are on our boot disk
             devices.extend(self.bootLoaderDevices)
+            devices = list(set(devices))
 
         for _device in devices:
             page.addSelector(_device, self.on_selector_clicked)
@@ -1077,61 +572,305 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     def _update_selectors(self):
         """ Update all btrfs selectors' size properties. """
         # we're only updating selectors in the new root. problem?
-        page = self._accordion._find_by_title(self.translated_new_install_name).get_child()
+        page = self._accordion._find_by_title(translated_new_install_name()).get_child()
         for selector in page.members:
-            selectorFromDevice(selector._device, selector=selector)
+            updateSelectorFromDevice(selector, selector.device)
 
-    def _replace_device(self, *args, **kwargs):
+    def _replace_device(self, **kwargs):
         """ Create a replacement device and update the device selector. """
         selector = kwargs.pop("selector", None)
-        new_device = self.__storage.factoryDevice(*args, **kwargs)
+        dev_type = kwargs.pop("device_type")
+        size = kwargs.pop("size")
+        new_device = self._storage_playground.factoryDevice(dev_type, size, **kwargs)
 
-        self._devices = self.__storage.devices
+        self._devices = self._storage_playground.devices
 
         if selector:
             # update the selector with the new device and its size
-            selectorFromDevice(new_device,
-                               selector=selector)
+            updateSelectorFromDevice(selector, new_device)
 
     def _update_device_in_selectors(self, old_device, new_device):
         for s in self._accordion.allSelectors:
             if s._device == old_device:
-                selectorFromDevice(new_device, selector=s)
+                updateSelectorFromDevice(s, new_device)
 
     def _update_all_devices_in_selectors(self):
         for s in self._accordion.allSelectors:
-            replaced = False
-            for new_device in self.__storage.devices:
+            for new_device in self._storage_playground.devices:
                 if ((s._device.name == new_device.name) or
                     (getattr(s._device, "req_name", 1) == getattr(new_device, "req_name", 2)) and
                     s._device.type == new_device.type and
                     s._device.format.type == new_device.format.type):
-                    selectorFromDevice(new_device, selector=s)
-                    replaced = True
+                    updateSelectorFromDevice(s, new_device)
                     break
-
-            if not replaced:
+            else:
                 log.warning("failed to replace device: %s", s._device)
 
+    def _add_device_type(self, dev_type_const):
+        self._typeStore.append([_(DEVICE_TEXT_MAP[dev_type_from_const(dev_type_const)]),
+                                dev_type_const])
+
+    def _validate_mountpoint(self, mountpoint, device, device_type, new_fs_type,
+                            reformat, encrypted, raid_level):
+        """ Validate various aspects of a mountpoint.
+
+            :param str mountpoint: the mountpoint
+            :param device: blivet.devices.Device instance
+            :param int device_type: one of an enumeration of device types
+            :param str new_fs_type: string representing the new filesystem type
+            :param bool reformat: whether the device is to be reformatted
+            :param bool encrypted: whether the device is to be encrypted
+            :param raid_level: instance of blivet.devicelibs.raid.RAIDLevel or None
+        """
+        error = None
+        if device_type not in (DEVICE_TYPE_PARTITION, DEVICE_TYPE_MD) and \
+           mountpoint == "/boot/efi":
+            error = (_("/boot/efi must be on a device of type %(oneFsType)s or %(anotherFsType)s")
+                       % {"oneFsType": _(DEVICE_TEXT_PARTITION), "anotherFsType": _(DEVICE_TEXT_MD)})
+        elif device_type != DEVICE_TYPE_PARTITION and \
+             new_fs_type in PARTITION_ONLY_FORMAT_TYPES:
+            error = (_("%(fs)s must be on a device of type %(type)s")
+                       % {"fs" : new_fs_type, "type" : _(DEVICE_TEXT_PARTITION)})
+        elif mountpoint and encrypted and mountpoint.startswith("/boot"):
+            error = _("%s cannot be encrypted") % mountpoint
+        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.")
+
+        if not error and \
+           (raid_level is not None or requiresRaidSelection(device_type)) and \
+           raid_level not in raidLevelsSupported(device_type):
+            error = _("Device does not support RAID level selection %s.") % raid_level
+
+        if not error and raid_level is not None:
+            min_disks = raid_level.min_members
+            if len(self._device_disks) < min_disks:
+                error = _(RAID_NOT_ENOUGH_DISKS) % {"level": raid_level,
+                                                    "min" : min_disks,
+                                                    "count": len(self._device_disks)}
+
+        return error
+
+    def _update_size_props(self):
+        self._update_selectors()
+        self._updateSpaceDisplay()
+
+    def _try_replace_device(self, selector, removed_device, new_device_info,
+                            old_device_info):
+        if removed_device:
+            # we don't want to pass the device if we removed it
+            new_device_info["device"] = None
+        try:
+            self._replace_device(selector=selector, **new_device_info)
+            return True
+        except StorageError as e:
+            log.error("factoryDevice failed: %s", e)
+            # the factory's error handling has replaced all of the
+            # devices with copies, so update the selectors' devices
+            # accordingly
+            self._update_all_devices_in_selectors()
+            self._error = e
+            self.set_warning(_(DEVICE_CONFIGURATION_ERROR_MSG))
+            self.window.show_all()
+
+            if not removed_device:
+                # nothing more to do
+                return True
+            else:
+                # we have removed the old device so we now have to re-create it
+                # the disks need to be updated since we've replaced all
+                # of the devices with copies in the devicefactory error
+                # handler
+                old_disk_names = (d.name for d in old_device_info["disks"])
+                old_device_info["disks"] = [self._storage_playground.devicetree.getDeviceByName(n) for n in old_disk_names]
+                try:
+                    self._replace_device(selector=selector, **old_device_info)
+                    return True
+                except StorageError as e:
+                    # failed to recover.
+                    self.refresh()  # this calls self.clear_errors
+                    self._error = e
+                    self.set_warning(_(UNRECOVERABLE_ERROR_MSG))
+                    self.window.show_all()
+                    return False
+
+    @ui_storage_logged
+    def _revert_reformat(self, device, use_dev):
+        # figure out the existing device and reset it
+        if not use_dev.format.exists:
+            original_device = use_dev
+        else:
+            original_device = device
+
+        log.debug("resetting device %s", original_device.name)
+        self._storage_playground.resetDevice(original_device)
+
+    def _bound_size(self, size, device):
+        # If no size was specified, we just want to grow to the maximum.
+        # But resizeDevice doesn't take None for a value.
+        if not size:
+            size = device.maxSize
+        elif size < device.minSize:
+            size = device.minSize
+        elif size > device.maxSize:
+            size = device.maxSize
+
+        return size
+
+    @ui_storage_logged
+    def _handle_size_change(self, size, old_size, device, use_dev):
+        # bound size to boundaries given by the device
+        size = self._bound_size(size, device)
+        size = device.alignTargetSize(size)
+
+        # And then we need to re-check that the max size is actually
+        # different from the current size.
+        _changed_size = False
+        if size != device.size and size == device.currentSize:
+            # size has been set back to its original value
+            actions = self._storage_playground.devicetree.findActions(action_type="resize",
+                                                            devid=device.id)
+            for action in reversed(actions):
+                self._storage_playground.devicetree.cancelAction(action)
+                _changed_size = True
+        elif size != device.size:
+            log.debug("scheduling resize of device %s to %s", device.name, size)
+
+            try:
+                self._storage_playground.resizeDevice(device, size)
+            except StorageError as e:
+                log.error("failed to schedule device resize: %s", e)
+                device.size = old_size
+                self._error = e
+                self.set_warning(_("Device resize request failed. "
+                                   "Click for details."))
+                self.window.show_all()
+            else:
+                _changed_size = True
+
+        if _changed_size:
+            log.debug("new size: %s", device.size)
+            log.debug("target size: %s", device.targetSize)
+
+            # update the selector's size property
+            for s in self._accordion.allSelectors:
+                if s._device == device:
+                    s.size = str(device.size)
+
+            # update size props of all btrfs devices' selectors
+            self._update_size_props()
+
+    @ui_storage_logged
+    def _handle_encryption_change(self, encrypted, device, old_device, selector):
+        if not encrypted:
+            log.info("removing encryption from %s", device.name)
+            self._storage_playground.destroyDevice(device)
+            self._devices.remove(device)
+            old_device = device
+            device = device.slave
+            selector.device = device
+            self._update_device_in_selectors(old_device, device)
+        else:
+            log.info("applying encryption to %s", device.name)
+            old_device = device
+            new_fmt = getFormat("luks", device=device.path)
+            self._storage_playground.formatDevice(device, new_fmt)
+            luks_dev = LUKSDevice("luks-" + device.name,
+                                  parents=[device])
+            self._storage_playground.createDevice(luks_dev)
+            self._devices.append(luks_dev)
+            device = luks_dev
+            selector.device = device
+            self._update_device_in_selectors(old_device, device)
+
+        self._devices = self._storage_playground.devices
+
+        # possibly changed device and old_device, need to return the new ones
+        return (device, old_device)
+
+    @ui_storage_logged
+    def _do_reformat(self, device, mountpoint, label, changed_encryption,
+                     encrypted, selector, fs_type):
+        self.clear_errors()
+        #
+        # ENCRYPTION
+        #
+        old_device = None
+        if changed_encryption:
+            device, old_device = self._handle_encryption_change(encrypted,
+                                                device, old_device, selector)
+        #
+        # FORMATTING
+        #
+        log.info("scheduling reformat of %s as %s", device.name, fs_type)
+        old_format = device.format
+        new_format = getFormat(fs_type,
+                               mountpoint=mountpoint, label=label,
+                               device=device.path)
+        try:
+            self._storage_playground.formatDevice(device, new_format)
+        except StorageError as e:
+            log.error("failed to register device format action: %s", e)
+            device.format = old_format
+            self._error = e
+            self.set_warning(_("Device reformat request failed. "
+                               "Click for details."))
+            self.window.show_all()
+        else:
+            # first, remove this selector from any old install page(s)
+            new_selector = None
+            for (page, _selector) in self._accordion.allMembers:
+                if _selector.device in (device, old_device):
+                    if page.pageTitle == translated_new_install_name():
+                        new_selector = _selector
+                        continue
+
+                    page.removeSelector(_selector)
+                    if not page.members:
+                        log.debug("removing empty page %s", page.pageTitle)
+                        self._accordion.removePage(page.pageTitle)
+
+            # either update the existing selector or add a new one
+            if new_selector:
+                updateSelectorFromDevice(new_selector, device)
+            else:
+                self.add_new_selector(device)
+
+        # possibly changed device, need to return the new one
+        return device
+
     def _save_right_side(self, selector):
         """ Save settings from RHS and apply changes to the device.
 
             This method must never trigger a call to self._do_refresh.
         """
+
+        # check if initialized and have something to operate on
         if not self._initialized or not selector:
             return
 
-        device = selector._device
+        # only call _save_right_side if on the right page and some changes need
+        # to be saved (sensitivity of the Update Settings button reflects that)
+        if self._partitionsNotebook.get_current_page() != NOTEBOOK_DETAILS_PAGE or \
+           not self._applyButton.get_sensitive():
+            return
+
+        device = selector.device
         if device not in self._devices:
             # just-removed device
             return
 
-        if self._partitionsNotebook.get_current_page() != NOTEBOOK_DETAILS_PAGE:
-            return
+        self._back_already_clicked = False
 
-        use_dev = device
-        if device.type == "luks/dm-crypt":
-            use_dev = device.slave
+        # dictionaries for many, many pieces of information about the device and
+        # requested changes, minimum required entropy for LUKS creation is
+        # always the same
+        new_device_info = {"min_luks_entropy": crypto.MIN_CREATE_ENTROPY}
+        old_device_info = {"min_luks_entropy": crypto.MIN_CREATE_ENTROPY}
+
+        new_device_info["device"] = device
+        use_dev = device.raw_device
 
         log.info("ui: saving changes to device %s", device.name)
 
@@ -1148,25 +887,30 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             # name entry insensitive means we don't control the name
             name = None
 
-        log.debug("old name: %s", old_name)
-        log.debug("new name: %s", name)
+        old_device_info["name"] = old_name
+        new_device_info["name"] = name
 
         # SIZE
         old_size = device.size
-        size = size_from_entry(self._sizeEntry)
-        if size:
-            size = int(size.convertTo(en_spec="MB"))
+
+        # we are interested in size human readable representation change because
+        # that's what the user sees
+        same_size = self._device_size_text == self._sizeEntry.get_text()
+        if same_size:
+            size = old_size
+        else:
+            size = size_from_entry(self._sizeEntry)
         changed_size = ((use_dev.resizable or not use_dev.exists) and
-                        size != int(old_size))
-        log.debug("old size: %s", old_size)
-        log.debug("new size: %s", size)
+                        not same_size)
+        old_device_info["size"] = old_size
+        new_device_info["size"] = size
 
         # DEVICE TYPE
         device_type = self._get_current_device_type()
         old_device_type = devicefactory.get_device_type(device)
         changed_device_type = (old_device_type != device_type)
-        log.debug("old device type: %s", old_device_type)
-        log.debug("new device type: %s", device_type)
+        old_device_info["device_type"] = old_device_type
+        new_device_info["device_type"] = device_type
 
         # REFORMAT
         reformat = self._reformatCheckbox.get_active()
@@ -1175,28 +919,34 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         # FS TYPE
         old_fs_type = device.format.type
         fs_type_index = self._fsCombo.get_active()
-        fs_type = self._fsCombo.get_model()[fs_type_index][0]
-        fs_type_short = getFormat(fs_type).type
-        changed_fs_type = (old_fs_type != fs_type_short)
-        log.debug("old fs type: %s", old_fs_type)
-        log.debug("new fs type: %s", fs_type_short)
+        fs_type_str = self._fsCombo.get_model()[fs_type_index][0]
+        new_fs = getFormat(fs_type_str)
+        fs_type = new_fs.type
+        changed_fs_type = (old_fs_type != fs_type)
+        old_device_info["fstype"] = old_fs_type
+        new_device_info["fstype"] = fs_type
 
         # ENCRYPTION
         old_encrypted = isinstance(device, LUKSDevice)
         encrypted = self._encryptCheckbox.get_active()
         changed_encryption = (old_encrypted != encrypted)
-        log.debug("old encryption setting: %s", old_encrypted)
-        log.debug("new encryption setting: %s", encrypted)
+        old_device_info["encrypted"] = old_encrypted
+        new_device_info["encrypted"] = encrypted
 
         # FS LABEL
-        label = ""
-        if self._labelEntry.get_sensitive():
-            label = self._labelEntry.get_text()
-
-        old_label = getattr(device.format, "label", "") or ""
+        label = self._labelEntry.get_text()
+        old_label = getattr(device.format, "label", "")
         changed_label = (label != old_label)
-        log.debug("old label: %s", old_label)
-        log.debug("new_label: %s", label)
+        old_device_info["label"] = old_label
+        new_device_info["label"] = label
+        if changed_label or changed_fs_type:
+            error = validate_label(label, new_fs)
+            if error:
+                self._error = error
+                self.set_warning(self._error)
+                self.window.show_all()
+                self._populate_right_side(selector)
+                return
 
         # MOUNTPOINT
         mountpoint = None   # None means format type is not mountable
@@ -1204,17 +954,17 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             mountpoint = self._mountPointEntry.get_text()
 
         old_mountpoint = getattr(device.format, "mountpoint", "") or ""
-        log.debug("old mountpoint: %s", old_mountpoint)
-        log.debug("new mountpoint: %s", mountpoint or "")
+        old_device_info["mountpoint"] = old_mountpoint
+        new_device_info["mountpoint"] = mountpoint
         if mountpoint is not None and (reformat or
                                        mountpoint != old_mountpoint):
-            mountpoints = self.__storage.mountpoints.copy()
+            mountpoints = self._storage_playground.mountpoints.copy()
             if old_mountpoint:
                 del mountpoints[old_mountpoint]
 
             error = validate_mountpoint(mountpoint, mountpoints.keys())
             if error:
-                self._error = _(mountpoint_validation_msgs[error])
+                self._error = error
                 self.set_warning(self._error)
                 self.window.show_all()
                 self._populate_right_side(selector)
@@ -1233,38 +983,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                               device_type in (DEVICE_TYPE_MD,
                                               DEVICE_TYPE_BTRFS) and
                               old_raid_level != raid_level)
-        log.debug("old raid level: %s", old_raid_level)
-        log.debug("new raid level: %s", raid_level)
+        old_device_info["raid_level"] = old_raid_level
+        new_device_info["raid_level"] = raid_level
 
         ##
         ## VALIDATION
         ##
-        error = None
-        if device_type != DEVICE_TYPE_PARTITION and mountpoint == "/boot/efi":
-            error = (_("/boot/efi must be on a device of type %s")
-                     % _(DEVICE_TEXT_PARTITION))
-        elif device_type != DEVICE_TYPE_PARTITION and \
-             fs_type_short in partition_only_format_types:
-            error = (_("%(fs)s must be on a device of type %(type)s")
-                       % {"fs" : fs_type, "type" : _(DEVICE_TEXT_PARTITION)})
-        elif mountpoint and encrypted and mountpoint.startswith("/boot"):
-            error = _("%s cannot be encrypted") % mountpoint
-        elif encrypted and fs_type_short in partition_only_format_types:
-            error = _("%s cannot be encrypted") % fs_type
-        elif mountpoint == "/" and device.format.exists and not reformat:
-            error = _("You must create a new filesystem on the root device.")
-        elif device_type == DEVICE_TYPE_MD and raid_level in (None, "single"):
-            error = _("Devices of type %s require a valid RAID level selection.") % DEVICE_TEXT_MD
-
-        if not error and raid_level not in (None, "single"):
-            md_level = mdraid.raidLevel(raid_level)
-            min_disks = mdraid.get_raid_min_members(md_level)
-            if len(self._device_disks) < min_disks:
-                error = _(raid_level_not_enough_disks_msg) % \
-                        {"level": raid_level,
-                         "min" : min_disks,
-                         "count": len(self._device_disks)}
-
+        error = self._validate_mountpoint(mountpoint, device, device_type,
+                                          fs_type_str, reformat, encrypted,
+                                          raid_level)
         if error:
             self.set_warning(error)
             self.window.show_all()
@@ -1283,11 +1010,12 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         with ui_storage_logger():
             # create a new factory using the appropriate size and type
-            factory = devicefactory.get_device_factory(self.__storage,
+            factory = devicefactory.get_device_factory(self._storage_playground,
                                                       device_type, size,
                                                       disks=device.disks,
                                                       encrypted=encrypted,
-                                                      raid_level=raid_level)
+                                                      raid_level=raid_level,
+                                                      min_luks_entropy=crypto.MIN_CREATE_ENTROPY)
 
         # CONTAINER
         changed_container = False
@@ -1311,25 +1039,25 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             if old_container and container_name != old_container.name:
                 changed_container = True
 
-        log.debug("old container: %s", old_container_name)
-        log.debug("new container: %s", container_name)
+        old_device_info["container_name"] = old_container_name
+        new_device_info["container_name"] = container_name
 
         container_encrypted = self._device_container_encrypted
-        log.debug("old container encrypted: %s", old_container_encrypted)
-        log.debug("new container encrypted: %s", container_encrypted)
+        old_device_info["container_encrypted"] = old_container_encrypted
+        new_device_info["container_encrypted"] = container_encrypted
         changed_container_encrypted = (container_encrypted != old_container_encrypted)
 
         container_raid_level = self._device_container_raid_level
-        if container_raid_level == "single" and device_type != DEVICE_TYPE_BTRFS:
-            container_raid_level = None
+        if container_raid_level not in containerRaidLevelsSupported(device_type):
+            container_raid_level = defaultContainerRaidLevel(device_type)
 
-        log.debug("old container raid level: %s", old_container_raid_level)
-        log.debug("new container raid level: %s", container_raid_level)
+        old_device_info["container_raid_level"] = old_container_raid_level
+        new_device_info["container_raid_level"] = container_raid_level
         changed_container_raid_level = (old_container_raid_level != container_raid_level)
 
         container_size = self._device_container_size
-        log.debug("old container size request: %s", old_container_size)
-        log.debug("new container size request: %s", container_size)
+        old_device_info["container_size"] = old_container_size
+        new_device_info["container_size"] = container_size
         changed_container_size = (old_container_size != container_size)
 
         # DISK SET
@@ -1342,9 +1070,19 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             log.debug("overriding disk set with container's")
             disks = container.disks[:]
         changed_disk_set = (set(old_disks) != set(disks))
+        old_device_info["disks"] = old_disks
+        new_device_info["disks"] = disks
         log.debug("old disks: %s", [d.name for d in old_disks])
         log.debug("new disks: %s", [d.name for d in disks])
 
+        log.debug("device: %s", device)
+        already_logged = {"disks", "device"}
+        # log the other changes (old_device_info doesn't have the 'device' key)
+        for key in (to_log for to_log in
+                    old_device_info.keys() if to_log not in already_logged):
+            log.debug("old %s: %s", key, old_device_info[key])
+            log.debug("new %s: %s", key, new_device_info[key])
+
         # XXX prevent multiple raid or encryption layers?
 
         changed = (changed_name or changed_size or changed_device_type or
@@ -1354,6 +1092,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                    changed_container or changed_container_encrypted or
                    changed_container_raid_level or changed_container_size)
 
+        ##
+        ## Handle changes to an existing device
+        ##
         if not use_dev.exists:
             if not changed:
                 log.debug("nothing changed for new device")
@@ -1361,9 +1102,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
             self.clear_errors()
 
-            #
-            # Handle change of device type and change of container
-            #
             if changed_device_type or changed_container:
                 # remove the current device
                 self._destroy_device(device)
@@ -1371,68 +1109,24 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                     # the removal failed. don't continue.
                     log.error("device removal failed")
                     return
-
-                _device = None
-                _old_device = None
+                removed_device = True
             else:
-                _device = device
+                removed_device = False
 
             with ui_storage_logger():
-                try:
-                    self._replace_device(device_type, size, fstype=fs_type,
-                                         disks=disks, mountpoint=mountpoint,
-                                         label=label, raid_level=raid_level,
-                                         encrypted=encrypted, name=name,
-                                         container_name=container_name,
-                                         container_encrypted=container_encrypted,
-                                         container_raid_level=container_raid_level,
-                                         container_size=container_size,
-                                         device=_device,
-                                         selector=selector)
-                except StorageError as e:
-                    log.error("factoryDevice failed: %s", e)
-                    # the factory's error handling has replaced all of the
-                    # devices with copies, so update the selectors' devices
-                    # accordingly
-                    self._update_all_devices_in_selectors()
-                    self._error = e
-                    self.set_warning(_(device_configuration_error_msg)) 
-                    self.window.show_all()
+                succ = self._try_replace_device(selector, removed_device,
+                                                new_device_info, old_device_info)
+            if not succ:
+                # failed, nothing more to be done
+                return
 
-                    if _device is None:
-                        # in this case we have removed the old device so we now have
-                        # to re-create it
-                        try:
-                            self._replace_device(old_device_type, device.size,
-                                                 disks=old_disks,
-                                                 fstype=old_fs_type,
-                                                 mountpoint=old_mountpoint,
-                                                 label=old_label,
-                                                 raid_level=old_raid_level,
-                                                 encrypted=old_encrypted,
-                                                 name=old_name,
-                                                 container_name=old_container_name,
-                                                 container_encrypted=old_container_encrypted,
-                                                 container_raid_level=old_container_raid_level,
-                                                 container_size=old_container_size,
-                                                 selector=selector)
-                        except StorageError as e:
-                            # failed to recover.
-                            self.refresh()  # this calls self.clear_errors
-                            self._error = e
-                            self.set_warning(_(unrecoverable_error_msg))
-                            self.window.show_all()
-                            return
-
-            self._update_device_in_selectors(device, selector._device)
-            self._devices = self.__storage.devices
-
-            # update size props of all btrfs devices' selectors
-            self._update_selectors()
-
-            self._updateSpaceDisplay()
+            self._update_device_in_selectors(device, selector.device)
+            self._devices = self._storage_playground.devices
 
+            # update size properties and the right side
+            self._update_size_props()
             self._populate_right_side(selector)
+
             log.debug("leaving save_right_side")
             return
 
@@ -1444,67 +1138,11 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         # a reformat.
         if not reformat and (not use_dev.format.exists or
                              not device.format.exists):
-            # figure out the existing device and reset it
-            if not use_dev.format.exists:
-                original_device = use_dev
-            else:
-                original_device = device
-
-            log.debug("resetting device %s", original_device.name)
-
-            with ui_storage_logger():
-                self.__storage.resetDevice(original_device)
+            self._revert_reformat(device, use_dev)
 
+        # Handle size change
         if changed_size and device.resizable:
-            # If no size was specified, we just want to grow to
-            # the maximum.  But resizeDevice doesn't take None for
-            # a value.
-            if not size:
-                size = device.maxSize
-            elif size < device.minSize:
-                size = device.minSize
-            elif size > device.maxSize:
-                size = device.maxSize
-
-            # And then we need to re-check that the max size is actually
-            # different from the current size.
-            _changed_size = False
-            if size != device.size and int(size) == int(device.currentSize):
-                # size has been set back to its original value
-                actions = self.__storage.devicetree.findActions(type="resize",
-                                                                devid=device.id)
-                with ui_storage_logger():
-                    for action in actions:
-                        self.__storage.devicetree.cancelAction(action)
-                        _changed_size = True
-            elif size != device.size:
-                log.debug("scheduling resize of device %s to %s MB", device.name, size)
-
-                with ui_storage_logger():
-                    try:
-                        self.__storage.resizeDevice(device, size)
-                    except StorageError as e:
-                        log.error("failed to schedule device resize: %s", e)
-                        device.size = old_size
-                        self._error = e
-                        self.set_warning(_("Device resize request failed. "
-                                           "Click for details."))
-                        self.window.show_all()
-                    else:
-                        _changed_size = True
-
-            if _changed_size:
-                log.debug("new size: %s", device.size)
-                log.debug("target size: %s", device.targetSize)
-
-                # update the selector's size property
-                for s in self._accordion.allSelectors:
-                    if s._device == device:
-                        s.size = size_str(device.size)
-
-                # update size props of all btrfs devices' selectors
-                self._update_selectors()
-                self._updateSpaceDisplay()
+            self._handle_size_change(size, old_size, device, use_dev)
 
         # it's possible that reformat is active but fstype is unchanged, in
         # which case we're not going to schedule another reformat unless
@@ -1512,80 +1150,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         do_reformat = (reformat and (changed_encryption or
                                      changed_fs_type or
                                      device.format.exists))
+
+        # Handle reformat
         if do_reformat:
-            self.clear_errors()
-            #
-            # ENCRYPTION
-            #
-            old_device = None
-            if changed_encryption:
-                if not encrypted:
-                    log.info("removing encryption from %s", device.name)
-                    with ui_storage_logger():
-                        self.__storage.destroyDevice(device)
-                        self._devices.remove(device)
-                        old_device = device
-                        device = device.slave
-                        selector._device = device
-                        self._update_device_in_selectors(old_device, device)
-                elif encrypted:
-                    log.info("applying encryption to %s", device.name)
-                    with ui_storage_logger():
-                        old_device = device
-                        new_fmt = getFormat("luks", device=device.path)
-                        self.__storage.formatDevice(device, new_fmt)
-                        luks_dev = LUKSDevice("luks-" + device.name,
-                                              parents=[device])
-                        self.__storage.createDevice(luks_dev)
-                        self._devices.append(luks_dev)
-                        device = luks_dev
-                        selector._device = device
-                        self._update_device_in_selectors(old_device, device)
-
-                self._devices = self.__storage.devices
-
-            #
-            # FORMATTING
-            #
-            log.info("scheduling reformat of %s as %s", device.name, fs_type_short)
-            with ui_storage_logger():
-                old_format = device.format
-                new_format = getFormat(fs_type,
-                                       mountpoint=mountpoint, label=label,
-                                       device=device.path)
-                try:
-                    self.__storage.formatDevice(device, new_format)
-                except StorageError as e:
-                    log.error("failed to register device format action: %s", e)
-                    device.format = old_format
-                    self._error = e
-                    self.set_warning(_("Device reformat request failed. "
-                                       "Click for details."))
-                    self.window.show_all()
-                else:
-                    # first, remove this selector from any old install page(s)
-                    new_selector = None
-                    for (page, _selector) in self._accordion.allMembers:
-                        if _selector._device in (device, old_device):
-                            if page.pageTitle == self.translated_new_install_name:
-                                new_selector = _selector
-                                continue
-
-                            page.removeSelector(_selector)
-                            if not page.members:
-                                log.debug("removing empty page %s", page.pageTitle)
-                                self._accordion.removePage(page.pageTitle)
-
-                    # either update the existing selector or add a new one
-                    if new_selector:
-                        selectorFromDevice(device, selector=new_selector)
-                    else:
-                        self.add_new_selector(device)
-
-        if not do_reformat:
+            device = self._do_reformat(device, mountpoint, label, changed_encryption,
+                                       encrypted, selector, fs_type)
+        else:
             # Set various attributes that do not require actions.
             if old_label != label and hasattr(device.format, "label") and \
-               not device.format.exists:
+               validate_label(label, device.format) == "":
                 self.clear_errors()
                 log.debug("updating label on %s to %s", device.name, label)
                 device.format.label = label
@@ -1595,7 +1168,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                 log.debug("updating mountpoint of %s to %s", device.name, mountpoint)
                 device.format.mountpoint = mountpoint
                 if old_mountpoint:
-                    selectorFromDevice(device, selector=selector)
+                    updateSelectorFromDevice(selector, device)
                 else:
                     # add an entry to the new page but do not remove any entries
                     # from other pages since we haven't altered the filesystem
@@ -1609,82 +1182,52 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             use_dev._name = name
             new_name = use_dev.name
             log.debug("changing name of %s to %s", old_name, new_name)
-            if new_name in self.__storage.names:
+            if new_name in self._storage_playground.names:
                 use_dev._name = old_name
                 self.set_info(_("Specified name %s already in use.") % new_name)
             else:
-                selectorFromDevice(device, selector=selector)
+                updateSelectorFromDevice(selector, device)
 
         self._populate_right_side(selector)
 
     def _raid_level_visible(self, model, itr, user_data):
         device_type = self._get_current_device_type()
-        if device_type == DEVICE_TYPE_LVM:
-            return model[itr][1]
-        elif device_type == DEVICE_TYPE_MD:
-            return model[itr][2]
-        elif device_type == DEVICE_TYPE_BTRFS:
-            return model[itr][3]
+        raid_level = raid.getRaidLevel(model[itr][1])
+        return raid_level in raidLevelsSupported(device_type)
 
     def _populate_raid(self, raid_level):
-        """ Set up the raid-specific portion of the device details. """
+        """ Set up the raid-specific portion of the device details.
+
+            :param raid_level: RAID level
+            :type raid_level: instance of blivet.devicelibs.raid.RAIDLevel or None
+        """
         device_type = self._get_current_device_type()
         log.debug("populate_raid: %s, %s", device_type, raid_level)
 
-        if device_type == DEVICE_TYPE_MD:
-            base_level = "raid1"
-        else:
+        if not raidLevelsSupported(device_type):
             map(really_hide, [self._raidLevelLabel, self._raidLevelCombo])
             return
 
-        if not raid_level:
-            raid_level = base_level
+        raid_level = raid_level or defaultRaidLevel(device_type)
+        raid_level_name = raidLevelSelection(raid_level)
 
         # Set a default RAID level in the combo.
         for (i, row) in enumerate(self._raidLevelCombo.get_model()):
-            if row[0].upper().startswith(raid_level.upper()):
+            if row[1] == raid_level_name:
                 self._raidLevelCombo.set_active(i)
                 break
 
         map(really_show, [self._raidLevelLabel, self._raidLevelCombo])
 
     def _get_current_device_type(self):
-        device_type_text = self._typeCombo.get_active_text()
-        log.info("getting device type for %s", device_type_text)
-        device_type = None
-        if device_type_text == _(DEVICE_TEXT_LVM):
-            device_type = DEVICE_TYPE_LVM
-        elif device_type_text == _(DEVICE_TEXT_MD):
-            device_type = DEVICE_TYPE_MD
-        elif device_type_text == _(DEVICE_TEXT_PARTITION):
-            device_type = DEVICE_TYPE_PARTITION
-        elif device_type_text == _(DEVICE_TEXT_BTRFS):
-            device_type = DEVICE_TYPE_BTRFS
-        elif device_type_text == _(DEVICE_TEXT_DISK):
-            device_type = DEVICE_TYPE_DISK
-        elif device_type_text == _(DEVICE_TEXT_LVM_THINP):
-            device_type = DEVICE_TYPE_LVM_THINP
-        else:
-            log.error("unknown device type: '%s'", device_type_text)
+        itr = self._typeCombo.get_active_iter()
+        if not itr:
+            return None
 
-        return device_type
-
-    def _populate_right_side(self, selector):
-        log.debug("populate_right_side: %s", selector._device)
-
-        device = selector._device
-        if device.type == "luks/dm-crypt":
-            use_dev = device.slave
-        else:
-            use_dev = device
-
-        if hasattr(use_dev, "req_disks") and not use_dev.exists:
-            self._device_disks = use_dev.req_disks[:]
-        else:
-            self._device_disks = device.disks[:]
-
-        log.debug("updated device_disks to %s", [d.name for d in self._device_disks])
+        # we have the constant name in the second column of the store
+        return dev_type_from_const(self._typeStore[itr][1])
 
+    def _update_container_info(self, use_dev):
         if hasattr(use_dev, "vg"):
             self._device_container_name = use_dev.vg.name
             self._device_container_raid_level = get_raid_level(use_dev.vg)
@@ -1702,66 +1245,24 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             self._device_container_encrypted = False
             self._device_container_size = SIZE_POLICY_AUTO
 
-        log.debug("updated device_container_name to %s", self._device_container_name)
-        log.debug("updated device_container_raid_level to %s", self._device_container_raid_level)
-        log.debug("updated device_container_encrypted to %s", self._device_container_encrypted)
-        log.debug("updated device_container_size to %s", self._device_container_size)
-
-        self._selectedDeviceLabel.set_text(selector.props.name)
-        self._selectedDeviceDescLabel.set_text(self._description(selector.props.name))
-
-        device_name = getattr(use_dev, "lvname", use_dev.name)
-        self._nameEntry.set_text(device_name)
-
-        self._mountPointEntry.set_text(getattr(device.format, "mountpoint", "") or "")
-        fancy_set_sensitive(self._mountPointEntry, device.format.mountable)
-
-        self._labelEntry.set_text(getattr(device.format, "label", "") or "")
-        # We could label existing formats that have a labelFsProg if we added an
-        # ActionLabelFormat class.
-        can_label = (hasattr(device.format, "label") and
-                     not device.format.exists and
-                     device.format.type != "btrfs")
-        fancy_set_sensitive(self._labelEntry, can_label)
-
-        if hasattr(device.format, "label"):
-            self._labelEntry.props.has_tooltip = False
-        else:
-            self._labelEntry.set_tooltip_text(_("This file system does not support labels."))
-
-        self._sizeEntry.set_text(Size(en_spec="%d MB" % device.size).humanReadable(max_places=None))
-
-        self._reformatCheckbox.set_active(not device.format.exists)
-        fancy_set_sensitive(self._reformatCheckbox, not device.protected and
-                                                          use_dev.exists and
-                                                          not use_dev.type.startswith("btrfs"))
-
-        self._encryptCheckbox.set_active(isinstance(device, LUKSDevice))
-        self._encryptCheckbox.set_sensitive(self._reformatCheckbox.get_active())
-        ancestors = use_dev.ancestors
-        ancestors.remove(use_dev)
-        if any(a.format.type == "luks" for a in ancestors):
-            # The encryption checkbutton should not be sensitive if there is
-            # existing encryption below the leaf layer.
-            self._encryptCheckbox.set_sensitive(False)
-
-        ##
-        ## Set up the filesystem type combo.
-        ##
+        self._device_container_raid_level = self._device_container_raid_level \
+           or defaultContainerRaidLevel(devicefactory.get_device_type(use_dev))
 
+    def _setup_fstype_combo(self, device):
         # remove any fs types that aren't supported
         remove_indices = []
-        for idx, data in enumerate(self._fsCombo.get_model()):
-            fs_type = data[0]
+        for idx, row in enumerate(self._fsCombo.get_model()):
+            fs_type = row[0]
             if fs_type not in self._fs_types:
-                remove_indices.insert(0, idx)
+                remove_indices.append(idx)
                 continue
 
             if fs_type == device.format.name:
                 self._fsCombo.set_active(idx)
 
-        for remove_idx in remove_indices:
-            self._fsCombo.remove(remove_idx)
+        # remove items from the combobox in reversed order so that item 3
+        # doesn't become item 2 by removing item 1 etc.
+        map(self._fsCombo.remove, reversed(remove_indices))
 
         # if the current device has unsupported formatting, add an entry for it
         if device.format.name not in self._fs_types:
@@ -1775,100 +1276,143 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
            device.originalFormat.type not in self._fs_types:
             self._fsCombo.append_text(device.originalFormat.name)
 
-        ##
-        ## Set up the device type combo.
-        ##
-
-        btrfs_pos = None
-        btrfs_included = False
-        md_pos = None
-        md_included = False
-        disk_pos = None
-        disk_included = False
-        for idx, itr in enumerate(self._typeCombo.get_model()):
-            if itr[0] == _(DEVICE_TEXT_BTRFS):
-                btrfs_pos = idx
-                btrfs_included = True
-            elif itr[0] == _(DEVICE_TEXT_MD):
-                md_pos = idx
-                md_included = True
-            elif itr[0] == _(DEVICE_TEXT_DISK):
-                disk_pos = idx
-                disk_included = True
-
-        remove_indices = []
+    def _setup_device_type_combo(self, device, use_dev, device_name):
+        # these device types should always be listed
+        should_appear = {"DEVICE_TYPE_PARTITION", "DEVICE_TYPE_LVM", "DEVICE_TYPE_LVM_THINP"}
 
         # only include md if there are two or more disks
-        include_md = (use_dev.type == "mdarray" or
-                      len(self._clearpartDevices) > 1)
-        if include_md and not md_included:
-            self._typeCombo.append_text(_(DEVICE_TEXT_MD))
-        elif md_included and not include_md:
-            remove_indices.append(md_pos)
+        if (use_dev.type == "mdarray" or len(self._clearpartDevices) > 1):
+            should_appear.add("DEVICE_TYPE_MD")
 
         # if the format is swap the device type can't be btrfs
-        include_btrfs = (use_dev.format.type not in
-                            partition_only_format_types + ["swap"])
-        if include_btrfs and not btrfs_included:
-            self._typeCombo.append_text(_(DEVICE_TEXT_BTRFS))
-        elif btrfs_included and not include_btrfs:
-            remove_indices.append(btrfs_pos)
+        if use_dev.format.type not in PARTITION_ONLY_FORMAT_TYPES + ("swap",):
+            should_appear.add("DEVICE_TYPE_BTRFS")
 
         # only include disk if the current device is a disk
-        include_disk = use_dev.isDisk
-        if include_disk and not disk_included:
-            self._typeCombo.append_text(_(DEVICE_TEXT_DISK))
-        elif disk_included and not include_disk:
-            remove_indices.append(disk_pos)
+        if use_dev.isDisk:
+            should_appear.add("DEVICE_TYPE_DISK")
 
-        remove_indices.sort(reverse=True)
-        map(self._typeCombo.remove, remove_indices)
+        # go through the store and remove things that shouldn't be included
+        # store.remove() updates or invalidates the passed iterator
+        itr = self._typeStore.get_iter_first()
+        valid = True
+        while itr and valid:
+            dev_type_const = self._typeStore[itr][1]
+            if dev_type_const not in should_appear:
+                valid = self._typeStore.remove(itr)
+            elif dev_type_const in should_appear:
+                # already seen, shouldn't be added to the list again
+                should_appear.remove(dev_type_const)
+                itr = self._typeStore.iter_next(itr)
 
-        md_pos = None
-        btrfs_pos = None
-        partition_pos = None
-        lvm_pos = None
-        thinp_pos = None
-        for idx, itr in enumerate(self._typeCombo.get_model()):
-            if itr[0] == _(DEVICE_TEXT_BTRFS):
-                btrfs_pos = idx
-            elif itr[0] == _(DEVICE_TEXT_MD):
-                md_pos = idx
-            elif itr[0] == _(DEVICE_TEXT_PARTITION):
-                partition_pos = idx
-            elif itr[0] == _(DEVICE_TEXT_LVM):
-                lvm_pos = idx
-            elif itr[0] == _(DEVICE_TEXT_DISK):
-                disk_pos = idx
-            elif itr[0] == _(DEVICE_TEXT_LVM_THINP):
-                thinp_pos = idx
+        # add missing device types
+        for dev_type_const in should_appear:
+            self._add_device_type(dev_type_const)
 
         device_type = devicefactory.get_device_type(device)
-        raid_level = devicefactory.get_raid_level(device)
-        type_index_map = {DEVICE_TYPE_PARTITION: partition_pos,
-                          DEVICE_TYPE_BTRFS: btrfs_pos,
-                          DEVICE_TYPE_LVM: lvm_pos,
-                          DEVICE_TYPE_LVM_THINP: thinp_pos,
-                          DEVICE_TYPE_MD: md_pos,
-                          DEVICE_TYPE_DISK: disk_pos}
 
         for _type in self._device_name_dict.iterkeys():
             if _type == device_type:
                 self._device_name_dict[_type] = device_name
                 continue
-            elif _type not in (DEVICE_TYPE_LVM, DEVICE_TYPE_MD, DEVICE_TYPE_BTRFS, DEVICE_TYPE_LVM_THINP):
+            elif _type not in NAMED_DEVICE_TYPES:
                 continue
 
-            swap = (device.format.type == "swap")
+            is_swap = device.format.type == "swap"
             mountpoint = getattr(device.format, "mountpoint", None)
 
             with ui_storage_logger():
-                name = self.__storage.suggestDeviceName(swap=swap,
+                name = self._storage_playground.suggestDeviceName(swap=is_swap,
                                                         mountpoint=mountpoint)
 
             self._device_name_dict[_type] = name
 
-        self._typeCombo.set_active(type_index_map[device_type])
+        itr = self._typeStore.get_iter_first()
+        while itr:
+            if dev_type_from_const(self._typeStore[itr][1]) == device_type:
+                self._typeCombo.set_active_iter(itr)
+                break
+            itr = self._typeStore.iter_next(itr)
+        else:
+            msg = "Didn't find device type %s in device type combobox" % device_type
+            raise KeyError(msg)
+
+        return device_type
+
+    def _set_devices_label(self):
+        device_disks = self._device_disks
+        if not device_disks:
+            devices_desc = _("No disks assigned")
+        else:
+            devices_desc = "%s (%s)" % (device_disks[0].description, device_disks[0].name)
+            num_disks = len(device_disks)
+            if num_disks > 1:
+                devices_desc += CP_("GUI|Custom Partitioning|Devices",
+                                    " and %d other", " and %d others",
+                                    num_disks - 1) % (num_disks -1 )
+        self._deviceDescLabel.set_text(devices_desc)
+
+    def _populate_right_side(self, selector):
+        log.debug("populate_right_side: %s", selector.device)
+
+        device = selector.device
+        use_dev = device.raw_device
+
+        if hasattr(use_dev, "req_disks") and not use_dev.exists:
+            self._device_disks = use_dev.req_disks[:]
+        else:
+            self._device_disks = device.disks[:]
+
+        self._update_container_info(use_dev)
+
+        log.debug("updated device_disks to %s", [d.name for d in self._device_disks])
+        log.debug("updated device_container_name to %s", self._device_container_name)
+        log.debug("updated device_container_raid_level to %s", self._device_container_raid_level)
+        log.debug("updated device_container_encrypted to %s", self._device_container_encrypted)
+        log.debug("updated device_container_size to %s", self._device_container_size)
+
+        self._selectedDeviceLabel.set_text(selector.props.name)
+        desc = _(MOUNTPOINT_DESCRIPTIONS.get(selector.props.name, ""))
+        self._selectedDeviceDescLabel.set_text(desc)
+
+        self._set_devices_label()
+
+        device_name = getattr(use_dev, "lvname", use_dev.name)
+        self._nameEntry.set_text(device_name)
+
+        self._mountPointEntry.set_text(getattr(device.format, "mountpoint", "") or "")
+        fancy_set_sensitive(self._mountPointEntry, device.format.mountable)
+
+        if hasattr(device.format, "label"):
+            if device.format.label is None:
+                device.format.label = ""
+            self._labelEntry.set_text(device.format.label)
+        else:
+            self._labelEntry.set_text("")
+        fancy_set_sensitive(self._labelEntry, True)
+
+        self._device_size_text = device.size.humanReadable(max_places=2)
+        self._sizeEntry.set_text(self._device_size_text)
+
+        self._reformatCheckbox.set_active(not device.format.exists)
+        fancy_set_sensitive(self._reformatCheckbox,
+                            use_dev.exists and not use_dev.formatImmutable)
+
+        self._encryptCheckbox.set_active(isinstance(device, LUKSDevice))
+        self._encryptCheckbox.set_sensitive(self._reformatCheckbox.get_active())
+        ancestors = use_dev.ancestors
+        ancestors.remove(use_dev)
+        if any(a.format.type == "luks" for a in ancestors):
+            # The encryption checkbutton should not be sensitive if there is
+            # existing encryption below the leaf layer.
+            self._encryptCheckbox.set_sensitive(False)
+
+        # Set up the filesystem type combo.
+        self._setup_fstype_combo(device)
+
+        # Set up the device type combo.
+        device_type = self._setup_device_type_combo(device, use_dev, device_name)
+
         fancy_set_sensitive(self._fsCombo, self._reformatCheckbox.get_active() and
                                            device_type != DEVICE_TYPE_BTRFS)
 
@@ -1899,7 +1443,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         else:
             self._sizeEntry.set_tooltip_text(_("This file system may not be resized."))
 
-        self._populate_raid(raid_level)
+        self._populate_raid(get_raid_level(device))
         self._populate_container(device=use_dev)
         # do this last in case this was set sensitive in on_device_type_changed
         if use_dev.exists or use_dev.type == "btrfs volume":
@@ -1909,61 +1453,185 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     ### SIGNAL HANDLERS
     ###
 
-    def on_key_pressed(self, window, event, *args):
-        # Handle any keyboard events.  Right now this is just delete for
-        # removing an existing mountpoint, but it could include more later.
+    def on_key_pressed(self, widget, event, *args):
         if not event or event and event.type != Gdk.EventType.KEY_RELEASE:
             return
 
-        if event.keyval == Gdk.KEY_Delete:
+        if event.keyval in [Gdk.KEY_Delete, Gdk.KEY_minus]:
             # But we only want delete to work if you have focused a MountpointSelector,
             # and not just any random widget.  For those, it's likely the user wants
             # to delete a character.
-            if isinstance(window.get_focus(), MountpointSelector):
+            if isinstance(self.main_window.get_focus(), MountpointSelector):
                 self._removeButton.emit("clicked")
+        elif event.keyval == Gdk.KEY_plus:
+            # And we only want '+' to work if you don't have a text entry focused, since
+            # the user might be entering some free-form text that can include a plus.
+            if not isinstance(self.main_window.get_focus(), Gtk.Entry):
+                self._addButton.emit("clicked")
+
+    def _do_check(self):
+        self.clear_errors()
+        StorageChecker.errors = []
+        StorageChecker.warnings = []
+
+        # We can't overwrite the main Storage instance because all the other
+        # spokes have references to it that would get invalidated, but we can
+        # achieve the same effect by updating/replacing a few key attributes.
+        self.storage.devicetree._devices = self._storage_playground.devicetree._devices
+        self.storage.devicetree._actions = self._storage_playground.devicetree._actions
+        self.storage.devicetree._hidden = self._storage_playground.devicetree._hidden
+        self.storage.devicetree.dasd = self._storage_playground.devicetree.dasd
+        self.storage.devicetree.names = self._storage_playground.devicetree.names
+        self.storage.roots = self._storage_playground.roots
+
+        # set up bootloader and check the configuration
+        try:
+            self.storage.setUpBootLoader()
+        except BootLoaderError as e:
+            log.error("storage configuration failed: %s", e)
+            StorageChecker.errors = str(e).split("\n")
+            self.data.bootloader.bootDrive = ""
+
+        StorageChecker.checkStorage(self)
+
+        if self.errors:
+            self.set_warning(_("Error checking storage configuration.  Click for details or press Done again to continue."))
+        elif self.warnings:
+            self.set_warning(_("Warning checking storage configuration.  Click for details or press Done again to continue."))
+
+        # on_info_bar_clicked requires self._error to be set, so set it to the
+        # list of all errors and warnings that storage checking found.
+        self.window.show_all()
+        self._error = "\n".join(self.errors + self.warnings)
+
+        return self._error == ""
 
     def on_back_clicked(self, button):
-        # First, save anything from the currently displayed mountpoint.
+        # Clear any existing errors
+        self.clear_errors()
+
+        # Save anything from the currently displayed mountpoint.
         self._save_right_side(self._current_selector)
 
         # And then display the summary screen.  From there, the user will either
         # head back to the hub, or stay on the custom screen.
-        self.__storage.devicetree.pruneActions()
-        self.__storage.devicetree.sortActions()
+        self._storage_playground.devicetree.pruneActions()
+        self._storage_playground.devicetree.sortActions()
 
-        dialog = ActionSummaryDialog(self.data)
-        with enlightbox(self.window, dialog.window):
-            dialog.refresh(self.__storage.devicetree.findActions())
-            rc = dialog.run()
 
-        if rc == 0:
-            # Cancel.  Stay on the custom screen.
-            return
+        # If back has been clicked on once already and no other changes made on the screen,
+        # run the storage check now.  This handles displaying any errors in the info bar.
+        if not self._back_already_clicked:
+            self._back_already_clicked = True
 
-        # Then if they did anything that resulted in new LUKS devices, we need
-        # to prompt for passphrases.
-        new_luks = any(d for d in self.__storage.devices
-                       if d.format.type == "luks" and not d.format.exists)
-        if new_luks:
-            dialog = PassphraseDialog(self.data)
-            with enlightbox(self.window, dialog.window):
-                rc = dialog.run()
-
-            if rc == 0:
-                # Cancel. Leave the old passphrase set if there was one.
+            # If we hit any errors while saving things above, stop and let the
+            # user think about what they have done
+            if self._error is not None:
                 return
 
-            self.passphrase = dialog.passphrase
+            new_luks = [d for d in self._storage_playground.devices
+                       if d.format.type == "luks" and not d.format.exists]
+            if new_luks:
+                dialog = PassphraseDialog(self.data)
+                with self.main_window.enlightbox(dialog.window):
+                    rc = dialog.run()
+
+                if rc != 1:
+                    # Cancel. Leave the old passphrase set if there was one.
+                    return
+
+                self.passphrase = dialog.passphrase
+
+            for luks in new_luks:
+                if not luks.format.hasKey:
+                    luks.format.passphrase = self.passphrase
+
+            if not self._do_check():
+                return
+
+        if len(self._storage_playground.devicetree.findActions()) > 0:
+            dialog = ActionSummaryDialog(self.data)
+            dialog.refresh(self._storage_playground.devicetree.findActions())
+            with self.main_window.enlightbox(dialog.window):
+                rc = dialog.run()
+
+            if rc != 1:
+                # Cancel.  Stay on the custom screen.
+                return
 
         NormalSpoke.on_back_clicked(self, button)
 
+    @ui_storage_logged
+    def _add_device(self, dev_info):
+        factory = devicefactory.get_device_factory(self._storage_playground,
+                                                   dev_info["device_type"], dev_info["size"],
+                                                   min_luks_entropy=crypto.MIN_CREATE_ENTROPY)
+        container = factory.get_container()
+        if container:
+            # don't override user-initiated changes to a defined container
+            dev_info["disks"] = container.disks
+            dev_info.update({"container_encrypted": container.encrypted,
+                             "container_raid_level": get_raid_level(container),
+                             "container_size": getattr(container, "size_policy",
+                                                       container.size)})
+
+            # The container is already encrypted
+            if container.encrypted:
+                dev_info["encrypted"] = False
+
+        device_type = dev_info.pop("device_type")
+        try:
+            self._storage_playground.factoryDevice(device_type,
+                                                   **dev_info)
+        except StorageError as e:
+            log.error("factoryDevice failed: %s", e)
+            log.debug("trying to find an existing container to use")
+            container = factory.get_container(allow_existing=True)
+            log.debug("found container %s", container)
+            if container:
+                # don't override user-initiated changes to a defined container
+                dev_info["disks"] = container.disks
+                dev_info.update({"container_encrypted": container.encrypted,
+                                 "container_raid_level": get_raid_level(container),
+                                 "container_size": getattr(container, "size_policy",
+                                                               container.size),
+                                 "container_name": container.name})
+                try:
+                    self._storage_playground.factoryDevice(device_type,
+                                                           **dev_info)
+                except StorageError as e2:
+                    log.error("factoryDevice failed w/ old container: %s", e2)
+                else:
+                    type_str = _(DEVICE_TEXT_MAP[device_type])
+                    self.set_info(_("Added new %(type)s to existing "
+                                    "container %(name)s.")
+                                    % {"type" : type_str, "name" : container.name})
+                    self.window.show_all()
+                    e = None
+
+            # the factory's error handling has replaced all of the devices
+            # with copies, so update the selectors' devices accordingly
+            self._update_all_devices_in_selectors()
+
+            if e:
+                self._error = e
+                self.set_error(_("Failed to add new device. Click for "
+                                 "details."))
+                self.window.show_all()
+        except OverflowError as e:
+            log.error("invalid size set for partition")
+            self._error = e
+            self.set_error(_("Invalid partition size set. Use a valid integer."))
+            self.window.show_all()
+
     def on_add_clicked(self, button):
         self._save_right_side(self._current_selector)
 
+        ## initialize and run the AddDialog
         dialog = AddDialog(self.data,
-                           mountpoints=self.__storage.mountpoints.keys())
-        with enlightbox(self.window, dialog.window):
-            dialog.refresh()
+                           mountpoints=self._storage_playground.mountpoints.keys())
+        dialog.refresh()
+        with self.main_window.enlightbox(dialog.window):
             rc = dialog.run()
 
             if rc != 1:
@@ -1971,169 +1639,111 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                 dialog.window.destroy()
                 return
 
+        self._back_already_clicked = False
+
+        ## gather data about the added mountpoint
+        # minimum entropy required for LUKS creation is always the same
+        # TODO: use instance of a class with properly named attributes
+        dev_info = {"min_luks_entropy": crypto.MIN_CREATE_ENTROPY}
+
         # create a device of the default type, using any disks, with an
         # appropriate fstype and mountpoint
-        mountpoint = dialog.mountpoint
+        dev_info["mountpoint"] = dialog.mountpoint
         log.debug("requested size = %s  ; available space = %s", dialog.size, self._free_space)
 
         # if no size was entered, request as much of the free space as possible
-        if dialog.size is not None and dialog.size.convertTo(en_spec="mb") < 1:
-            size = None
+        if dialog.size is not None and dialog.size.convertTo(spec="mb") < 1:
+            dev_info["size"] = None
         else:
-            size = dialog.size
+            dev_info["size"] = dialog.size
 
-        fstype = self.storage.getFSType(mountpoint)
+        dev_info["fstype"] = self.storage.getFSType(dev_info["mountpoint"])
 
         # The encryption setting as applied here means "encrypt leaf devices".
         # If you want "encrypt my VG/PVs" you'll have to either use the autopart
         # button or wait until we have a way to control container-level
         # encryption.
-        encrypted = self.data.autopart.encrypted
+        dev_info["encrypted"] = self.data.autopart.encrypted
 
         # we're doing nothing here to ensure that bootable requests end up on
         # the boot disk, but the weight from platform should take care of this
 
-        if lowerASCII(mountpoint) in ("swap", "biosboot", "prepboot"):
-            mountpoint = None
+        if lowerASCII(dev_info["mountpoint"]) in ("swap", "biosboot", "prepboot"):
+            dev_info["mountpoint"] = None
 
-        device_type_from_autopart = {AUTOPART_TYPE_LVM: DEVICE_TYPE_LVM,
-                                     AUTOPART_TYPE_LVM_THINP: DEVICE_TYPE_LVM_THINP,
-                                     AUTOPART_TYPE_PLAIN: DEVICE_TYPE_PARTITION,
-                                     AUTOPART_TYPE_BTRFS: DEVICE_TYPE_BTRFS}
-        device_type = device_type_from_autopart[self.data.autopart.type]
-        if (device_type != DEVICE_TYPE_PARTITION and
-            ((mountpoint and mountpoint.startswith("/boot")) or
-             fstype in partition_only_format_types)):
-            device_type = DEVICE_TYPE_PARTITION
+        dev_info["device_type"] = device_type_from_autopart(self.data.autopart.type)
+        if (dev_info["device_type"] != DEVICE_TYPE_PARTITION and
+            ((dev_info["mountpoint"] and dev_info["mountpoint"].startswith("/boot")) or
+             dev_info["fstype"] in PARTITION_ONLY_FORMAT_TYPES)):
+            dev_info["device_type"] = DEVICE_TYPE_PARTITION
 
         # we shouldn't create swap on a thinly provisioned volume
-        if fstype == "swap" and device_type == DEVICE_TYPE_LVM_THINP:
-            device_type = DEVICE_TYPE_LVM
+        if dev_info["fstype"] == "swap" and dev_info["device_type"] == DEVICE_TYPE_LVM_THINP:
+            dev_info["device_type"] = DEVICE_TYPE_LVM
 
         # encryption of thinly provisioned volumes isn't supported
-        if encrypted and device_type == DEVICE_TYPE_LVM_THINP:
-            encrypted = False
+        if dev_info["encrypted"] and dev_info["device_type"] == DEVICE_TYPE_LVM_THINP:
+            dev_info["encrypted"] = False
 
         # some devices should never be encrypted
-        if ((mountpoint and mountpoint.startswith("/boot")) or
-            fstype in partition_only_format_types):
-            encrypted = False
+        if ((dev_info["mountpoint"] and dev_info["mountpoint"].startswith("/boot")) or
+            dev_info["fstype"] in PARTITION_ONLY_FORMAT_TYPES):
+            dev_info["encrypted"] = False
 
-        disks = self._clearpartDevices
-        if size is not None:
-            size = float(size.convertTo(en_spec="mb"))
+        dev_info["disks"] = self._clearpartDevices
 
+        ## clear errors and try to add the mountpoint/device
         self.clear_errors()
+        self._add_device(dev_info)
 
-        with ui_storage_logger():
-            factory = devicefactory.get_device_factory(self.__storage,
-                                                     device_type, size)
-            container = factory.get_container()
-            kwargs = {}
-            if container:
-                # don't override user-initiated changes to a defined container
-                disks = container.disks
-                kwargs = {"container_encrypted": container.encrypted,
-                          "container_raid_level": get_raid_level(container),
-                          "container_size": getattr(container, "size_policy",
-                                                               container.size)}
-
-                # The container is already encrypted
-                if container.encrypted:
-                    encrypted = False
-
-            try:
-                self.__storage.factoryDevice(device_type,
-                                         size=size,
-                                         fstype=fstype,
-                                         mountpoint=mountpoint,
-                                         encrypted=encrypted,
-                                         disks=disks,
-                                         **kwargs)
-            except StorageError as e:
-                log.error("factoryDevice failed: %s", e)
-                log.debug("trying to find an existing container to use")
-                container = factory.get_container(allow_existing=True)
-                log.debug("found container %s", container)
-                if container:
-                    # don't override user-initiated changes to a defined container
-                    disks = container.disks
-                    kwargs = {"container_encrypted": container.encrypted,
-                              "container_raid_level": get_raid_level(container),
-                              "container_size": getattr(container, "size_policy",
-                                                                   container.size)}
-                    try:
-                        self.__storage.factoryDevice(device_type,
-                                                 size=size,
-                                                 fstype=fstype,
-                                                 mountpoint=mountpoint,
-                                                 encrypted=encrypted,
-                                                 disks=disks,
-                                                 container_name=container.name,
-                                                 **kwargs)
-                    except StorageError as e2:
-                        log.error("factoryDevice failed w/ old container: %s", e2)
-                    else:
-                        type_str = device_text_map[device_type]
-                        self.set_info(_("Added new %(type)s to existing "
-                                        "container %(name)s.")
-                                        % {"type" : type_str, "name" : container.name})
-                        self.window.show_all()
-                        e = None
-
-                # the factory's error handling has replaced all of the devices
-                # with copies, so update the selectors' devices accordingly
-                self._update_all_devices_in_selectors()
-
-                if e:
-                    self._error = e
-                    self.set_error(_("Failed to add new device. Click for "
-                                     "details."))
-                    self.window.show_all()
-            except OverflowError as e:
-                log.error("invalid size set for partition")
-                self._error = e
-                self.set_error(_("Invalid partition size set. Use a "
-                                 "valid integer."))
-                self.window.show_all()
-
-        self._devices = self.__storage.devices
+        ## refresh internal state and UI elements
+        self._devices = self._storage_playground.devices
         if not self._error:
-            self._do_refresh(mountpointToShow=mountpoint or fstype)
+            self._do_refresh(mountpointToShow=dev_info["mountpoint"] or dev_info["fstype"])
         else:
             self._do_refresh()
         self._updateSpaceDisplay()
 
+    @ui_storage_logged
+    def _remove_empty_parents(self, device):
+        # if this device has parents with no other children, remove them too
+        for parent in device.parents:
+            if parent.kids == 0 and not parent.isDisk:
+                self._destroy_device(parent)
+
+    @ui_storage_logged
     def _destroy_device(self, device):
         self.clear_errors()
-        with ui_storage_logger():
-            is_logical_partition = getattr(device, "isLogical", False)
-            try:
-                if device.isDisk:
-                    self.__storage.initializeDisk(device)
-                elif device.type.startswith("btrfs") and not device.isleaf:
-                    self.__storage.recursiveRemove(device)
-                else:
-                    self.__storage.destroyDevice(device)
-            except StorageError as e:
-                log.error("failed to schedule device removal: %s", e)
-                self._error = e
-                self.set_warning(_("Device removal request failed. Click "
-                                   "for details."))
-                self.window.show_all()
+        is_logical_partition = getattr(device, "isLogical", False)
+        try:
+            if device.isDisk:
+                self._storage_playground.initializeDisk(device)
+            elif device.direct and not device.isleaf:
+                # we shouldn't call this method for with non-leaf devices except
+                # for those which are also directly accessible like lvm
+                # snapshot origins and btrfs subvolumes that contain other
+                # subvolumes
+                self._storage_playground.recursiveRemove(device)
             else:
-                if is_logical_partition:
-                    self.__storage.removeEmptyExtendedPartitions()
+                self._storage_playground.destroyDevice(device)
+        except StorageError as e:
+            log.error("failed to schedule device removal: %s", e)
+            self._error = e
+            self.set_warning(_("Device removal request failed. Click "
+                               "for details."))
+            self.window.show_all()
+        else:
+            if is_logical_partition:
+                self._storage_playground.removeEmptyExtendedPartitions()
 
         # If we've just removed the last partition and the disklabel is pre-
         # existing, reinitialize the disk.
         if device.type == "partition" and device.exists and \
            device.disk.format.exists:
-            with ui_storage_logger():
-                if self.__storage.shouldClear(device.disk):
-                    self.__storage.initializeDisk(device.disk)
+            if self._storage_playground.shouldClear(device.disk):
+                self._storage_playground.initializeDisk(device.disk)
 
-        self._devices = self.__storage.devices
+        self._devices = self._storage_playground.devices
 
         # should this be in DeviceTree._removeDevice?
         container = None
@@ -2144,28 +1754,30 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             container = device.volume
             device_type = DEVICE_TYPE_BTRFS
 
+        if not container:
+            # no container, just remove empty parents of the device
+            self._remove_empty_parents(device)
+            return
+
         # adjust container to size of remaining devices, if auto-sized
         if container and not container.exists and \
-           self.__storage.devicetree.getChildren(container) and \
+           self._storage_playground.devicetree.getChildren(container) and \
            container.size_policy == SIZE_POLICY_AUTO:
             cont_encrypted = container.encrypted
             cont_raid = get_raid_level(container)
             cont_size = container.size_policy
             cont_name = container.name
-            with ui_storage_logger():
-                factory = devicefactory.get_device_factory(self.__storage,
-                                            device_type, 0,
-                                            disks=container.disks,
-                                            container_name=cont_name,
-                                            container_encrypted=cont_encrypted,
-                                            container_raid_level=cont_raid,
-                                            container_size=cont_size)
-                factory.configure()
+            factory = devicefactory.get_device_factory(self._storage_playground,
+                                        device_type, Size(0),
+                                        disks=container.disks,
+                                        container_name=cont_name,
+                                        container_encrypted=cont_encrypted,
+                                        container_raid_level=cont_raid,
+                                        container_size=cont_size,
+                                        min_luks_entropy=crypto.MIN_CREATE_ENTROPY)
+            factory.configure()
 
-        # if this device has parents with no other children, remove them too
-        for parent in device.parents:
-            if parent.kids == 0 and not parent.isDisk:
-                self._destroy_device(parent)
+        self._remove_empty_parents(device)
 
     def _show_mountpoint(self, page=None, mountpoint=None):
         if not self._initialized:
@@ -2198,22 +1810,22 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         page = self._current_page
         selector = self._current_selector
-        device = self._current_selector._device
+        device = self._current_selector.device
         root_name = None
-        if selector._root:
-            root_name = selector._root.name
+        if selector.root:
+            root_name = selector.root.name
         elif page:
             root_name = page.pageTitle
 
         log.debug("removing device '%s' from page %s", device, root_name)
 
-        if root_name == self.translated_new_install_name:
+        if root_name == translated_new_install_name():
             if device.exists:
                 # This is an existing device that was added to the new page.
                 # All we want to do is revert any changes to the device and
                 # it will end up back in whatever old pages it came from.
                 with ui_storage_logger():
-                    self.__storage.resetDevice(device)
+                    self._storage_playground.resetDevice(device)
 
                 log.debug("updated device: %s", device)
             else:
@@ -2225,14 +1837,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             # on it.  Thus, we first need to confirm with the user and then
             # schedule actions to delete the thing.
             dialog = ConfirmDeleteDialog(self.data)
-            with enlightbox(self.window, dialog.window):
-                subvols = (device.type.startswith("btrfs") and
-                           not device.isleaf)
-                dialog.refresh(getattr(device.format, "mountpoint", ""),
-                               device.name, root_name, subvols=subvols)
+            snapshots = (device.direct and not device.isleaf)
+            dialog.refresh(getattr(device.format, "mountpoint", ""),
+                           device.name, root_name, snapshots=snapshots)
+            with self.main_window.enlightbox(dialog.window):
                 rc = dialog.run()
 
-                if rc == 0:
+                if rc != 1:
                     dialog.window.destroy()
                     return
 
@@ -2252,27 +1863,21 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
     def on_summary_clicked(self, button):
         dialog = SelectedDisksDialog(self.data)
-
-        with enlightbox(self.window, dialog.window):
-            dialog.refresh(self._clearpartDevices, self._currentFreeInfo,
-                           showRemove=False, setBoot=False)
+        dialog.refresh(self._clearpartDevices, self._currentFreeInfo,
+                       showRemove=False, setBoot=False)
+        with self.main_window.enlightbox(dialog.window):
             dialog.run()
 
-    def on_help_clicked(self, button):
-        help_window = HelpDialog(self.data)
-        with enlightbox(self.window, help_window.window):
-            help_window.run()
-
     def on_configure_clicked(self, button):
         selector = self._current_selector
         if not selector:
             return
 
-        device = selector._device
+        device = selector.device
         if device.exists:
             return
 
-        if self._get_current_device_type() in (DEVICE_TYPE_LVM, DEVICE_TYPE_LVM_THINP, DEVICE_TYPE_BTRFS):
+        if self._get_current_device_type() in CONTAINER_DEVICE_TYPES:
             # disk set management happens through container edit on RHS
             return
 
@@ -2282,10 +1887,10 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                              disks=self._clearpartDevices,
                              free=self._currentFreeInfo,
                              selected=self._device_disks)
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             rc = dialog.run()
 
-        if rc == 0:
+        if rc != 1:
             return
 
         disks = dialog.selected
@@ -2300,10 +1905,21 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             self._applyButton.set_sensitive(True)
 
         self._device_disks = disks
+        self._set_devices_label()
         self._populate_raid(selectedRaidLevel(self._raidLevelCombo))
 
+    def _container_encryption_change(self, old_encrypted, new_encrypted):
+        if not old_encrypted and new_encrypted:
+            # container set to be encrypted, we should make sure the leaf device
+            # is not encrypted and make the encryption checkbox insensitive
+            self._encryptCheckbox.set_active(False)
+            fancy_set_sensitive(self._encryptCheckbox, False)
+        elif old_encrypted and not new_encrypted:
+            fancy_set_sensitive(self._encryptCheckbox, True)
+
     def run_container_editor(self, container=None, name=None):
-        size = 0
+        """ Run container edit dialog and return True if changes were made. """
+        size = Size(0)
         size_policy = self._device_container_size
         if container:
             container_name = container.name
@@ -2325,13 +1941,14 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                                  disks=self._clearpartDevices,
                                  free=self._currentFreeInfo,
                                  selected=self._device_disks,
+                                 storage=self._storage_playground,
                                  exists=getattr(container, "exists", False))
 
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             rc = dialog.run()
             dialog.window.destroy()
 
-        if rc == 0:
+        if rc != 1:
             return
 
         disks = dialog.selected
@@ -2344,7 +1961,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             return
 
         log.debug("new container name: %s", name)
-        if name != container_name and name in self.__storage.names:
+        if name != container_name and name in self._storage_playground.names:
             self._error = _("Volume Group name %s is already in use. Not "
                             "saving changes.") % name
             self.set_info(self._error)
@@ -2362,20 +1979,32 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         log.debug("new container encrypted: %s", dialog.encrypted)
         log.debug("new container size: %s", dialog.size_policy)
 
+        if dialog.encrypted:
+            self._container_encryption_change(self._device_container_encrypted,
+                                              dialog.encrypted)
         self._device_disks = disks
         self._device_container_name = name
         self._device_container_raid_level = dialog.raid_level
         self._device_container_encrypted = dialog.encrypted
         self._device_container_size = dialog.size_policy
+        self._set_devices_label()
+
+        return True
+
+    def _container_store_row(self, name, freeSpace=None):
+        if freeSpace is not None:
+            return [name, _("(%s free)") % freeSpace]
+        else:
+            return [name, ""]
 
     def on_modify_container_clicked(self, button):
-        container_name = self._containerCombo.get_active_text()
-
-        container = self.__storage.devicetree.getDeviceByName(container_name)
+        container_name = self._containerStore[self._containerCombo.get_active()][0]
+        container = self._storage_playground.devicetree.getDeviceByName(container_name)
 
         # pass the name along with any found vg since we could be modifying a
         # vg that hasn't been instantiated yet
-        self.run_container_editor(container=container, name=container_name)
+        if not self.run_container_editor(container=container, name=container_name):
+            return
 
         log.debug("%s -> %s", container_name, self._device_container_name)
         if container_name == self._device_container_name:
@@ -2384,29 +2013,46 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         log.debug("renaming container %s to %s", container_name, self._device_container_name)
         if container:
             # btrfs volume name/label does not go in the name list
-            if container.name in self.__storage.devicetree.names:
-                self.__storage.devicetree.names.remove(container.name)
-                self.__storage.devicetree.names.append(self._device_container_name)
+            if container.name in self._storage_playground.devicetree.names:
+                self._storage_playground.devicetree.names.remove(container.name)
+                self._storage_playground.devicetree.names.append(self._device_container_name)
 
-            # until there's a setter for btrfs volume name 
+            # until there's a setter for btrfs volume name
             container._name = self._device_container_name
             if container.format.type == "btrfs":
                 container.format.label = self._device_container_name
 
         container_exists = getattr(container, "exists", False)
-        for idx, data in enumerate(self._containerCombo.get_model()):
+
+        # TODO: implement and use function for finding item in combobox
+        for idx, data in enumerate(self._containerStore):
             # we're looking for the original vg name
             if data[0] == container_name:
-                self._containerCombo.remove(idx)
-                self._containerCombo.insert_text(idx, self._device_container_name)
-                self._containerCombo.set_active(idx)
-                self._modifyContainerButton.set_sensitive(not container_exists)
                 break
+        else:
+            # no match found, just update selectors and return
+            self._update_selectors()
+            return
+
+        c = self._storage_playground.devicetree.getDeviceByName(self._device_container_name)
+        freeSpace = getattr(c, "freeSpace", None)
+
+        # else branch of for loop above ensures idx is defined
+        # pylint: disable=undefined-loop-variable
+        self._containerStore.insert(idx, self._container_store_row(self._device_container_name, freeSpace))
+        self._containerCombo.set_active(idx)
+        self._modifyContainerButton.set_sensitive(not container_exists)
+        self._containerStore.remove(self._containerStore.get_iter_from_string("%s" % (idx + 1)))
 
         self._update_selectors()
 
     def on_container_changed(self, combo):
-        container_name = combo.get_active_text()
+        ndx = combo.get_active()
+        if ndx == -1:
+            return
+
+        container_name = self._containerStore[ndx][0]
+
         log.debug("new container selection: %s", container_name)
         if container_name is None:
             return
@@ -2415,22 +2061,30 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             return
 
         device_type = self._get_current_device_type()
-        container_type = container_type_names[device_type].lower()
-        new_text = _(new_container_text) % {"container_type": container_type}
-        if container_name == new_text:
+        container_type = get_container_type_name(device_type).lower()
+        new_text = _(NEW_CONTAINER_TEXT) % {"container_type": container_type}
+        create_new_container = container_name == new_text
+        if create_new_container:
             # run the vg editor dialog with a default name and disk set
             hostname = self.data.network.hostname
-            name = self.__storage.suggestContainerName(hostname=hostname)
-            self.run_container_editor(name=name)
-            for idx, data in enumerate(combo.get_model()):
-                if data[0] == new_text:
-                    combo.insert_text(idx, self._device_container_name)
+            name = self._storage_playground.suggestContainerName(hostname=hostname)
+            new = self.run_container_editor(name=name)
+            for idx, data in enumerate(self._containerStore):
+                if new and data[0] == new_text:
+                    c = self._storage_playground.devicetree.getDeviceByName(self._device_container_name)
+                    freeSpace = getattr(c, "freeSpace", None)
+                    row = self._container_store_row(self._device_container_name, freeSpace)
+
+                    self._containerStore.insert(idx, row)
                     combo.set_active(idx)   # triggers a call to this method
                     return
+                elif not new and data[0] == self._device_container_name:
+                    combo.set_active(idx)
+                    return
         else:
             self._device_container_name = container_name
 
-        container = self.__storage.devicetree.getDeviceByName(self._device_container_name)
+        container = self._storage_playground.devicetree.getDeviceByName(self._device_container_name)
         container_exists = getattr(container, "exists", False)    # might not be in the tree
 
         if container:
@@ -2446,59 +2100,57 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._modifyContainerButton.set_sensitive(not container_exists)
 
     def _save_current_selector(self):
-        log.debug("current selector: %s", self._current_selector._device)
-        nb_page = self._partitionsNotebook.get_current_page()
-        log.debug("notebook page = %s", nb_page)
-        if nb_page == NOTEBOOK_DETAILS_PAGE:
-            self._save_right_side(self._current_selector)
-
+        log.debug("current selector: %s", self._current_selector.device)
+        self._save_right_side(self._current_selector)
         self._clear_current_selector()
 
     def on_selector_clicked(self, selector):
-        if not self._initialized:
+        if not self._initialized or (self._current_selector is selector):
             return
 
         # Take care of the previously chosen selector.
-        if self._current_selector and self._initialized and \
-           self._current_selector != selector:
+        if self._current_selector:
+            # unselect the previously chosen selector
+            self._current_selector.set_chosen(False)
             self._save_current_selector()
-            log.debug("new selector: %s", selector._device)
+            log.debug("new selector: %s", selector.device)
 
         no_edit = False
-        if selector._device.format.type == "luks" and \
-           selector._device.format.exists:
+        if selector.device.format.type == "luks" and \
+           selector.device.format.exists:
             self._partitionsNotebook.set_current_page(NOTEBOOK_LUKS_PAGE)
             selectedDeviceLabel = self._encryptedDeviceLabel
             selectedDeviceDescLabel = self._encryptedDeviceDescLabel
             no_edit = True
-        elif not getattr(selector._device, "complete", True):
+        elif not getattr(selector.device, "complete", True):
             self._partitionsNotebook.set_current_page(NOTEBOOK_INCOMPLETE_PAGE)
             selectedDeviceLabel = self._incompleteDeviceLabel
             selectedDeviceDescLabel = self._incompleteDeviceDescLabel
 
-            if selector._device.type == "mdarray":
-                total = selector._device.memberDevices
-                missing = total - len(selector._device.parents)
+            if selector.device.type == "mdarray":
+                total = selector.device.memberDevices
+                missing = total - len(selector.device.parents)
                 txt = _("This Software RAID array is missing %(missingMembers)d of %(totalMembers)d member "
                         "partitions. You can remove it or select a different "
                         "device.") % {"missingMembers": missing, "totalMembers": total}
             else:
-                total = selector._device.pvCount
-                missing = total - len(selector._device.parents)
+                total = selector.device.pvCount
+                missing = total - len(selector.device.parents)
                 txt = _("This LVM Volume Group is missing %(missingPVs)d of %(totalPVs)d physical "
                         "volumes. You can remove it or select a different "
                         "device.") % {"missingPVs": missing, "totalPVs": total}
             self._incompleteDeviceOptionsLabel.set_text(txt)
             no_edit = True
-        elif devicefactory.get_device_type(selector._device) is None:
+        elif devicefactory.get_device_type(selector.device) is None:
             self._partitionsNotebook.set_current_page(NOTEBOOK_UNEDITABLE_PAGE)
             selectedDeviceLabel = self._uneditableDeviceLabel
             selectedDeviceDescLabel = self._uneditableDeviceDescLabel
             no_edit = True
 
         if no_edit:
-            selectedDeviceLabel.set_text(selector._device.name)
-            selectedDeviceDescLabel.set_text(self._description(selector._device.type))
+            selectedDeviceLabel.set_text(selector.device.name)
+            desc = _(MOUNTPOINT_DESCRIPTIONS.get(selector.device.type, ""))
+            selectedDeviceDescLabel.set_text(desc)
             selector.set_chosen(True)
             self._current_selector = selector
             self._configButton.set_sensitive(False)
@@ -2515,10 +2167,11 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._current_selector = selector
 
         self._applyButton.set_sensitive(False)
-        self._configButton.set_sensitive(not selector._device.exists and
-                                         not selector._device.protected and
-                                         devicefactory.get_device_type(selector._device) in (DEVICE_TYPE_PARTITION, DEVICE_TYPE_MD))
-        self._removeButton.set_sensitive(not selector._device.protected)
+        container_device = devicefactory.get_device_type(selector.device) in CONTAINER_DEVICE_TYPES
+        self._configButton.set_sensitive(not selector.device.exists and
+                                         not selector.device.protected and
+                                         not container_device)
+        self._removeButton.set_sensitive(not selector.device.protected)
         return True
 
     def on_page_clicked(self, page, mountpointToShow=None):
@@ -2542,46 +2195,76 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         else:
             self._removeButton.set_sensitive(True)
 
+    @ui_storage_logged
     def _do_autopart(self):
-        # There are never any non-existent devices around when this runs.
-        log.debug("running automatic partitioning")
-        self.__storage.doAutoPart = True
-        self.clear_errors()
-        with ui_storage_logger():
-            try:
-                doAutoPartition(self.__storage, self.data)
-            except NoDisksError as e:
-                # No handling should be required for this.
-                log.error("doAutoPartition failed: %s", e)
-                self._error = e
-                self.set_error(_("No disks selected."))
-                self.window.show_all()
-            except NotEnoughFreeSpaceError as e:
-                # No handling should be required for this.
-                log.error("doAutoPartition failed: %s", e)
-                self._error = e
-                self.set_error(_("Not enough free space on selected disks."))
-                self.window.show_all()
-            except (StorageError, BootLoaderError) as e:
-                log.error("doAutoPartition failed: %s", e)
-                self._reset_storage()
-                self._error = e
-                self.set_error(_("Automatic partitioning failed. Click "
-                                 "for details."))
-                self.window.show_all()
-            else:
-                self._devices = self.__storage.devices
-                # mark all new containers for automatic size management
-                for device in self._devices:
-                    if not device.exists and hasattr(device, "size_policy"):
-                        device.size_policy = SIZE_POLICY_AUTO
-            finally:
-                self.__storage.doAutoPart = False
-                log.debug("finished automatic partitioning")
+        """Helper function for on_create_clicked.
+           Assumes a non-final context in which at least some errors
+           discovered by sanity_check are not considered fatal because they
+           will be dealt with later.
 
-    def on_create_clicked(self, button):
+           Note: There are never any non-existent devices around when this runs.
+        """
+        log.debug("running automatic partitioning")
+        self._storage_playground.doAutoPart = True
+        self.clear_errors()
+        try:
+            self._storage_playground.createFreeSpaceSnapshot()
+            # doAutoPartitions needs stage1_disk setup so it will reuse existing partitions
+            self._storage_playground.setUpBootLoader(early=True)
+
+            refreshAutoSwapSize(self._storage_playground)
+            doAutoPartition(self._storage_playground, self.data,
+                            min_luks_entropy=crypto.MIN_CREATE_ENTROPY)
+        except NoDisksError as e:
+            # No handling should be required for this.
+            log.error("doAutoPartition failed: %s", e)
+            self._error = e
+            self.set_error(_("No disks selected."))
+            self.window.show_all()
+        except NotEnoughFreeSpaceError as e:
+            # No handling should be required for this.
+            log.error("doAutoPartition failed: %s", e)
+            self._error = e
+            self.set_error(_("Not enough free space on selected disks."))
+            self.window.show_all()
+        except (StorageError, BootLoaderError) as e:
+            log.error("doAutoPartition failed: %s", e)
+            self._reset_storage()
+            self._error = e
+            self.set_error(_("Automatic partitioning failed. Click "
+                             "for details."))
+            self.window.show_all()
+        else:
+            self._devices = self._storage_playground.devices
+            # mark all new containers for automatic size management
+            for device in self._devices:
+                if not device.exists and hasattr(device, "size_policy"):
+                    device.size_policy = SIZE_POLICY_AUTO
+        finally:
+            self._storage_playground.doAutoPart = False
+            log.debug("finished automatic partitioning")
+
+        exns = storage_utils.sanity_check(self._storage_playground, min_ram=isys.MIN_GUI_RAM)
+        errors = [exn for exn in exns if isinstance(exn, SanityError) and not isinstance(exn, LUKSDeviceWithoutKeyError)]
+        warnings = [exn for exn in exns if isinstance(exn, SanityWarning)]
+        for error in errors:
+            log.error(error.message)
+        for warning in warnings:
+            log.warning(warning.message)
+
+        if errors:
+            messages = "\n".join(error.message for error in errors)
+            log.error("doAutoPartition failed: %s", messages)
+            self._reset_storage()
+            self._error = messages
+            self.set_error(_("Automatic partitioning failed. Click "
+                             "for details."))
+            self.window.show_all()
+
+    def on_create_clicked(self, button, autopartTypeCombo):
         # Then do autopartitioning.  We do not do any clearpart first.  This is
         # custom partitioning, so you have to make your own room.
+        self._storage_playground.autoPartType = self._get_autopart_type(autopartTypeCombo)
         self._do_autopart()
 
         # Refresh the spoke to make the new partitions appear.
@@ -2597,9 +2280,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         self._encryptCheckbox.set_sensitive(active)
         if self._current_selector:
-            device = self._current_selector._device
-            if device.type == "luks/dm-crypt":
-                device = device.slave
+            device = self._current_selector.device.raw_device
 
             ancestors = device.ancestors
             ancestors.remove(device)
@@ -2616,16 +2297,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._encryptCheckbox.set_sensitive(device_type != DEVICE_TYPE_BTRFS)
         fancy_set_sensitive(self._fsCombo, active)
 
-        # The label entry can only be sensitive if reformat is active and the
-        # currently selected filesystem can be labeled.
-        label_active = active
-        if active:
-            fmt = getFormat(self._fsCombo.get_active_text())
-            label_active = (active and hasattr(fmt, "label") and
-                            fmt.type != "btrfs")
-
-        fancy_set_sensitive(self._labelEntry, label_active)
-
     def on_fs_type_changed(self, combo):
         if not self._initialized:
             return
@@ -2635,11 +2306,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             return
         log.debug("fs type changed: %s", new_type)
         fmt = getFormat(new_type)
-        # FIXME: can't set a label on an existing format as of now
-        label_active = (self._reformatCheckbox.get_active() and
-                        hasattr(fmt, "label") and
-                        fmt.type != "btrfs")
-        fancy_set_sensitive(self._labelEntry, label_active)
         fancy_set_sensitive(self._mountPointEntry, fmt.mountable)
 
     def _populate_container(self, device=None):
@@ -2649,106 +2315,126 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             if self._current_selector is None:
                 return
 
-            device = self._current_selector._device
-            if isinstance(device, LUKSDevice):
-                device = device.slave
+            device = self._current_selector.device
+            if device:
+                device = device.raw_device
 
         container_size_policy = SIZE_POLICY_AUTO
-        if device_type in (DEVICE_TYPE_LVM, DEVICE_TYPE_BTRFS, DEVICE_TYPE_LVM_THINP):
-            # set up the vg widgets and then bail out
-            if devicefactory.get_device_type(device) == device_type:
-                _device = device
-            else:
-                _device = None
-
-            with ui_storage_logger():
-                factory = devicefactory.get_device_factory(self.__storage,
-                                                         device_type,
-                                                         0)
-                container = factory.get_container(device=_device)
-                default_container = getattr(container, "name", None)
-                if container:
-                    container_size_policy = container.size_policy
-
-            container_type_text = container_type_names[device_type]
-            self._containerLabel.set_text(container_type_text.title())
-            self._containerCombo.remove_all()
-            if device_type == DEVICE_TYPE_BTRFS:
-                containers = self.__storage.btrfsVolumes
-            else:
-                containers = self.__storage.vgs
-
-            default_seen = False
-            for c in containers:
-                self._containerCombo.append_text(c.name)
-                if default_container and c.name == default_container:
-                    default_seen = True
-                    self._containerCombo.set_active(containers.index(c))
-
-            if default_container is None:
-                hostname = self.data.network.hostname
-                default_container = self.__storage.suggestContainerName(hostname=hostname)
-
-            log.debug("default container is %s", default_container)
-            self._device_container_name = default_container
-            self._device_container_size = container_size_policy
-
-            if not default_seen:
-                self._containerCombo.append_text(default_container)
-                self._containerCombo.set_active(len(self._containerCombo.get_model()) - 1)
-
-            self._containerCombo.append_text(_(new_container_text) % {"container_type": container_type_text.lower()})
-            self._containerCombo.set_tooltip_text(_(container_tooltip) % {"container_type": container_type_text.lower()})
-            if default_container is None:
-                self._containerCombo.set_active(len(self._containerCombo.get_model()) - 1)
-
-            map(really_show, [self._containerLabel, self._containerCombo, self._modifyContainerButton])
-
-            # make the combo and button insensitive for existing LVs
-            can_change_container = (device is not None and not device.exists and
-                                    device != container)
-            fancy_set_sensitive(self._containerCombo, can_change_container)
-            container_exists = getattr(container, "exists", False)
-            self._modifyContainerButton.set_sensitive(not container_exists)
-        else:
+        if device_type not in CONTAINER_DEVICE_TYPES:
+            # just hide the buttons with no meaning for non-container devices
             map(really_hide, [self._containerLabel, self._containerCombo, self._modifyContainerButton])
+            return
+
+        # else really populate the container
+        # set up the vg widgets and then bail out
+        if devicefactory.get_device_type(device) == device_type:
+            _device = device
+        else:
+            _device = None
+
+        with ui_storage_logger():
+            factory = devicefactory.get_device_factory(self._storage_playground,
+                                                     device_type,
+                                                     0, min_luks_entropy=crypto.MIN_CREATE_ENTROPY)
+            container = factory.get_container(device=_device)
+            default_container_name = getattr(container, "name", None)
+            if container:
+                container_size_policy = container.size_policy
+
+        container_type_text = get_container_type_name(device_type)
+        self._containerLabel.set_text(container_type_text.title())
+        self._containerStore.clear()
+        if device_type == DEVICE_TYPE_BTRFS:
+            containers = self._storage_playground.btrfsVolumes
+        else:
+            containers = self._storage_playground.vgs
+
+        default_seen = False
+        for c in containers:
+            self._containerStore.append(self._container_store_row(c.name, getattr(c, "freeSpace", None)))
+            if default_container_name and c.name == default_container_name:
+                default_seen = True
+                self._containerCombo.set_active(containers.index(c))
+
+        if default_container_name is None:
+            hostname = self.data.network.hostname
+            default_container_name = self._storage_playground.suggestContainerName(hostname=hostname)
+
+        log.debug("default container is %s", default_container_name)
+        self._device_container_name = default_container_name
+        self._device_container_size = container_size_policy
+
+        if not default_seen:
+            self._containerStore.append(self._container_store_row(default_container_name))
+            self._containerCombo.set_active(len(self._containerStore) - 1)
+
+        self._containerStore.append(self._container_store_row(_(NEW_CONTAINER_TEXT) % {"container_type": container_type_text.lower()}))
+        self._containerCombo.set_tooltip_text(_(CONTAINER_TOOLTIP) % {"container_type": container_type_text.lower()})
+        if default_container_name is None:
+            self._containerCombo.set_active(len(self._containerStore) - 1)
+
+        map(really_show, [self._containerLabel, self._containerCombo, self._modifyContainerButton])
+
+        # make the combo and button insensitive for existing LVs
+        can_change_container = (device is not None and not device.exists and
+                                device != container)
+        fancy_set_sensitive(self._containerCombo, can_change_container)
+        container_exists = getattr(container, "exists", False)
+        self._modifyContainerButton.set_sensitive(not container_exists)
+
+    def _resolve_btrfs_restrictions(self, should_be_btrfs):
+        model = self._fsCombo.get_model()
+        btrfs_pos = None
+        for idx, data in enumerate(model):
+            if data[0] == "btrfs":
+                btrfs_pos = idx
+
+        active_index = self._fsCombo.get_active()
+        current_fstype = self._fsCombo.get_active_text()
+        if btrfs_pos and not should_be_btrfs:
+            self._fsCombo.remove(btrfs_pos)
+            if current_fstype == "btrfs":
+                for i, row in enumerate(model):
+                    if row[0] == self.storage.defaultFSType:
+                        active_index = i
+                        break
+        elif should_be_btrfs and not btrfs_pos:
+            self._fsCombo.append_text("btrfs")
+            active_index = len(self._fsCombo.get_model()) - 1
+
+        self._fsCombo.set_active(active_index)
 
     def on_device_type_changed(self, combo):
         if not self._initialized:
             return
 
         new_type = self._get_current_device_type()
-        log.debug("device_type_changed: %s %s", new_type, combo.get_active_text())
+        itr = combo.get_active_iter()
+        if not itr:
+            return
+
+        active_dev_type = self._typeStore[itr]
+        log.debug("device_type_changed: %s %s", new_type, active_dev_type)
         if new_type is None:
             return
 
         # if device type is not btrfs we want to make sure btrfs is not in the
         # fstype combo
-        include_btrfs = False
+        should_be_btrfs = False
         fs_type_sensitive = True
 
         raid_level = None
         if new_type == DEVICE_TYPE_BTRFS:
             # add btrfs to the fstype combo and lock it in
             test_fmt = getFormat("btrfs")
-            include_btrfs = test_fmt.supported and test_fmt.formattable
+            should_be_btrfs = test_fmt.supported and test_fmt.formattable
             fs_type_sensitive = False
-            with ui_storage_logger():
-                factory = devicefactory.get_device_factory(self.__storage,
-                                                         DEVICE_TYPE_BTRFS, 0)
-                container = factory.get_container()
-
-            if container:
-                raid_level = container.dataLevel or "single"
-            else:
-                # here I suppose we could alter the default based on disk count
-                raid_level = "single"
         elif new_type == DEVICE_TYPE_MD:
-            raid_level = "raid1"
+            raid_level = defaultRaidLevel(new_type)
 
         # lvm uses the RHS to set disk set. no foolish minds here.
-        exists = self._current_selector and self._current_selector._device.exists
-        self._configButton.set_sensitive(not exists and new_type not in (DEVICE_TYPE_LVM, DEVICE_TYPE_LVM_THINP, DEVICE_TYPE_BTRFS))
+        exists = self._current_selector and self._current_selector.device.exists
+        self._configButton.set_sensitive(not exists and new_type not in CONTAINER_DEVICE_TYPES)
 
         # this has to be done before calling populate_raid since it will need
         # the raid level combo to contain the relevant raid levels for the new
@@ -2758,36 +2444,14 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._populate_raid(raid_level)
         self._populate_container()
 
-        fancy_set_sensitive(self._nameEntry, new_type in (DEVICE_TYPE_BTRFS, DEVICE_TYPE_LVM, DEVICE_TYPE_MD, DEVICE_TYPE_LVM_THINP))
+        fancy_set_sensitive(self._nameEntry, new_type in NAMED_DEVICE_TYPES)
         self._nameEntry.set_text(self._device_name_dict[new_type])
         fancy_set_sensitive(self._sizeEntry, new_type != DEVICE_TYPE_BTRFS)
 
-        # begin btrfs magic
-        model = self._fsCombo.get_model()
-        btrfs_included = False
-        btrfs_pos = None
-        for idx, data in enumerate(model):
-            if data[0] == "btrfs":
-                btrfs_included = True
-                btrfs_pos = idx
-
-        active_index = self._fsCombo.get_active()
-        fstype = self._fsCombo.get_active_text()
-        if btrfs_included and not include_btrfs:
-            for i in range(0, len(model)):
-                if fstype == "btrfs" and \
-                   model[i][0] == self.storage.defaultFSType:
-                    active_index = i
-                    break
-            self._fsCombo.remove(btrfs_pos)
-        elif include_btrfs and not btrfs_included:
-            self._fsCombo.append_text("btrfs")
-            active_index = len(self._fsCombo.get_model()) - 1
-
-        self._fsCombo.set_active(active_index)
         fancy_set_sensitive(self._fsCombo, self._reformatCheckbox.get_active() and
                                            fs_type_sensitive)
-        # end btrfs magic
+
+        self._resolve_btrfs_restrictions(should_be_btrfs)
 
     def clear_errors(self):
         self._error = None
@@ -2796,14 +2460,30 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     # This callback is for the button that just resets the UI to anaconda's
     # current understanding of the disk layout.
     def on_reset_clicked(self, *args):
-        self.refresh()
+        msg = _("Continuing with this action will reset all your partitioning selections "
+                "to their current on-disk state.")
+
+        dlg = Gtk.MessageDialog(flags=Gtk.DialogFlags.MODAL,
+                                message_type=Gtk.MessageType.WARNING,
+                                buttons=Gtk.ButtonsType.NONE,
+                                message_format=msg)
+        dlg.set_decorated(False)
+        dlg.add_buttons(_("_Reset selections"), 0, _("_Preserve current selections"), 1)
+        dlg.set_default_response(1)
+
+        with self.main_window.enlightbox(dlg):
+            rc = dlg.run()
+            dlg.destroy()
+
+        if rc == 0:
+            self.refresh()
 
     # This callback is for the button that has anaconda go back and rescan the
     # disks to pick up whatever changes the user made outside our control.
     def on_refresh_clicked(self, *args):
         dialog = RefreshDialog(self.data, self.storage)
         ignoreEscape(dialog.window)
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             rc = dialog.run()
             dialog.window.destroy()
 
@@ -2836,19 +2516,21 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                                 message_format=str(self._error))
         dlg.set_decorated(False)
 
-        with enlightbox(self.window, dlg):
+        with self.main_window.enlightbox(dlg):
             dlg.run()
             dlg.destroy()
 
-    def on_apply_clicked(self, button):
+    @timed_action(delay=50, threshold=100)
+    def on_update_settings_clicked(self, button):
         """ call _save_right_side, then, perhaps, populate_right_side. """
         self._save_right_side(self._current_selector)
         self._applyButton.set_sensitive(False)
 
-    def on_unlock_clicked(self, button):
+    @timed_action(delay=50, threshold=100)
+    def on_unlock_clicked(self, *args):
         """ try to open the luks device, populate, then call _do_refresh. """
         self.clear_errors()
-        device = self._current_selector._device
+        device = self._current_selector.device
         log.info("trying to unlock %s...", device.name)
         passphrase = self._passphraseEntry.get_text()
         device.format.passphrase = passphrase
@@ -2871,78 +2553,17 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             luks_dev = LUKSDevice(device.format.mapName,
                                   parents=[device],
                                   exists=True)
-            self.__storage.devicetree._addDevice(luks_dev)
+            self._storage_playground.devicetree._addDevice(luks_dev)
             # save the passphrase for possible reset and to try for other devs
-            self.__storage.savePassphrase(device)
+            self._storage_playground.savePassphrase(device)
             # XXX What if the user has changed things using the shell?
-            self.__storage.devicetree.populate()
+            self._storage_playground.devicetree.populate()
             # look for new roots
-            self.__storage.roots = findExistingInstallations(self.__storage.devicetree)
+            self._storage_playground.roots = findExistingInstallations(self._storage_playground.devicetree)
 
-        self._devices = self.__storage.devices
+        self._devices = self._storage_playground.devices
         self._clear_current_selector()
         self._do_refresh()
 
     def on_value_changed(self, *args):
         self._applyButton.set_sensitive(True)
-
-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.
-
-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.
-
-
-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.
-
-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.
-
-The right-hand side of the screen is where you can customize the currently-selected mountpoint.
-
-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
-
-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.
-
-
-How to reformat a device/filesystem 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.
-4. Click on "Apply changes"
-
-
-How to set a mountpoint for a filesystem 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.
-3. Click on "Apply changes"
-
-
-How to remove a filesystem that already exists on your disk
-
-1. Select the filesystem 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.
-
-
-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.
-
-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 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.
-
-When the last partition is removed from a disk, that disk may be reinitialized with a new partition table if we think there is a more appropriate type for that disk.
-""")
diff --git a/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.glade
index d2f3748..236433b 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.glade
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Thu Oct 17 10:57:29 2013 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.2 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.2"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
+  <requires lib="TimezoneMap" version="0.4"/>
   <object class="GtkImage" id="addImage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -25,20 +26,6 @@
     <property name="inline_completion">True</property>
     <signal name="match-selected" handler="on_completion_match_selected" object="cityCombobox" swapped="no"/>
   </object>
-  <object class="GtkListStore" id="regions">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name xlated -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkEntryCompletion" id="regionCompletion">
-    <property name="model">regions</property>
-    <property name="text_column">0</property>
-    <property name="inline_completion">True</property>
-    <signal name="match-selected" handler="on_completion_match_selected" object="regionCombobox" swapped="no"/>
-  </object>
   <object class="GtkImage" id="configImage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -46,8 +33,10 @@
   </object>
   <object class="GtkListStore" id="days">
     <columns>
-      <!-- column-name number -->
+      <!-- column-name idx -->
       <column type="guint"/>
+      <!-- column-name day -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkTreeModelFilter" id="daysFilter">
@@ -70,14 +59,241 @@
   </object>
   <object class="GtkListStore" id="months">
     <columns>
+      <!-- column-name idx -->
+      <column type="guint"/>
       <!-- column-name name -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="AnacondaSpokeWindow" id="datetimeWindow">
-    <property name="startup_id">filler</property>
+  <object class="GtkListStore" id="regions">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name xlated -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkEntryCompletion" id="regionCompletion">
+    <property name="model">regions</property>
+    <property name="text_column">0</property>
+    <property name="inline_completion">True</property>
+    <signal name="match-selected" handler="on_completion_match_selected" object="regionCombobox" swapped="no"/>
+  </object>
+  <object class="GtkListStore" id="serversStore">
+    <columns>
+      <!-- column-name hostname -->
+      <column type="gchararray"/>
+      <!-- column-name working -->
+      <column type="gint"/>
+      <!-- column-name use -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="ntpConfigDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelButton">
+                <property name="label" translatable="yes" context="GUI|Date and Time|NTP">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="okButton">
+                <property name="label" translatable="yes" context="GUI|Date and Time|NTP">_OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="configHeadingLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Add and mark for usage NTP servers</property>
+            <attributes>
+              <attribute name="font-desc" value="Sans Bold 12"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkEntry" id="serverEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <signal name="activate" handler="on_entry_activated" swapped="no"/>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="serverEntry-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">New NTP Server</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="addButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">addImage</property>
+                <signal name="clicked" handler="on_add_clicked" swapped="no"/>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="addButton-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Add NTP Server</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">4</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledWindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="serversView">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">serversStore</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection"/>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="hostnameColumn">
+                    <property name="title" translatable="yes">Hostname</property>
+                    <property name="expand">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="hostnameRenderer">
+                        <property name="editable">True</property>
+                        <signal name="edited" handler="on_server_edited" swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="workingColumn">
+                    <property name="title" translatable="yes">Working</property>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="workingRenderer"/>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="removeColumn">
+                    <property name="title" translatable="yes">Use</property>
+                    <child>
+                      <object class="GtkCellRendererToggle" id="removeRenderer">
+                        <signal name="toggled" handler="on_use_server_toggled" swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="active">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">cancelButton</action-widget>
+      <action-widget response="1">okButton</action-widget>
+    </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="ntpConfigDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Configure NTP</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkImage" id="upImage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-up-symbolic</property>
+  </object>
+  <object class="GtkImage" id="upImage1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-up-symbolic</property>
+  </object>
+  <object class="GtkImage" id="upImage2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-up-symbolic</property>
+  </object>
+  <object class="AnacondaSpokeWindow" id="datetimeWindow">
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">DATE &amp; TIME</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
@@ -156,6 +372,11 @@
                                     <signal name="activate" handler="on_city_region_text_entry_activated" swapped="no"/>
                                     <signal name="focus-out-event" handler="on_entry_left" swapped="no"/>
                                     <signal name="key-release-event" handler="on_city_region_key_released" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="regionsEntry-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Region</property>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -198,6 +419,11 @@
                                     <signal name="activate" handler="on_city_region_text_entry_activated" swapped="no"/>
                                     <signal name="focus-out-event" handler="on_entry_left" swapped="no"/>
                                     <signal name="key-release-event" handler="on_city_region_key_released" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="citiesEntry-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">City</property>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -239,6 +465,11 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <signal name="notify::active" handler="on_ntp_switched" swapped="no"/>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject" id="networkTimeSwitch-atkobject">
+                                            <property name="AtkObject::accessible-name" translatable="yes">Use Network Time</property>
+                                          </object>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -254,6 +485,11 @@
                                         <property name="receives_default">True</property>
                                         <property name="image">configImage</property>
                                         <signal name="clicked" handler="on_ntp_config_clicked" swapped="no"/>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject" id="ntpConfigButton-atkobject">
+                                            <property name="AtkObject::accessible-name" translatable="yes">Configure NTP</property>
+                                          </object>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -281,10 +517,10 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="AnacondaTimezoneMap" id="tzmap">
+                      <object class="CcTimezoneMap" id="tzmap">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <signal name="timezone-changed" handler="on_timezone_changed" swapped="no"/>
+                        <signal name="location-changed" handler="on_location_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -316,12 +552,15 @@
                                     <attributes>
                                       <attribute name="scale" value="2"/>
                                     </attributes>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="hoursLabel-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Hours</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -336,8 +575,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -348,12 +585,15 @@
                                     <attributes>
                                       <attribute name="scale" value="2"/>
                                     </attributes>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="minutesLabel-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Minutes</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -363,12 +603,15 @@
                                     <property name="receives_default">True</property>
                                     <property name="image">upImage</property>
                                     <signal name="clicked" handler="on_up_hours_clicked" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="hoursUpButton-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Hour Up</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -378,12 +621,15 @@
                                     <property name="receives_default">True</property>
                                     <property name="image">downImage</property>
                                     <signal name="clicked" handler="on_down_hours_clicked" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="hoursDownButton-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Hour Down</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -392,13 +638,16 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="image">upImage1</property>
-                                    <signal name="clicked" handler="on_up_ampm_clicked" swapped="no"/>
+                                    <signal name="clicked" handler="on_updown_ampm_clicked" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="amPmUpButton-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">AM/PM Up</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -408,12 +657,15 @@
                                     <property name="receives_default">True</property>
                                     <property name="image">upImage2</property>
                                     <signal name="clicked" handler="on_up_minutes_clicked" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="minutesUpButton-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Minutes Up</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -422,13 +674,16 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="image">downImage1</property>
-                                    <signal name="clicked" handler="on_down_ampm_clicked" swapped="no"/>
+                                    <signal name="clicked" handler="on_updown_ampm_clicked" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="amPmDownButton-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">AM/PM Down</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -438,12 +693,15 @@
                                     <property name="receives_default">True</property>
                                     <property name="image">downImage2</property>
                                     <signal name="clicked" handler="on_down_minutes_clicked" swapped="no"/>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="minutesDownButton-atkobject">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Minutes Down</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -458,8 +716,6 @@
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -474,8 +730,6 @@
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -562,66 +816,19 @@
                                 <property name="yscale">0.20000000298023224</property>
                                 <property name="right_padding">24</property>
                                 <child>
-                                  <object class="GtkBox" id="box5">
+                                  <object class="GtkBox" id="dateBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">end</property>
+                                    <property name="spacing">3</property>
                                     <child>
-                                      <object class="GtkComboBox" id="monthCombobox">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="model">months</property>
-                                        <signal name="changed" handler="on_month_changed" swapped="no"/>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="monthsComboRenderer"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
+                                      <placeholder/>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="dayCombobox">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="model">daysFilter</property>
-                                        <signal name="changed" handler="on_day_changed" swapped="no"/>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="daysComboRenderer"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
+                                      <placeholder/>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="yearCombobox">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="model">years</property>
-                                        <signal name="changed" handler="on_year_changed" swapped="no"/>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="yearsComboRenderer"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
+                                      <placeholder/>
                                     </child>
                                   </object>
                                 </child>
@@ -632,6 +839,11 @@
                                 <property name="position">2</property>
                               </packing>
                             </child>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="footerBox-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Set Date &amp; Time</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -662,209 +874,18 @@
         </child>
       </object>
     </child>
-  </object>
-  <object class="GtkListStore" id="serversStore">
-    <columns>
-      <!-- column-name hostname -->
-      <column type="gchararray"/>
-      <!-- column-name working -->
-      <column type="gint"/>
-      <!-- column-name use -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="ntpConfigDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="configHeadingLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Add and mark for usage NTP servers</property>
-            <attributes>
-              <attribute name="font-desc" value="Sans Bold 12"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkEntry" id="serverEntry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <signal name="activate" handler="on_entry_activated" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="addButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">addImage</property>
-                <signal name="clicked" handler="on_add_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">4</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledWindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTreeView" id="serversView">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">serversStore</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection"/>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="hostnameColumn">
-                    <property name="title" translatable="yes">Hostname</property>
-                    <property name="expand">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="hostnameRenderer">
-                        <property name="editable">True</property>
-                        <signal name="edited" handler="on_server_edited" swapped="no"/>
-                      </object>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="workingColumn">
-                    <property name="title" translatable="yes">Working</property>
-                    <child>
-                      <object class="GtkCellRendererPixbuf" id="workingRenderer"/>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="removeColumn">
-                    <property name="title" translatable="yes">Use</property>
-                    <child>
-                      <object class="GtkCellRendererToggle" id="removeRenderer">
-                        <signal name="toggled" handler="on_use_server_toggled" swapped="no"/>
-                      </object>
-                      <attributes>
-                        <attribute name="active">2</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelButton">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="okButton">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="datetimeWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">DATE &amp; TIME</property>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="0">cancelButton</action-widget>
-      <action-widget response="1">okButton</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkImage" id="upImage">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">go-up-symbolic</property>
-  </object>
-  <object class="GtkImage" id="upImage1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">go-up-symbolic</property>
-  </object>
-  <object class="GtkImage" id="upImage2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">go-up-symbolic</property>
   </object>
   <object class="GtkListStore" id="years">
     <columns>
-      <!-- column-name number -->
+      <!-- column-name idx -->
       <column type="guint"/>
+      <!-- column-name year -->
+      <column type="gchararray"/>
     </columns>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.py b/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 2e9c716..e892a5f 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -22,18 +22,20 @@
 import logging
 log = logging.getLogger("anaconda")
 
-from gi.repository import GLib, Gtk, Gdk
+from gi.repository import GLib, Gdk, Gtk, TimezoneMap
 
 from pyanaconda.ui.communication import hubQ
 from pyanaconda.ui.common import FirstbootSpokeMixIn
 from pyanaconda.ui.gui import GUIObject
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui.categories.localization import LocalizationCategory
-from pyanaconda.ui.gui.utils import enlightbox, gtk_action_nowait, gtk_call_once
+from pyanaconda.ui.categories.localization import LocalizationCategory
+from pyanaconda.ui.gui.utils import gtk_action_nowait, gtk_call_once, override_cell_property
+from pyanaconda.ui.gui.helpers import GUIDialogInputCheckHandler
+from pyanaconda.ui.helpers import InputCheck
 
-from pyanaconda.i18n import _, N_
+from pyanaconda.i18n import _, CN_
 from pyanaconda.timezone import NTP_SERVICE, get_all_regions_and_timezones, is_valid_timezone
-from pyanaconda.localization import get_xlated_timezone
+from pyanaconda.localization import get_xlated_timezone, resolve_date_format
 from pyanaconda import iutil
 from pyanaconda import isys
 from pyanaconda import network
@@ -111,16 +113,35 @@ def _compare_cities(city_xlated1, city_xlated2):
         # compare prefixes
         return locale_mod.strcoll(prefix1, prefix2)
 
-class NTPconfigDialog(GUIObject):
+def _new_date_field_box(store):
+    """
+    Creates new date field box (a combobox and a label in a horizontal box) for
+    a given store.
+
+    """
+
+    box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+    suffix_label = Gtk.Label()
+    renderer = Gtk.CellRendererText()
+    combo = Gtk.ComboBox(model=store)
+    combo.pack_start(renderer, False)
+
+    # idx is column 0, string we want to show is 1
+    combo.add_attribute(renderer, "text", 1)
+
+    box.pack_start(combo, False, False, 0)
+    box.pack_start(suffix_label, False, False, 0)
+
+    return (box, combo, suffix_label)
+
+class NTPconfigDialog(GUIObject, GUIDialogInputCheckHandler):
     builderObjects = ["ntpConfigDialog", "addImage", "serversStore"]
     mainWidgetName = "ntpConfigDialog"
     uiFile = "spokes/datetime_spoke.glade"
 
     def __init__(self, *args):
         GUIObject.__init__(self, *args)
-
-        #used to ensure uniqueness of the threads' names
-        self._threads_counter = 0
+        GUIDialogInputCheckHandler.__init__(self)
 
         #epoch is increased when serversStore is repopulated
         self._epoch = 0
@@ -151,22 +172,29 @@ class NTPconfigDialog(GUIObject):
         value = model[itr][1]
 
         if value == SERVER_QUERY:
-            renderer.set_property("stock-id", "gtk-dialog-question")
+            return "dialog-question"
         elif value == SERVER_OK:
-            renderer.set_property("stock-id", "gtk-yes")
+            return "emblem-default"
         else:
-            renderer.set_property("stock-id", "gtk-no")
+            return "dialog-error"
 
     def initialize(self):
         self.window.set_size_request(500, 400)
 
         workingColumn = self.builder.get_object("workingColumn")
         workingRenderer = self.builder.get_object("workingRenderer")
-        workingColumn.set_cell_data_func(workingRenderer, self._render_working)
+        override_cell_property(workingColumn, workingRenderer, "icon-name",
+                self._render_working)
 
         self._serverEntry = self.builder.get_object("serverEntry")
         self._serversStore = self.builder.get_object("serversStore")
 
+        self._addButton = self.builder.get_object("addButton")
+
+        # Validate the server entry box
+        self._serverCheck = self.add_check(self._serverEntry, self._validateServer)
+        self._serverCheck.update_check_status()
+
         self._initialize_store_from_config()
 
     def _initialize_store_from_config(self):
@@ -182,6 +210,27 @@ class NTPconfigDialog(GUIObject):
             except ntp.NTPconfigError:
                 log.warning("Failed to load NTP servers configuration")
 
+    def _validateServer(self, inputcheck):
+        server = self.get_input(inputcheck.input_obj)
+
+        # If not set, fail the check to keep the button insensitive, but don't
+        # display an error
+        if not server:
+            return InputCheck.CHECK_SILENT
+
+        (valid, error) = network.sanityCheckHostname(server)
+        if not valid:
+            return "'%s' is not a valid hostname: %s" % (server, error)
+        else:
+            return InputCheck.CHECK_OK
+
+    def set_status(self, inputcheck):
+        # Use GUIDialogInputCheckHandler to set the error message
+        GUIDialogInputCheckHandler.set_status(self, inputcheck)
+
+        # Set the sensitivity of the add button based on the result
+        self._addButton.set_sensitive(inputcheck.check_status == InputCheck.CHECK_OK)
+
     def refresh(self):
         self._serverEntry.grab_focus()
 
@@ -267,11 +316,9 @@ class NTPconfigDialog(GUIObject):
         """ Runs a new thread with _set_server_ok_nok(itr) as a taget. """
 
         self._serversStore.set_value(itr, 1, SERVER_QUERY)
-        new_thread_name = "AnaNTPserver%d" % self._threads_counter
-        threadMgr.add(AnacondaThread(name=new_thread_name,
+        threadMgr.add(AnacondaThread(prefix="AnaNTPserver",
                                      target=self._set_server_ok_nok,
                                      args=(itr, self._epoch)))
-        self._threads_counter += 1
 
     def _add_server(self, server):
         """
@@ -282,11 +329,6 @@ class NTPconfigDialog(GUIObject):
 
         """
 
-        (valid, error) = network.sanityCheckHostname(server)
-        if not valid:
-            log.error("'%s' is not a valid hostname: %s", server, error)
-            return
-
         for row in self._serversStore:
             if row[0] == server:
                 #do not add duplicate items
@@ -298,12 +340,13 @@ class NTPconfigDialog(GUIObject):
         self._refresh_server_working(itr)
 
     def on_entry_activated(self, entry, *args):
-        self._add_server(entry.get_text())
-        entry.set_text("")
+        # Check that the input check has passed
+        if self._serverCheck.check_status == InputCheck.CHECK_OK:
+            self._add_server(entry.get_text())
+            entry.set_text("")
 
     def on_add_clicked(self, *args):
-        self._add_server(self._serverEntry.get_text())
-        self._serverEntry.set_text("")
+        self._serverEntry.emit("activate")
 
     def on_use_server_toggled(self, renderer, path, *args):
         itr = self._serversStore.get_iter(path)
@@ -341,11 +384,17 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
     mainWidgetName = "datetimeWindow"
     uiFile = "spokes/datetime_spoke.glade"
+    helpFile = "DateTimeSpoke.xml"
 
     category = LocalizationCategory
 
     icon = "preferences-system-time-symbolic"
-    title = N_("DATE & _TIME")
+    title = CN_("GUI|Spoke", "DATE & _TIME")
+
+    # Hack to get libtimezonemap loaded for GtkBuilder
+    # see https://bugzilla.gnome.org/show_bug.cgi?id=712184
+    _hack = TimezoneMap.TimezoneMap()
+    del(_hack)
 
     def __init__(self, *args):
         NormalSpoke.__init__(self, *args)
@@ -353,7 +402,6 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         # taking values from the kickstart file?
         self._kickstarted = flags.flags.automatedInstall
 
-        self._config_dialog = None
         self._update_datetime_timer_id = None
         self._start_updating_timer_id = None
 
@@ -365,6 +413,7 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self._regionsStore = self.builder.get_object("regions")
         self._citiesStore = self.builder.get_object("cities")
         self._tzmap = self.builder.get_object("tzmap")
+        self._dateBox = self.builder.get_object("dateBox")
 
         # we need to know it the new value is the same as previous or not
         self._old_region = None
@@ -372,9 +421,6 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         self._regionCombo = self.builder.get_object("regionCombobox")
         self._cityCombo = self.builder.get_object("cityCombobox")
-        self._monthCombo = self.builder.get_object("monthCombobox")
-        self._dayCombo = self.builder.get_object("dayCombobox")
-        self._yearCombo = self.builder.get_object("yearCombobox")
 
         self._daysFilter = self.builder.get_object("daysFilter")
         self._daysFilter.set_visible_func(self.existing_date, None)
@@ -389,28 +435,56 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self._amPmLabel = self.builder.get_object("amPmLabel")
         self._radioButton24h = self.builder.get_object("timeFormatRB")
 
+        # create widgets for displaying/configuring date
+        day_box, self._dayCombo, day_label = _new_date_field_box(self._daysFilter)
+        self._dayCombo.connect("changed", self.on_day_changed)
+        month_box, self._monthCombo, month_label = _new_date_field_box(self._monthsStore)
+        self._monthCombo.connect("changed", self.on_month_changed)
+        year_box, self._yearCombo, year_label = _new_date_field_box(self._yearsStore)
+        self._yearCombo.connect("changed", self.on_year_changed)
+
+        # get the right order for date widgets and respective formats and put
+        # widgets in place
+        widgets, formats = resolve_date_format(year_box, month_box, day_box)
+        for widget in widgets:
+            self._dateBox.pack_start(widget, False, False, 0)
+
+        self._day_format, suffix = formats[widgets.index(day_box)]
+        day_label.set_text(suffix)
+        self._month_format, suffix = formats[widgets.index(month_box)]
+        month_label.set_text(suffix)
+        self._year_format, suffix = formats[widgets.index(year_box)]
+        year_label.set_text(suffix)
+
         self._ntpSwitch = self.builder.get_object("networkTimeSwitch")
 
         self._regions_zones = get_all_regions_and_timezones()
 
-        self._months_nums = dict()
+        # Set the initial sensitivity of the AM/PM toggle based on the time-type selected
+        self._radioButton24h.emit("toggled")
+
+        if not flags.can_touch_runtime_system("modify system time and date"):
+            self._set_date_time_setting_sensitive(False)
+
+        self._config_dialog = NTPconfigDialog(self.data)
+        self._config_dialog.initialize()
 
         threadMgr.add(AnacondaThread(name=constants.THREAD_DATE_TIME,
                                      target=self._initialize))
 
     def _initialize(self):
-        for day in xrange(1, 32):
-            self.add_to_store(self._daysStore, day)
+        # a bit hacky way, but should return the translated strings
+        for i in range(1, 32):
+            day = datetime.date(2000, 1, i).strftime(self._day_format)
+            self.add_to_store_idx(self._daysStore, i, day)
 
-        for i in xrange(1, 13):
-            #a bit hacky way, but should return the translated string
-            #TODO: how to handle language change? Clear and populate again?
-            month = datetime.date(2000, i, 1).strftime('%B')
-            self.add_to_store(self._monthsStore, month)
-            self._months_nums[month] = i
+        for i in range(1, 13):
+            month = datetime.date(2000, i, 1).strftime(self._month_format)
+            self.add_to_store_idx(self._monthsStore, i, month)
 
-        for year in xrange(1990, 2051):
-            self.add_to_store(self._yearsStore, year)
+        for i in range(1990, 2051):
+            year = datetime.date(i, 1, 1).strftime(self._year_format)
+            self.add_to_store_idx(self._yearsStore, i, year)
 
         cities = set()
         xlated_regions = ((region, get_xlated_timezone(region))
@@ -423,9 +497,6 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         for city, xlated in sorted(cities, cmp=_compare_cities):
             self.add_to_store_xlated(self._citiesStore, city, xlated)
 
-        if self._radioButton24h.get_active():
-            self._set_amPm_part_sensitive(False)
-
         self._update_datetime_timer_id = None
         if is_valid_timezone(self.data.timezone.timezone):
             self._set_timezone(self.data.timezone.timezone)
@@ -435,12 +506,6 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
             self._set_timezone(DEFAULT_TZ)
             self.data.timezone.timezone = DEFAULT_TZ
 
-        if not flags.can_touch_runtime_system("modify system time and date"):
-            self._set_date_time_setting_sensitive(False)
-
-        self._config_dialog = NTPconfigDialog(self.data)
-        self._config_dialog.initialize()
-
         time_init_thread = threadMgr.get(constants.THREAD_TIME_INIT)
         if time_init_thread is not None:
             hubQ.send_message(self.__class__.__name__,
@@ -456,10 +521,12 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
                 return _("%s timezone") % get_xlated_timezone(self.data.timezone.timezone)
             else:
                 return _("Invalid timezone")
-        elif self._tzmap.get_timezone():
-            return _("%s timezone") % get_xlated_timezone(self._tzmap.get_timezone())
         else:
-            return _("Nothing selected")
+            location = self._tzmap.get_location()
+            if location and location.get_property("zone"):
+                return _("%s timezone") % get_xlated_timezone(location.get_property("zone"))
+            else:
+                return _("Nothing selected")
 
     def apply(self):
         # we could use self._tzmap.get_timezone() here, but it returns "" if
@@ -530,6 +597,7 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         self._ntpSwitch.set_active(ntp_working)
 
+    @gtk_action_nowait
     def _set_timezone(self, timezone):
         """
         Sets timezone to the city/region comboboxes and the timezone map.
@@ -560,10 +628,14 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def add_to_store(self, store, item):
         store.append([item])
 
-    def existing_date(self, model, itr, user_data=None):
-        if not itr:
+    @gtk_action_nowait
+    def add_to_store_idx(self, store, idx, item):
+        store.append([idx, item])
+
+    def existing_date(self, days_model, days_iter, user_data=None):
+        if not days_iter:
             return False
-        day = model[itr][0]
+        day = days_model[days_iter][0]
 
         #days 1-28 are in every month every year
         if day < 29:
@@ -573,16 +645,15 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         months_iter = self._monthCombo.get_active_iter()
         if not months_iter:
             return True
-        month = months_model[months_iter][0]
 
         years_model = self._yearCombo.get_model()
         years_iter = self._yearCombo.get_active_iter()
         if not years_iter:
             return True
-        year = years_model[years_iter][0]
 
         try:
-            datetime.date(year, self._months_nums[month], day)
+            datetime.date(years_model[years_iter][0],
+                          months_model[months_iter][0], day)
             return True
         except ValueError:
             return False
@@ -621,9 +692,9 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
     def _to_amPm(self, hours):
         if hours >= 12:
-            day_phase = "PM"
+            day_phase = _("PM")
         else:
-            day_phase = "AM"
+            day_phase = _("AM")
 
         new_hours = ((hours - 1) % 12) + 1
 
@@ -632,10 +703,10 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def _to_24h(self, hours, day_phase):
         correction = 0
 
-        if day_phase == "AM" and hours == 12:
+        if day_phase == _("AM") and hours == 12:
             correction = -12
 
-        elif day_phase == "PM" and hours != 12:
+        elif day_phase == _("PM") and hours != 12:
             correction = 12
 
         return (hours + correction) % 24
@@ -652,8 +723,7 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self._minutesLabel.set_text("%0.2d" % now.minute)
 
         self._set_combo_selection(self._dayCombo, now.day)
-        self._set_combo_selection(self._monthCombo,
-                            datetime.date(2000, now.month, 1).strftime('%B'))
+        self._set_combo_selection(self._monthCombo, now.month)
         self._set_combo_selection(self._yearCombo, now.year)
 
         #GLib's timer is driven by the return value of the function.
@@ -671,15 +741,13 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         if not flags.can_touch_runtime_system("save system time"):
             return False
 
-        month = self._get_combo_selection(self._monthCombo)
+        month = self._get_combo_selection(self._monthCombo)[0]
         if not month:
             return False
-        month = self._months_nums[month]
 
-        year_str = self._get_combo_selection(self._yearCombo)
-        if not year_str:
+        year = self._get_combo_selection(self._yearCombo)[0]
+        if not year:
             return False
-        year = int(year_str)
 
         hours = int(self._hoursLabel.get_text())
         if not self._radioButton24h.get_active():
@@ -687,10 +755,9 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         minutes = int(self._minutesLabel.get_text())
 
-        day = self._get_combo_selection(self._dayCombo)
+        day = self._get_combo_selection(self._dayCombo)[0]
         #day may be None if there is no such in the selected year and month
         if day:
-            day = int(day)
             isys.set_system_date_time(year, month, day, hours, minutes)
 
         #start the timer only when the spoke is shown
@@ -759,9 +826,9 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         model = combo.get_model()
         itr = combo.get_active_iter()
         if not itr or not model:
-            return None
+            return None, None
 
-        return model[itr][0]
+        return model[itr][0], model[itr][1]
 
     def _restore_old_city_region(self):
         """Restore stored "old" (or last valid) values."""
@@ -817,21 +884,13 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         minutes_str = "%0.2d" % ((minutes - 1) % 60)
         self._minutesLabel.set_text(minutes_str)
 
-    def on_up_ampm_clicked(self, *args):
+    def on_updown_ampm_clicked(self, *args):
         self._stop_and_maybe_start_time_updating()
 
-        if self._amPmLabel.get_text() == "AM":
-            self._amPmLabel.set_text("PM")
+        if self._amPmLabel.get_text() == _("AM"):
+            self._amPmLabel.set_text(_("PM"))
         else:
-            self._amPmLabel.set_text("AM")
-
-    def on_down_ampm_clicked(self, *args):
-        self._stop_and_maybe_start_time_updating()
-
-        if self._amPmLabel.get_text() == "AM":
-            self._amPmLabel.set_text("PM")
-        else:
-            self._amPmLabel.set_text("AM")
+            self._amPmLabel.set_text(_("AM"))
 
     def on_region_changed(self, combo, *args):
         """
@@ -884,12 +943,23 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
             return
 
         if region == "Etc":
-            # Etc timezones cannot be displayed on the map, so let's set the map
-            # to "" which sets it to "Europe/London" (UTC) without a city pin
-            self._tzmap.set_timezone("", no_signal=True)
+            # Etc timezones cannot be displayed on the map, so let's reset the
+            # location and manually set a highlight with no location pin.
+            self._tzmap.clear_location()
+            if city in ("GMT", "UTC"):
+                offset = 0.0
+            # The tzdb data uses POSIX-style signs for the GMT zones, which is
+            # the opposite of whatever everyone else expects. GMT+4 indicates a
+            # zone four hours west of Greenwich; i.e., four hours before. Reverse
+            # the sign to match the libtimezone map.
+            else:
+                # Take the part after "GMT"
+                offset = -float(city[3:])
+
+            self._tzmap.set_selected_offset(offset)
         else:
             # we don't want the timezone-changed signal to be emitted
-            self._tzmap.set_timezone(timezone, no_signal=True)
+            self._tzmap.set_timezone(timezone)
 
         # update "old" values
         self._old_city = city
@@ -935,7 +1005,11 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self._stop_and_maybe_start_time_updating(interval=5)
         self._daysFilter.refilter()
 
-    def on_timezone_changed(self, tz_map, timezone):
+    def on_location_changed(self, tz_map, location):
+        if not location:
+            return
+
+        timezone = location.get_property('zone')
         if self._set_timezone(timezone):
             # timezone successfully set
             os.environ["TZ"] = timezone
@@ -1020,7 +1094,7 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def on_ntp_config_clicked(self, *args):
         self._config_dialog.refresh()
 
-        with enlightbox(self.window, self._config_dialog.window):
+        with self.main_window.enlightbox(self._config_dialog.window):
             response = self._config_dialog.run()
 
         if response == 1:
diff --git a/anaconda/pyanaconda/ui/gui/spokes/filter.glade b/anaconda/pyanaconda/ui/gui/spokes/filter.glade
index 8c50349..9cfd145 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/filter.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/filter.glade
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="GtkListStore" id="diskStore">
     <columns>
       <!-- column-name diskVisible -->
@@ -38,12 +39,22 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkTreeModelFilter" id="multipathModel">
+    <property name="child_model">diskStore</property>
+  </object>
+  <object class="GtkTreeModelFilter" id="otherModel">
+    <property name="child_model">diskStore</property>
+  </object>
+  <object class="GtkTreeModelFilter" id="searchModel">
+    <property name="child_model">diskStore</property>
+  </object>
+  <object class="GtkTreeModelFilter" id="zModel">
+    <property name="child_model">diskStore</property>
+  </object>
   <object class="AnacondaSpokeWindow" id="filterWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">INSTALLATION DESTINATION</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
@@ -53,7 +64,6 @@
         <property name="spacing">6</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
-            <property name="app_paintable">True</property>
             <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
@@ -98,6 +108,7 @@
                       <object class="GtkScrolledWindow" id="searchScrolledWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkViewport" id="viewport1">
                             <property name="visible">True</property>
@@ -123,7 +134,6 @@
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
                                     <property name="width">5</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -131,23 +141,19 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Search _By:</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search">Search _By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">searchTypeCombo</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="searchTypeCombo">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="entry_text_column">0</property>
-                                    <property name="id_column">1</property>
                                     <items>
                                       <item translatable="yes">None</item>
                                       <item translatable="yes">Port / Target / LUN #</item>
@@ -158,8 +164,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -168,6 +172,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_tabs">False</property>
+                                    <property name="show_border">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label11">
                                         <property name="visible">True</property>
@@ -189,7 +194,7 @@
                                           <object class="GtkLabel" id="label13">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Port:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search|Port Target LUN">_Port:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">searchPortCombo</property>
                                           </object>
@@ -203,8 +208,6 @@
                                           <object class="GtkComboBoxText" id="searchPortCombo">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="entry_text_column">0</property>
-                                            <property name="id_column">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -216,7 +219,7 @@
                                           <object class="GtkLabel" id="label14">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Target:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search|Port Target LUN">_Target:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">searchTargetEntry</property>
                                           </object>
@@ -242,7 +245,7 @@
                                           <object class="GtkLabel" id="label15">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_LUN:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search|Port Target LUN">_LUN:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">searchLUNEntry</property>
                                           </object>
@@ -282,7 +285,7 @@
                                           <object class="GtkLabel" id="label18">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_WWID:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search|WWID">_WWID:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">searchWWIDEntry</property>
                                           </object>
@@ -323,8 +326,6 @@
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -337,6 +338,9 @@
                                     <property name="rules_hint">True</property>
                                     <property name="enable_search">False</property>
                                     <property name="enable_tree_lines">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="searchSelectedCol">
                                         <child>
@@ -468,39 +472,34 @@
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">2</property>
                                     <property name="width">5</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="searchClearButton">
-                                    <property name="label">gtk-clear</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search">_Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_clear_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="searchFindButton">
-                                    <property name="label">gtk-find</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search">_Find</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_find_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -513,7 +512,7 @@
                       <object class="GtkLabel" id="searchLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Search</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">Searc_h</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -524,6 +523,7 @@
                       <object class="GtkScrolledWindow" id="multipathScrolledWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkViewport" id="viewport2">
                             <property name="visible">True</property>
@@ -543,23 +543,19 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Filter By:</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath">Filter _By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">multipathTypeCombo</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="multipathTypeCombo">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="entry_text_column">0</property>
-                                    <property name="id_column">1</property>
                                     <items>
                                       <item translatable="yes">None</item>
                                       <item translatable="yes">Vendor</item>
@@ -571,8 +567,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -582,6 +576,7 @@
                                     <property name="no_show_all">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_tabs">False</property>
+                                    <property name="show_border">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label5">
                                         <property name="visible">True</property>
@@ -601,7 +596,7 @@
                                           <object class="GtkLabel" id="label7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Show Only _Devices From:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath|Vendor">Show Only _Devices From:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">multipathVendorCombo</property>
                                           </object>
@@ -615,8 +610,6 @@
                                           <object class="GtkComboBoxText" id="multipathVendorCombo">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="entry_text_column">0</property>
-                                            <property name="id_column">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -641,7 +634,7 @@
                                           <object class="GtkLabel" id="label16">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Show Only _Devices With:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath|Interconnect">Show Only _Devices With:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">multipathInterconnectCombo</property>
                                           </object>
@@ -655,8 +648,6 @@
                                           <object class="GtkComboBoxText" id="multipathInterconnectCombo">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="entry_text_column">0</property>
-                                            <property name="id_column">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -681,7 +672,7 @@
                                           <object class="GtkLabel" id="label17">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Show Only _Devices Containing:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath|WWID">Show Only _Devices Containing:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">multipathWWIDEntry</property>
                                           </object>
@@ -716,8 +707,6 @@
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -730,6 +719,9 @@
                                     <property name="rules_hint">True</property>
                                     <property name="enable_search">False</property>
                                     <property name="enable_tree_lines">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection2"/>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="multipathSelectedCol">
                                         <child>
@@ -820,39 +812,34 @@
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
                                     <property name="width">5</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="multipathClearButton">
-                                    <property name="label">gtk-clear</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath">_Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_clear_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="multipathFindButton">
-                                    <property name="label">gtk-find</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath">_Find</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_find_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -868,7 +855,7 @@
                       <object class="GtkLabel" id="multipathLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Multipath Devices</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">_Multipath Devices</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -880,6 +867,7 @@
                       <object class="GtkScrolledWindow" id="otherScrolledWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkViewport" id="viewport4">
                             <property name="visible">True</property>
@@ -899,23 +887,19 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Filter By:</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other">Filter _By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">multipathTypeCombo</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="otherTypeCombo">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="entry_text_column">0</property>
-                                    <property name="id_column">1</property>
                                     <items>
                                       <item translatable="yes">None</item>
                                       <item translatable="yes">Vendor</item>
@@ -927,8 +911,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -938,6 +920,7 @@
                                     <property name="no_show_all">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_tabs">False</property>
+                                    <property name="show_border">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label8">
                                         <property name="visible">True</property>
@@ -957,7 +940,7 @@
                                           <object class="GtkLabel" id="label12">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Show Only _Devices From:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other|Vendor">Show Only _Devices From:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">otherVendorCombo</property>
                                           </object>
@@ -971,8 +954,6 @@
                                           <object class="GtkComboBoxText" id="otherVendorCombo">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="entry_text_column">0</property>
-                                            <property name="id_column">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -997,7 +978,7 @@
                                           <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Show Only _Devices With:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other|Interconnect">Show Only _Devices With:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">otherInterconnectCombo</property>
                                           </object>
@@ -1011,8 +992,6 @@
                                           <object class="GtkComboBoxText" id="otherInterconnectCombo">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="entry_text_column">0</property>
-                                            <property name="id_column">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1037,7 +1016,7 @@
                                           <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Show Only _Devices Containing:</property>
+                                            <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other|ID">Show Only _Devices Containing:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">otherIDEntry</property>
                                           </object>
@@ -1053,7 +1032,6 @@
                                             <property name="can_focus">True</property>
                                             <property name="invisible_char">●</property>
                                             <property name="width_chars">30</property>
-                                            <property name="invisible_char_set">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1073,8 +1051,6 @@
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1089,6 +1065,9 @@
                                     <property name="enable_search">False</property>
                                     <property name="search_column">0</property>
                                     <property name="enable_tree_lines">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection3"/>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="otherSelectedCol">
                                         <child>
@@ -1165,39 +1144,34 @@
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
                                     <property name="width">5</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="otherClearButton">
-                                    <property name="label">gtk-clear</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other">_Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_clear_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="otherFindButton">
-                                    <property name="label">gtk-find</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other">_Find</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_find_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -1213,7 +1187,7 @@
                       <object class="GtkLabel" id="otherLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Other SAN Devices</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">_Other SAN Devices</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1221,32 +1195,11 @@
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Nothing here yet.</property>
-                      </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Firmware _RAID</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">3</property>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkScrolledWindow" id="zScrolledWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkViewport" id="viewport3">
                             <property name="visible">True</property>
@@ -1266,15 +1219,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Filter By:</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">_Filter By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">zFilterCombo</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1282,20 +1233,18 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">label</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">_Label</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">zFilterEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="zGoButton">
-                                    <property name="label" translatable="yes">_Go</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">_Go</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -1304,23 +1253,19 @@
                                   <packing>
                                     <property name="left_attach">4</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="zClearButton">
-                                    <property name="label">gtk-clear</property>
+                                    <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">_Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">5</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1333,8 +1278,6 @@
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1346,8 +1289,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1360,6 +1301,9 @@
                                     <property name="rules_hint">True</property>
                                     <property name="enable_search">False</property>
                                     <property name="enable_tree_lines">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection4"/>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="zSelectedCol">
                                         <child>
@@ -1449,7 +1393,6 @@
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
                                     <property name="width">6</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -1465,7 +1408,7 @@
                       <object class="GtkLabel" id="zLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_zSeries Devices</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">_zSeries Devices</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1488,7 +1431,7 @@
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="addZFCPButton">
-                        <property name="label" translatable="yes">_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>
@@ -1501,9 +1444,24 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="addDASDButton">
+                        <property name="label" translatable="yes">Add EC_KD DASD...</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_underline">True</property>
+                        <signal name="clicked" handler="on_add_dasd_clicked" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkButton" id="addISCSIButton">
-                        <property name="label" translatable="yes">Add _iSCSI Target...</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">Add _iSCSI Target...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1513,12 +1471,12 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="addFCOEButton">
-                        <property name="label" translatable="yes">Add FCo_E SAN...</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">Add FCo_E SAN...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1528,7 +1486,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -1540,7 +1498,6 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="summary_button">
-                    <property name="label" translatable="yes">summary</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -1550,6 +1507,18 @@
                     <property name="focus_on_click">False</property>
                     <property name="xalign">0</property>
                     <signal name="clicked" handler="on_summary_clicked" swapped="no"/>
+                    <child>
+                      <object class="GtkLabel" id="summary_button_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" context="GUI|Installation Destination|Filter">%d _storage devices selected</property>
+                        <property name="use_underline">True</property>
+                        <attributes>
+                          <attribute name="underline" value="True"/>
+                          <attribute name="foreground" value="#00000000ffff"/>
+                        </attributes>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1569,19 +1538,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeModelFilter" id="multipathModel">
-    <property name="child_model">diskStore</property>
-  </object>
-  <object class="GtkTreeModelFilter" id="otherModel">
-    <property name="child_model">diskStore</property>
-  </object>
-  <object class="GtkTreeModelFilter" id="raidModel">
-    <property name="child_model">diskStore</property>
-  </object>
-  <object class="GtkTreeModelFilter" id="searchModel">
-    <property name="child_model">diskStore</property>
-  </object>
-  <object class="GtkTreeModelFilter" id="zModel">
-    <property name="child_model">diskStore</property>
-  </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/filter.py b/anaconda/pyanaconda/ui/gui/spokes/filter.py
index 0c225e2..21e9737 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/filter.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/filter.py
@@ -23,19 +23,19 @@ from collections import namedtuple
 import itertools
 
 from blivet import arch
-from blivet.devices import DASDDevice, FcoeDiskDevice, iScsiDiskDevice, MultipathDevice, MDRaidArrayDevice, ZFCPDiskDevice
+from blivet.devices import DASDDevice, FcoeDiskDevice, iScsiDiskDevice, MultipathDevice, ZFCPDiskDevice
 from blivet.fcoe import has_fcoe
 
 from pyanaconda.flags import flags
-from pyanaconda.i18n import N_, P_
+from pyanaconda.i18n import CN_, CP_
 
-from pyanaconda.ui.lib.disks import getDisks, isLocalDisk, size_str
-from pyanaconda.ui.gui.utils import enlightbox
+from pyanaconda.ui.lib.disks import getDisks, isLocalDisk
 from pyanaconda.ui.gui.spokes import NormalSpoke
 from pyanaconda.ui.gui.spokes.advstorage.fcoe import FCoEDialog
 from pyanaconda.ui.gui.spokes.advstorage.iscsi import ISCSIDialog
+from pyanaconda.ui.gui.spokes.advstorage.dasd import DASDDialog
 from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
-from pyanaconda.ui.gui.categories.system import SystemCategory
+from pyanaconda.ui.categories.system import SystemCategory
 
 __all__ = ["FilterSpoke"]
 
@@ -132,6 +132,18 @@ class FilterPage(object):
         if items:
             combo.set_active(0)
 
+    def _long_identifier(self, disk):
+        # For iSCSI devices, we want the long ip-address:port-iscsi-tgtname-lun-XX
+        # identifier, but blivet doesn't expose that in any useful way and I don't
+        # want to go asking udev.  Instead, we dig around in the deviceLinks and
+        # default to the name if we can't figure anything else out.
+        for link in disk.deviceLinks:
+            if "by-path" in link:
+                lastSlash = link.rindex("/")+1
+                return link[lastSlash:]
+
+        return disk.name
+
 class SearchPage(FilterPage):
     def __init__(self, storage, builder):
         FilterPage.__init__(self, storage, builder)
@@ -197,7 +209,7 @@ class SearchPage(FilterPage):
         elif filterBy == 1:
             return self._port_equal(device) and self._target_equal(device) and self._lun_equal(device)
         elif filterBy == 2:
-            return hasattr(device, "wwid") and self._wwidEntry.get_text() in device.wwid
+            return self._wwidEntry.get_text() in getattr(device, "wwid", self._long_identifier(device))
         elif filterBy == 3:
             return hasattr(device, "fcp_lun") and self._lunEntry.get_text() in device.fcp_lun
 
@@ -229,7 +241,7 @@ class MultipathPage(FilterPage):
             selected = disk.name in selectedNames
 
             store.append([True, selected, not disk.protected,
-                          disk.name, "", disk.model, size_str(disk.size),
+                          disk.name, "", disk.model, str(disk.size),
                           disk.vendor, disk.bus, disk.serial,
                           disk.wwid, "\n".join(paths), "", "",
                           "", ""])
@@ -287,18 +299,6 @@ class OtherPage(FilterPage):
     def ismember(self, device):
         return isinstance(device, iScsiDiskDevice) or isinstance(device, FcoeDiskDevice)
 
-    def _long_identifier(self, disk):
-        # For iSCSI devices, we want the long ip-address:port-iscsi-tgtname-lun-XX
-        # identifier, but blivet doesn't expose that in any useful way and I don't
-        # want to go asking udev.  Instead, we dig around in the deviceLinks and
-        # default to the name if we can't figure anything else out.
-        for link in disk.deviceLinks:
-            if "by-path" in link:
-                lastSlash = link.rindex("/")+1
-                return link[lastSlash:]
-
-        return disk.name
-
     def setup(self, store, selectedNames, disks):
         vendors = []
         interconnects = []
@@ -314,7 +314,7 @@ class OtherPage(FilterPage):
                 lun = ""
 
             store.append([True, selected, not disk.protected,
-                          disk.name, "", disk.model, size_str(disk.size),
+                          disk.name, "", disk.model, str(disk.size),
                           disk.vendor, disk.bus, disk.serial,
                           self._long_identifier(disk), "", port, getattr(disk, "initiator", ""),
                           lun, ""])
@@ -360,23 +360,6 @@ class OtherPage(FilterPage):
         device = self.storage.devicetree.getDeviceByName(obj.name, hidden=True)
         return self.ismember(device) and self._filter_func(device)
 
-class RaidPage(FilterPage):
-    def __init__(self, storage, builder):
-        FilterPage.__init__(self, storage, builder)
-        self.model = self.builder.get_object("raidModel")
-        self.model.set_visible_func(self.visible_func)
-
-    def ismember(self, device):
-        return isinstance(device, MDRaidArrayDevice) and device.isDisk
-
-    def visible_func(self, model, itr, *args):
-        if not flags.dmraid:
-            return False
-
-        obj = DiskStoreRow(*model[itr])
-        device = self.storage.devicetree.getDeviceByName(obj.name, hidden=True)
-        return self.ismember(device)
-
 class ZPage(FilterPage):
     def __init__(self, storage, builder):
         FilterPage.__init__(self, storage, builder)
@@ -399,13 +382,14 @@ class ZPage(FilterPage):
 
 class FilterSpoke(NormalSpoke):
     builderObjects = ["diskStore", "filterWindow",
-                      "searchModel", "multipathModel", "otherModel", "raidModel", "zModel"]
+                      "searchModel", "multipathModel", "otherModel", "zModel"]
     mainWidgetName = "filterWindow"
     uiFile = "spokes/filter.glade"
+    helpFile = "FilterSpoke.xml"
 
     category = SystemCategory
 
-    title = N_("_INSTALLATION DESTINATION")
+    title = CN_("GUI|Spoke", "_INSTALLATION DESTINATION")
 
     def __init__(self, *args):
         NormalSpoke.__init__(self, *args)
@@ -419,6 +403,11 @@ class FilterSpoke(NormalSpoke):
     def indirect(self):
         return True
 
+    # This spoke has no status since it's not in a hub
+    @property
+    def status(self):
+        return None
+
     def apply(self):
         onlyuse = self.selected_disks[:]
         for disk in [d for d in self.storage.disks if d.name in onlyuse]:
@@ -434,7 +423,6 @@ class FilterSpoke(NormalSpoke):
         self.pages = [SearchPage(self.storage, self.builder),
                       MultipathPage(self.storage, self.builder),
                       OtherPage(self.storage, self.builder),
-                      RaidPage(self.storage, self.builder),
                       ZPage(self.storage, self.builder)]
 
         self._notebook = self.builder.get_object("advancedNotebook")
@@ -442,6 +430,7 @@ class FilterSpoke(NormalSpoke):
         if not arch.isS390():
             self._notebook.remove_page(-1)
             self.builder.get_object("addZFCPButton").destroy()
+            self.builder.get_object("addDASDButton").destroy()
 
         if not has_fcoe():
             self.builder.get_object("addFCOEButton").destroy()
@@ -468,7 +457,6 @@ class FilterSpoke(NormalSpoke):
         allDisks = []
         multipathDisks = []
         otherDisks = []
-        raidDisks = []
         zDisks = []
 
         # Now all all the non-local disks to the store.  Everything has been set up
@@ -482,8 +470,6 @@ class FilterSpoke(NormalSpoke):
             elif self.pages[2].ismember(disk):
                 otherDisks.append(disk)
             elif self.pages[3].ismember(disk):
-                raidDisks.append(disk)
-            elif self.pages[4].ismember(disk):
                 zDisks.append(disk)
 
             allDisks.append(disk)
@@ -491,26 +477,25 @@ class FilterSpoke(NormalSpoke):
         self.pages[0].setup(self._store, self.selected_disks, allDisks)
         self.pages[1].setup(self._store, self.selected_disks, multipathDisks)
         self.pages[2].setup(self._store, self.selected_disks, otherDisks)
-        self.pages[3].setup(self._store, self.selected_disks, raidDisks)
-        self.pages[4].setup(self._store, self.selected_disks, zDisks)
+        self.pages[3].setup(self._store, self.selected_disks, zDisks)
 
         self._update_summary()
 
     def _update_summary(self):
         summaryButton = self.builder.get_object("summary_button")
-        label = summaryButton.get_children()[0]
+        label = self.builder.get_object("summary_button_label")
 
         # We need to remove ancestor devices from the count.  Otherwise, we'll
         # end up in a situation where selecting one multipath device could
         # potentially show three devices selected (mpatha, sda, sdb for instance).
         count = len([disk for disk in self.selected_disks if disk not in self.ancestors])
 
-        summary = P_("%d _storage device selected",
+        summary = CP_("GUI|Installation Destination|Filter",
+                     "%d _storage device selected",
                      "%d _storage devices selected",
                      count) % count
 
-        label.set_use_markup(True)
-        label.set_markup("<span foreground='blue'><u>%s</u></span>" % summary)
+        label.set_text(summary)
         label.set_use_underline(True)
 
         summaryButton.set_visible(count > 0)
@@ -528,7 +513,7 @@ class FilterSpoke(NormalSpoke):
         disks = [disk for disk in self.disks if disk.name in self.selected_disks]
         free_space = self.storage.getFreeSpace(disks=disks)
 
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             dialog.refresh(disks, free_space, showRemove=False, setBoot=False)
             dialog.run()
 
@@ -551,7 +536,10 @@ class FilterSpoke(NormalSpoke):
         if not path:
             return
 
-        itr = self._store.get_iter(path)
+        page_index = self._notebook.get_current_page()
+        filter_model = self.pages[page_index].model
+        model_itr = filter_model.get_iter(path)
+        itr = filter_model.convert_iter_to_child_iter(model_itr)
         self._store[itr][1] = not self._store[itr][1]
 
         if self._store[itr][1] and self._store[itr][3] not in self.selected_disks:
@@ -564,7 +552,7 @@ class FilterSpoke(NormalSpoke):
     def on_add_iscsi_clicked(self, widget, *args):
         dialog = ISCSIDialog(self.data, self.storage)
 
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             dialog.refresh()
             dialog.run()
 
@@ -575,7 +563,7 @@ class FilterSpoke(NormalSpoke):
     def on_add_fcoe_clicked(self, widget, *args):
         dialog = FCoEDialog(self.data, self.storage)
 
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             dialog.refresh()
             dialog.run()
 
@@ -586,6 +574,17 @@ class FilterSpoke(NormalSpoke):
     def on_add_zfcp_clicked(self, widget, *args):
         pass
 
+    def on_add_dasd_clicked(self, widget, *args):
+        dialog = DASDDialog(self.data, self.storage)
+
+        with self.main_window.enlightbox(dialog.window):
+            dialog.refresh()
+            dialog.run()
+
+        # We now need to refresh so any new disks picked up by adding advanced
+        # storage are displayed in the UI.
+        self.refresh()
+
     ##
     ## SEARCH TAB SIGNAL HANDLERS
     ##
diff --git a/anaconda/pyanaconda/ui/gui/spokes/keyboard.glade b/anaconda/pyanaconda/ui/gui/spokes/keyboard.glade
index 9c20938..149b2c8 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/keyboard.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/keyboard.glade
@@ -1,7 +1,407 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.2"/>
+  <requires lib="AnacondaWidgets" version="3.0"/>
+  <object class="GtkListStore" id="addedLayoutStore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTextBuffer" id="layoutTestBuffer"/>
+  <object class="AnacondaSpokeWindow" id="keyboardWindow">
+    <property name="can_focus">False</property>
+    <property name="window_name" translatable="yes">KEYBOARD LAYOUT</property>
+    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
+    <child internal-child="main_box">
+      <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="nav_box">
+          <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
+            <child internal-child="nav_area">
+              <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
+                <property name="can_focus">False</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="alignment">
+          <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
+            <property name="can_focus">False</property>
+            <property name="margin_top">12</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="yalign">0</property>
+            <property name="xscale">0.75</property>
+            <property name="yscale">0.75</property>
+            <property name="left_padding">24</property>
+            <property name="right_padding">24</property>
+            <child internal-child="action_area">
+              <object class="GtkBox" id="keyboardWindow-actionArea">
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="pickLayoutLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Which keyboard layouts would you like to use on this system?  You may move any layout to the top of the list to select it as the default.</property>
+                    <property name="wrap">True</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 12"/>
+                      <attribute name="weight" value="normal"/>
+                      <attribute name="scale" value="1"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="warningBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="margin_right">20</property>
+                    <property name="spacing">2</property>
+                    <child>
+                      <object class="GtkImage" id="warningImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="icon_name">dialog-warning</property>
+                        <property name="icon_size">1</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="liveWarningLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Changes here will only apply to the installed system. Use the desktop's tool to configure the keyboard for the installation process.</property>
+                        <property name="wrap">True</property>
+                        <attributes>
+                          <attribute name="font-desc" value="Cantarell 12"/>
+                          <attribute name="weight" value="normal"/>
+                          <attribute name="scale" value="1"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_top">24</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="spacing">30</property>
+                    <property name="homogeneous">True</property>
+                    <child>
+                      <object class="GtkBox" id="leftSideBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <property name="min_content_width">240</property>
+                            <child>
+                              <object class="GtkTreeView" id="layoutView">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">addedLayoutStore</property>
+                                <property name="headers_visible">False</property>
+                                <property name="search_column">0</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="layoutSelection">
+                                    <signal name="changed" handler="on_selection_changed" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="layoutColumn">
+                                    <property name="title" translatable="yes">name</property>
+                                    <property name="expand">True</property>
+                                    <property name="clickable">True</property>
+                                    <property name="sort_column_id">0</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="layoutRenderer"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="layoutView-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Selected Layouts</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolbar" id="toolbar1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="toolbar_style">icons</property>
+                            <property name="icon_size">1</property>
+                            <child>
+                              <object class="GtkToolButton" id="addLayoutButton">
+                                <property name="width_request">42</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="GUI|Keyboard Layout">_Add layout</property>
+                                <property name="use_underline">True</property>
+                                <property name="icon_name">list-add-symbolic</property>
+                                <signal name="clicked" handler="on_add_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="removeLayoutButton">
+                                <property name="width_request">42</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="GUI|Keyboard Layout">_Remove layout</property>
+                                <property name="use_underline">True</property>
+                                <property name="icon_name">list-remove-symbolic</property>
+                                <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="upButton">
+                                <property name="width_request">42</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="GUI|Keyboard Layout">Move selected layout _up</property>
+                                <property name="use_underline">True</property>
+                                <property name="icon_name">go-up-symbolic</property>
+                                <signal name="clicked" handler="on_up_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="downButton">
+                                <property name="width_request">42</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="GUI|Keyboard Layout">Move selected layout _down</property>
+                                <property name="use_underline">True</property>
+                                <property name="icon_name">go-down-symbolic</property>
+                                <signal name="clicked" handler="on_down_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolButton" id="previewButton">
+                                <property name="width_request">42</property>
+                                <property name="height_request">36</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="GUI|Keyboard Layout">_Preview layout</property>
+                                <property name="use_underline">True</property>
+                                <property name="icon_name">input-keyboard-symbolic</property>
+                                <signal name="clicked" handler="on_preview_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                            <style>
+                              <class name="inline-toolbar"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="rightSideBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="testingLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes" context="GUI|Keyboard Layout">_Test the layout configuration below:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">layoutTextView</property>
+                            <attributes>
+                              <attribute name="font-desc" value="Cantarell 10"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkScrolledWindow" id="testingWindow">
+                            <property name="height_request">100</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkTextView" id="layoutTextView">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="border_width">6</property>
+                                <property name="buffer">layoutTestBuffer</property>
+                                <property name="accepts_tab">False</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="layoutSwitchLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="valign">start</property>
+                            <property name="label" translatable="yes">Alt + Shift to switch layouts.</property>
+                            <property name="wrap">True</property>
+                            <attributes>
+                              <attribute name="font-desc" value="Cantarell Italic 10"/>
+                              <attribute name="style" value="italic"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="optionsButton">
+                            <property name="label" translatable="yes" context="GUI|Keyboard Layout">_Options</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">start</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" handler="on_options_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="keyboardWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">KEYBOARD LAYOUT</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkListStore" id="newLayoutStore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelFilter" id="newLayoutStoreFilter">
+    <property name="child_model">newLayoutStore</property>
+  </object>
+  <object class="GtkTreeModelSort" id="newLayoutStoreSort">
+    <property name="model">newLayoutStoreFilter</property>
+  </object>
   <object class="GtkDialog" id="addLayoutDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -19,11 +419,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelButton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Keyboard Layout|Add Layout">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -33,11 +433,11 @@
             </child>
             <child>
               <object class="GtkButton" id="confirmAddButton">
-                <property name="label">gtk-add</property>
+                <property name="label" translatable="yes" context="GUI|Keyboard Layout|Add Layout">_Add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_confirm_add_clicked" swapped="no"/>
               </object>
               <packing>
@@ -129,6 +529,11 @@
                         </child>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="newLayoutView-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Available Layouts</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -166,400 +571,22 @@
       <action-widget response="0">cancelButton</action-widget>
       <action-widget response="1">confirmAddButton</action-widget>
     </action-widgets>
-  </object>
-  <object class="GtkListStore" id="addedLayoutStore">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="AnacondaSpokeWindow" id="keyboardWindow">
-    <property name="startup_id">filler</property>
-    <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
-    <property name="mnemonics_visible">False</property>
-    <property name="focus_visible">False</property>
-    <property name="window_name" translatable="yes">KEYBOARD LAYOUT</property>
-    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
-    <child internal-child="main_box">
-      <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child internal-child="nav_box">
-          <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
-            <property name="can_focus">False</property>
-            <child internal-child="nav_area">
-              <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
-                <property name="can_focus">False</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="alignment">
-          <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
-            <property name="can_focus">False</property>
-            <property name="margin_top">12</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="yalign">0</property>
-            <property name="xscale">0.75</property>
-            <property name="yscale">0.75</property>
-            <property name="left_padding">24</property>
-            <property name="right_padding">24</property>
-            <child internal-child="action_area">
-              <object class="GtkBox" id="keyboardWindow-actionArea">
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="pickLayoutLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Which keyboard layouts would you like to use on this system?  You may move any layout to the top of the list to select it as the default.</property>
-                    <property name="wrap">True</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 12"/>
-                      <attribute name="weight" value="normal"/>
-                      <attribute name="scale" value="1"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="warningBox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="no_show_all">True</property>
-                    <property name="margin_right">20</property>
-                    <property name="spacing">2</property>
-                    <child>
-                      <object class="GtkImage" id="warningImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="stock">gtk-dialog-warning</property>
-                        <property name="icon-size">1</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="liveWarningLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Changes here will only apply to the installed system. Use the desktop's tool to configure the keyboard for the installation process.</property>
-                        <property name="wrap">True</property>
-                        <attributes>
-                          <attribute name="font-desc" value="Cantarell 12"/>
-                          <attribute name="weight" value="normal"/>
-                          <attribute name="scale" value="1"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">24</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="spacing">30</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <object class="GtkBox" id="leftSideBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="shadow_type">in</property>
-                            <property name="min_content_width">240</property>
-                            <child>
-                              <object class="GtkTreeView" id="layoutView">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">addedLayoutStore</property>
-                                <property name="headers_visible">False</property>
-                                <property name="search_column">0</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="layoutSelection">
-                                    <signal name="changed" handler="on_selection_changed" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="layoutColumn">
-                                    <property name="title" translatable="yes">name</property>
-                                    <property name="expand">True</property>
-                                    <property name="clickable">True</property>
-                                    <property name="sort_column_id">0</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="layoutRenderer"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                        <attribute name="foreground-rgba">6</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolbar" id="toolbar1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="icon_size">1</property>
-                            <style>
-                              <class name="inline-toolbar"/>
-                            </style>
-                            <child>
-                              <object class="GtkToolButton" id="addLayoutButton">
-                                <property name="width_request">42</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Add layout</property>
-                                <property name="use_underline">True</property>
-                                <property name="icon_name">list-add-symbolic</property>
-                                <signal name="clicked" handler="on_add_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="removeLayoutButton">
-                                <property name="width_request">42</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Remove layout</property>
-                                <property name="use_underline">True</property>
-                                <property name="icon_name">list-remove-symbolic</property>
-                                <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="upButton">
-                                <property name="width_request">42</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Move selected layout up</property>
-                                <property name="use_underline">True</property>
-                                <property name="icon_name">go-up-symbolic</property>
-                                <signal name="clicked" handler="on_up_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="downButton">
-                                <property name="width_request">42</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Move selected layout down</property>
-                                <property name="use_underline">True</property>
-                                <property name="icon_name">go-down-symbolic</property>
-                                <signal name="clicked" handler="on_down_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="previewButton">
-                                <property name="width_request">42</property>
-                                <property name="height_request">36</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Preview layout</property>
-                                <property name="use_underline">True</property>
-                                <property name="icon_name">input-keyboard-symbolic</property>
-                                <signal name="clicked" handler="on_preview_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="rightSideBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="testingLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">_Test the layout configuration below:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">layoutTextView</property>
-                            <attributes>
-                              <attribute name="font-desc" value="Cantarell 10"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkScrolledWindow" id="testingWindow">
-                            <property name="height_request">100</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <object class="GtkTextView" id="layoutTextView">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="border_width">6</property>
-                                <property name="buffer">layoutTestBuffer</property>
-                                <property name="accepts_tab">False</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="layoutSwitchLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">start</property>
-                            <property name="label" translatable="yes">Alt + Shift to switch layouts.</property>
-                            <property name="wrap">True</property>
-                            <attributes>
-                              <attribute name="font-desc" value="Cantarell Italic 10"/>
-                              <attribute name="style" value="italic"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="optionsButton">
-                            <property name="label" translatable="yes">_Options</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="halign">end</property>
-                            <property name="valign">start</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_options_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="addLayoutDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Add Layout</property>
       </object>
     </child>
   </object>
-  <object class="GtkTextBuffer" id="layoutTestBuffer"/>
-  <object class="GtkListStore" id="newLayoutStore">
+  <object class="GtkListStore" id="switchingOptsStore">
     <columns>
-      <!-- column-name name -->
+      <!-- column-name description -->
       <column type="gchararray"/>
+      <!-- column-name use -->
+      <column type="gboolean"/>
     </columns>
   </object>
-  <object class="GtkTreeModelFilter" id="newLayoutStoreFilter">
-    <property name="child_model">newLayoutStore</property>
-  </object>
-  <object class="GtkTreeModelSort" id="newLayoutStoreSort">
-    <property name="model">newLayoutStoreFilter</property>
+  <object class="GtkTreeModelSort" id="switchingOptsSort">
+    <property name="model">switchingOptsStore</property>
   </object>
   <object class="GtkDialog" id="switchingDialog">
     <property name="can_focus">False</property>
@@ -578,11 +605,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Keyboard Layout|Switching Options">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -592,11 +619,11 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes" context="GUI|Keyboard Layout|Switching Options">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -722,16 +749,10 @@
       <action-widget response="0">button2</action-widget>
       <action-widget response="1">button1</action-widget>
     </action-widgets>
-  </object>
-  <object class="GtkListStore" id="switchingOptsStore">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name use -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkTreeModelSort" id="switchingOptsSort">
-    <property name="model">switchingOptsStore</property>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="switchingDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Layout Options</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/keyboard.py b/anaconda/pyanaconda/ui/gui/spokes/keyboard.py
index cbbcb21..fda111f 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/keyboard.py
@@ -24,13 +24,18 @@ from gi.repository import Gkbd, Gdk, Gtk
 
 from pyanaconda.ui.gui import GUIObject
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui.categories.localization import LocalizationCategory
-from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once, timed_action
+from pyanaconda.ui.categories.localization import LocalizationCategory
+from pyanaconda.ui.gui.utils import gtk_call_once, escape_markup, gtk_batch_map, timed_action
+from pyanaconda.ui.gui.utils import override_cell_property
+from pyanaconda.ui.gui.xkl_wrapper import XklWrapper, XklWrapperError
 from pyanaconda import keyboard
 from pyanaconda import flags
-from pyanaconda.i18n import _, N_
-from pyanaconda.constants import DEFAULT_KEYBOARD
-from pyanaconda.iutil import strip_accents, have_word_match
+from pyanaconda.i18n import _, N_, CN_
+from pyanaconda.constants import DEFAULT_KEYBOARD, THREAD_KEYBOARD_INIT, THREAD_ADD_LAYOUTS_INIT
+from pyanaconda.ui.communication import hubQ
+from pyanaconda.iutil import strip_accents
+from pyanaconda.threads import threadMgr, AnacondaThread
+from pyanaconda.iutil import have_word_match
 
 import locale as locale_mod
 
@@ -42,15 +47,16 @@ __all__ = ["KeyboardSpoke"]
 # %s will be replaced by key combination like Alt+Shift
 LAYOUT_SWITCHING_INFO = N_("%s to switch layouts.")
 
+ADD_LAYOUTS_INITIALIZE_THREAD = "AnaAddLayoutsInitializeThread"
+
 def _show_layout(column, renderer, model, itr, wrapper):
-    value = wrapper.get_layout_variant_description(model[itr][0])
-    renderer.set_property("text", value)
+    return wrapper.get_layout_variant_description(model[itr][0])
 
 def _show_description(column, renderer, model, itr, wrapper):
     value = wrapper.get_switch_opt_description(model[itr][0])
     if model[itr][1]:
-        value = "<b>%s</b>" % value
-    renderer.set_property("markup", value)
+        value = "<b>%s</b>" % escape_markup(value)
+    return value
 
 class AddLayoutDialog(GUIObject):
     builderObjects = ["addLayoutDialog", "newLayoutStore",
@@ -60,7 +66,7 @@ class AddLayoutDialog(GUIObject):
 
     def __init__(self, *args):
         GUIObject.__init__(self, *args)
-        self._xkl_wrapper = keyboard.XklWrapper.get_instance()
+        self._xkl_wrapper = XklWrapper.get_instance()
         self._chosen_layouts = []
 
     def matches_entry(self, model, itr, user_data=None):
@@ -73,10 +79,10 @@ class AddLayoutDialog(GUIObject):
         eng_value = self._xkl_wrapper.get_layout_variant_description(value, xlated=False)
         xlated_value = self._xkl_wrapper.get_layout_variant_description(value)
         translit_value = strip_accents(xlated_value).lower()
-        translit_text = strip_accents(unicode(entry_text, "utf-8")).lower()
+        entry_text = unicode(entry_text, "utf-8").lower()
 
         return have_word_match(entry_text, eng_value) or have_word_match(entry_text, xlated_value) \
-            or have_word_match(translit_text, translit_value)
+            or have_word_match(entry_text, translit_value)
 
     def compare_layouts(self, model, itr1, itr2, user_data=None):
         """
@@ -93,6 +99,8 @@ class AddLayoutDialog(GUIObject):
         return locale_mod.strcoll(show_str1, show_str2)
 
     def refresh(self):
+        selected = self._newLayoutSelection.count_selected_rows()
+        self._confirmAddButton.set_sensitive(selected)
         self._entry.grab_focus()
 
     def initialize(self):
@@ -101,22 +109,26 @@ class AddLayoutDialog(GUIObject):
         self._entry = self.builder.get_object("addLayoutEntry")
         layoutColumn = self.builder.get_object("newLayoutColumn")
         layoutRenderer = self.builder.get_object("newLayoutRenderer")
-        layoutColumn.set_cell_data_func(layoutRenderer, _show_layout,
-                                            self._xkl_wrapper)
+        override_cell_property(layoutColumn, layoutRenderer, "text", _show_layout,
+                               self._xkl_wrapper)
         self._treeModelFilter = self.builder.get_object("newLayoutStoreFilter")
         self._treeModelFilter.set_visible_func(self.matches_entry, None)
         self._treeModelSort = self.builder.get_object("newLayoutStoreSort")
         self._treeModelSort.set_default_sort_func(self.compare_layouts, None)
 
-        self._store = self.builder.get_object("newLayoutStore")
-        for layout in self._xkl_wrapper.get_available_layouts():
-            self._addLayout(self._store, layout)
-
         self._confirmAddButton = self.builder.get_object("confirmAddButton")
-
         self._newLayoutSelection = self.builder.get_object("newLayoutSelection")
-        selected = self._newLayoutSelection.count_selected_rows()
-        self._confirmAddButton.set_sensitive(selected)
+
+        self._store = self.builder.get_object("newLayoutStore")
+        threadMgr.add(AnacondaThread(name=THREAD_ADD_LAYOUTS_INIT,
+                                     target=self._initialize))
+
+    def _initialize(self):
+        gtk_batch_map(self._addLayout, self._xkl_wrapper.get_available_layouts(),
+                      args=(self._store,), batch_size=20)
+
+    def wait_initialize(self):
+        threadMgr.wait(THREAD_ADD_LAYOUTS_INIT)
 
     def run(self):
         self.window.show()
@@ -159,7 +171,7 @@ class AddLayoutDialog(GUIObject):
         # let the other actions happen as well
         return False
 
-    def _addLayout(self, store, name):
+    def _addLayout(self, name, store):
         store.append([name])
 
 
@@ -173,7 +185,7 @@ class ConfigureSwitchingDialog(GUIObject):
 
     def __init__(self, *args):
         GUIObject.__init__(self, *args)
-        self._xkl_wrapper = keyboard.XklWrapper.get_instance()
+        self._xkl_wrapper = XklWrapper.get_instance()
 
         self._switchingOptsStore = self.builder.get_object("switchingOptsStore")
 
@@ -181,7 +193,7 @@ class ConfigureSwitchingDialog(GUIObject):
         # we want to display "Alt + Shift" rather than "grp:alt_shift_toggle"
         descColumn = self.builder.get_object("descColumn")
         descRenderer = self.builder.get_object("descRenderer")
-        descColumn.set_cell_data_func(descRenderer, _show_description,
+        override_cell_property(descColumn, descRenderer, "markup", _show_description,
                                             self._xkl_wrapper)
 
         self._switchingOptsSort = self.builder.get_object("switchingOptsSort")
@@ -252,18 +264,20 @@ class KeyboardSpoke(NormalSpoke):
                       "layoutTestBuffer"]
     mainWidgetName = "keyboardWindow"
     uiFile = "spokes/keyboard.glade"
+    helpFile = "KeyboardSpoke.xml"
 
     category = LocalizationCategory
 
     icon = "input-keyboard-symbolic"
-    title = N_("_KEYBOARD")
+    title = CN_("GUI|Spoke", "_KEYBOARD")
 
     def __init__(self, *args):
         NormalSpoke.__init__(self, *args)
         self._remove_last_attempt = False
         self._confirmed = False
-        self._xkl_wrapper = keyboard.XklWrapper.get_instance()
+        self._xkl_wrapper = XklWrapper.get_instance()
         self._add_dialog = None
+        self._ready = False
 
         self._upButton = self.builder.get_object("upButton")
         self._downButton = self.builder.get_object("downButton")
@@ -285,9 +299,12 @@ class KeyboardSpoke(NormalSpoke):
     def completed(self):
         if flags.flags.automatedInstall and not self.data.keyboard.seen:
             return False
-        elif not self._confirmed and self._xkl_wrapper.get_current_layout() != self.data.keyboard.x_layouts[0]:
+        elif not self._confirmed and \
+                self._xkl_wrapper.get_current_layout() != self.data.keyboard.x_layouts[0] and \
+                not flags.flags.usevnc:
             # the currently activated layout is a different one from the
-            # installed system's default
+            # installed system's default. Ignore VNC, since VNC keymaps are
+            # weird and more on the client side.
             return False
         else:
             return True
@@ -299,8 +316,14 @@ class KeyboardSpoke(NormalSpoke):
                         for row in self._store)
         return ", ".join(descriptions)
 
+    @property
+    def ready(self):
+        return self._ready and threadMgr.get(ADD_LAYOUTS_INITIALIZE_THREAD) is None
+
     def initialize(self):
         NormalSpoke.initialize(self)
+        self._add_dialog = AddLayoutDialog(self.data)
+        self._add_dialog.initialize()
 
         if flags.can_touch_runtime_system("hide runtime keyboard configuration "
                                           "warning", touch_live=True):
@@ -310,12 +333,14 @@ class KeyboardSpoke(NormalSpoke):
         # 'language (description)'.
         layoutColumn = self.builder.get_object("layoutColumn")
         layoutRenderer = self.builder.get_object("layoutRenderer")
-        layoutColumn.set_cell_data_func(layoutRenderer, _show_layout,
+        override_cell_property(layoutColumn, layoutRenderer, "text", _show_layout,
                                             self._xkl_wrapper)
 
         self._store = self.builder.get_object("addedLayoutStore")
         self._add_data_layouts()
 
+        self._selection = self.builder.get_object("layoutSelection")
+
         self._switching_dialog = ConfigureSwitchingDialog(self.data)
         self._switching_dialog.initialize()
 
@@ -337,6 +362,17 @@ class KeyboardSpoke(NormalSpoke):
             for widget in widgets:
                 widget.set_sensitive(False)
 
+        hubQ.send_not_ready(self.__class__.__name__)
+        hubQ.send_message(self.__class__.__name__,
+                          _("Getting list of layouts..."))
+        threadMgr.add(AnacondaThread(name=THREAD_KEYBOARD_INIT,
+                                     target=self._wait_ready))
+
+    def _wait_ready(self):
+        self._add_dialog.wait_initialize()
+        self._ready = True
+        hubQ.send_ready(self.__class__.__name__, False)
+
     def refresh(self):
         NormalSpoke.refresh(self)
 
@@ -388,13 +424,9 @@ class KeyboardSpoke(NormalSpoke):
 
     # Signal handlers.
     def on_add_clicked(self, button):
-        if not self._add_dialog:
-            self._add_dialog = AddLayoutDialog(self.data)
-            self._add_dialog.initialize()
-
         self._add_dialog.refresh()
 
-        with enlightbox(self.window, self._add_dialog.window):
+        with self.main_window.enlightbox(self._add_dialog.window):
             response = self._add_dialog.run()
 
         if response == 1:
@@ -414,19 +446,24 @@ class KeyboardSpoke(NormalSpoke):
                     self._removeLayout(self._store, itr)
                 self._remove_last_attempt = False
 
+            # Update the selection information
+            self._selection.emit("changed")
+
     def on_remove_clicked(self, button):
-        selection = self.builder.get_object("layoutSelection")
-        if not selection.count_selected_rows():
+        if not self._selection.count_selected_rows():
             return
 
-        (store, itr) = selection.get_selected()
+        (store, itr) = self._selection.get_selected()
         itr2 = store.get_iter_first()
         #if the first item is selected, try to select the next one
         if store[itr][0] == store[itr2][0]:
             itr2 = store.iter_next(itr2)
             if itr2: #next one existing
-                selection.select_iter(itr2)
+                self._selection.select_iter(itr2)
                 self._removeLayout(store, itr)
+                # Re-emit the selection changed signal now that the backing store is updated
+                # in order to update the first/last/only-based button sensitivities
+                self._selection.emit("changed")
                 return
 
             #nothing left, run AddLayout dialog to replace the current layout
@@ -445,14 +482,13 @@ class KeyboardSpoke(NormalSpoke):
             itr3 = store.iter_next(itr3)
 
         self._removeLayout(store, itr)
-        selection.select_iter(itr2)
+        self._selection.select_iter(itr2)
 
     def on_up_clicked(self, button):
-        selection = self.builder.get_object("layoutSelection")
-        if not selection.count_selected_rows():
+        if not self._selection.count_selected_rows():
             return
 
-        (store, cur) = selection.get_selected()
+        (store, cur) = self._selection.get_selected()
         prev = store.iter_previous(cur)
         if not prev:
             return
@@ -465,14 +501,13 @@ class KeyboardSpoke(NormalSpoke):
             #layout is first in the list (set as default), activate it
             self._xkl_wrapper.activate_default_layout()
 
-        selection.emit("changed")
+        self._selection.emit("changed")
 
     def on_down_clicked(self, button):
-        selection = self.builder.get_object("layoutSelection")
-        if not selection.count_selected_rows():
+        if not self._selection.count_selected_rows():
             return
 
-        (store, cur) = selection.get_selected()
+        (store, cur) = self._selection.get_selected()
 
         #if default layout (first in the list) changes we need to activate it
         activate_default = not store.iter_previous(cur)
@@ -488,11 +523,10 @@ class KeyboardSpoke(NormalSpoke):
         if activate_default:
             self._xkl_wrapper.activate_default_layout()
 
-        selection.emit("changed")
+        self._selection.emit("changed")
 
     def on_preview_clicked(self, button):
-        selection = self.builder.get_object("layoutSelection")
-        (store, cur) = selection.get_selected()
+        (store, cur) = self._selection.get_selected()
         layout_row = store[cur]
         if not layout_row:
             return
@@ -509,7 +543,7 @@ class KeyboardSpoke(NormalSpoke):
                                                lay_var_spec)
         dialog.set_size_request(750, 350)
         dialog.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
-        with enlightbox(self.window, dialog):
+        with self.main_window.enlightbox(dialog):
             dialog.show_all()
             dialog.run()
 
@@ -529,22 +563,27 @@ class KeyboardSpoke(NormalSpoke):
         self._removeButton.set_sensitive(True)
         self._previewButton.set_sensitive(True)
 
-        # Disable the Up button if the top row's selected, and disable the
-        # Down button if the bottom row's selected.
-        if selected[0].get_indices() == [0]:
+        # If only one row is available, disable both the Up and Down button
+        if len(store) == 1:
             self._upButton.set_sensitive(False)
-            self._downButton.set_sensitive(True)
-        elif selected[0].get_indices() == [len(store)-1]:
-            self._upButton.set_sensitive(True)
             self._downButton.set_sensitive(False)
         else:
-            self._upButton.set_sensitive(True)
-            self._downButton.set_sensitive(True)
+            # Disable the Up button if the top row's selected, and disable the
+            # Down button if the bottom row's selected.
+            if selected[0].get_indices() == [0]:
+                self._upButton.set_sensitive(False)
+                self._downButton.set_sensitive(True)
+            elif selected[0].get_indices() == [len(store)-1]:
+                self._upButton.set_sensitive(True)
+                self._downButton.set_sensitive(False)
+            else:
+                self._upButton.set_sensitive(True)
+                self._downButton.set_sensitive(True)
 
     def on_options_clicked(self, *args):
         self._switching_dialog.refresh()
 
-        with enlightbox(self.window, self._switching_dialog.window):
+        with self.main_window.enlightbox(self._switching_dialog.window):
             response = self._switching_dialog.run()
 
         if response != 1:
@@ -570,7 +609,7 @@ class KeyboardSpoke(NormalSpoke):
             try:
                 self._addLayout(self._store, layout)
                 valid_layouts += layout
-            except keyboard.XklWrapperError:
+            except XklWrapperError:
                 log.error("Failed to add layout '%s'", layout)
 
         if not valid_layouts:
diff --git a/anaconda/pyanaconda/ui/gui/spokes/langsupport.glade b/anaconda/pyanaconda/ui/gui/spokes/langsupport.glade
index 7d5e624..420cd56 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/langsupport.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/langsupport.glade
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.2"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="GtkListStore" id="languageStore">
     <columns>
       <!-- column-name nativeName -->
@@ -15,10 +16,20 @@
   <object class="GtkTreeModelFilter" id="languageStoreFilter">
     <property name="child_model">languageStore</property>
   </object>
+  <object class="GtkListStore" id="localeStore">
+    <columns>
+      <!-- column-name nativeName -->
+      <column type="gchararray"/>
+      <!-- column-name locale -->
+      <column type="gchararray"/>
+      <!-- column-name selected -->
+      <column type="gboolean"/>
+      <!-- column-name isAdditional -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
   <object class="AnacondaSpokeWindow" id="langsupportWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">LANGUAGE SUPPORT</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
@@ -28,7 +39,6 @@
         <property name="spacing">6</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
-            <property name="app_paintable">True</property>
             <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
@@ -63,7 +73,9 @@
                   <object class="GtkLabel" id="selectLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
+                    <property name="margin_left">36</property>
+                    <property name="margin_right">36</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Select additional language support to be installed:</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell 14"/>
@@ -81,11 +93,13 @@
                   <object class="GtkGrid" id="mainGrid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
+                    <property name="margin_left">36</property>
+                    <property name="margin_right">36</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">6</property>
+                    <property name="column_spacing">24</property>
+                    <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkScrolledWindow" id="languageWindow">
                         <property name="visible">True</property>
@@ -93,6 +107,7 @@
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">always</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="languageView">
@@ -110,6 +125,14 @@
                                 <signal name="changed" handler="on_lang_selection_changed" swapped="no"/>
                               </object>
                             </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="highlighted">
+                                <property name="title">highlighted</property>
+                                <child>
+                                  <object class="GtkCellRendererPixbuf" id="highlightedRenderer"/>
+                                </child>
+                              </object>
+                            </child>
                             <child>
                               <object class="GtkTreeViewColumn" id="nativeName">
                                 <property name="title" translatable="yes">nativeName</property>
@@ -118,7 +141,7 @@
                                 <property name="sort_column_id">0</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="nativeNameRenderer">
-                                    <property name="xalign">0.89999997615814209</property>
+                                    <property name="xalign">0.10000000149011612</property>
                                     <property name="font">Cantarell 12</property>
                                   </object>
                                   <attributes>
@@ -135,7 +158,7 @@
                                 <property name="sort_column_id">1</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="englishNameRenderer">
-                                    <property name="xalign">0.10000000149011612</property>
+                                    <property name="xalign">0.89999997615814209</property>
                                     <property name="font">Cantarell Italic 14</property>
                                     <property name="foreground">gray</property>
                                   </object>
@@ -159,8 +182,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -169,16 +190,14 @@
                         <property name="can_focus">True</property>
                         <property name="valign">start</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="secondary_icon_name">edit-clear-symbolic</property>
                         <property name="placeholder_text" translatable="yes">Type here to search.</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
+                        <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -212,8 +231,8 @@
                                     <signal name="toggled" handler="on_locale_toggled" swapped="no"/>
                                   </object>
                                   <attributes>
-                                    <attribute name="active">2</attribute>
                                     <attribute name="sensitive">3</attribute>
+                                    <attribute name="active">2</attribute>
                                   </attributes>
                                 </child>
                               </object>
@@ -240,8 +259,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -269,16 +286,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="localeStore">
-    <columns>
-      <!-- column-name nativeName -->
-      <column type="gchararray"/>
-      <!-- column-name locale -->
-      <column type="gchararray"/>
-      <!-- column-name selected -->
-      <column type="gboolean"/>
-      <!-- column-name isAdditional -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/langsupport.py b/anaconda/pyanaconda/ui/gui/spokes/langsupport.py
index 776791e..1ae5334 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/langsupport.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/langsupport.py
@@ -20,11 +20,12 @@
 #                    Vratislav Podzimek <vpodzime@redhat.com>
 #
 
-from gi.repository import Pango
+from gi.repository import Pango, Gdk
 from pyanaconda.flags import flags
-from pyanaconda.i18n import N_
+from pyanaconda.i18n import CN_
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui.categories.localization import LocalizationCategory
+from pyanaconda.ui.gui.utils import escape_markup, override_cell_property
+from pyanaconda.ui.categories.localization import LocalizationCategory
 from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
 from pyanaconda import localization
 
@@ -35,15 +36,22 @@ log = logging.getLogger("anaconda")
 
 __all__ = ["LangsupportSpoke"]
 
+# #fdfbc0
+# Sure would be nice if gdk_rgba_parse returned a new object instead of
+# modifying an existing one.
+_HIGHLIGHT_COLOR = Gdk.RGBA(red=0.992157, green=0.984314, blue=0.752941, alpha=1.0)
+
 class LangsupportSpoke(LangLocaleHandler, NormalSpoke):
     builderObjects = ["languageStore", "languageStoreFilter", "localeStore", "langsupportWindow"]
     mainWidgetName = "langsupportWindow"
+    focusWidgetName = "languageEntry"
     uiFile = "spokes/langsupport.glade"
+    helpFile = "LangSupportSpoke.xml"
 
     category = LocalizationCategory
 
     icon = "accessories-character-map-symbolic"
-    title = N_("_LANGUAGE SUPPORT")
+    title = CN_("GUI|Spoke", "_LANGUAGE SUPPORT")
 
     def __init__(self, *args, **kwargs):
         NormalSpoke.__init__(self, *args, **kwargs)
@@ -66,14 +74,27 @@ class LangsupportSpoke(LangLocaleHandler, NormalSpoke):
         # mark selected locales and languages with selected locales bold
         localeNativeColumn = self.builder.get_object("localeNativeName")
         localeNativeNameRenderer = self.builder.get_object("localeNativeNameRenderer")
-        localeNativeColumn.set_cell_data_func(localeNativeNameRenderer,
-                                              self._mark_selected_locale_bold)
+        override_cell_property(localeNativeColumn, localeNativeNameRenderer,
+                "weight", self._mark_selected_locale_bold)
 
         for col, rend in [("nativeName", "nativeNameRenderer"),
                           ("englishName", "englishNameRenderer")]:
             column = self.builder.get_object(col)
             renderer = self.builder.get_object(rend)
-            column.set_cell_data_func(renderer, self._mark_selected_language_bold)
+            override_cell_property(column, renderer, "weight", self._mark_selected_language_bold)
+
+        # If a language has selected locales, highlight every column so that
+        # the row appears highlighted
+        for col in self._langView.get_columns():
+            for rend in col.get_cells():
+                override_cell_property(col, rend, "cell-background-rgba",
+                        self._highlight_selected_language)
+
+        # and also set an icon so that we don't depend on a color to convey information
+        highlightedColumn = self.builder.get_object("highlighted")
+        highlightedRenderer = self.builder.get_object("highlightedRenderer")
+        override_cell_property(highlightedColumn, highlightedRenderer,
+                "icon-name", self._render_lang_highlighted)
 
     def apply(self):
         # store only additional langsupport locales
@@ -108,11 +129,14 @@ class LangsupportSpoke(LangLocaleHandler, NormalSpoke):
         return True
 
     def _add_language(self, store, native, english, lang):
-        native_span = '<span lang="%s">%s</span>' % (lang, native)
+        native_span = '<span lang="%s">%s</span>' % \
+                (escape_markup(lang), escape_markup(native))
         store.append([native_span, english, lang])
 
     def _add_locale(self, store, native, locale):
-        native_span = '<span lang="%s">%s</span>' % (re.sub(r'\..*', '', locale), native)
+        native_span = '<span lang="%s">%s</span>' % \
+                (escape_markup(re.sub(r'\..*', '', locale)),
+                 escape_markup(native))
 
         # native, locale, selected, additional
         store.append([native_span, locale, locale in self._selected_locales,
@@ -120,16 +144,31 @@ class LangsupportSpoke(LangLocaleHandler, NormalSpoke):
 
     def _mark_selected_locale_bold(self, column, renderer, model, itr, user_data=None):
         if model[itr][2]:
-            renderer.set_property("weight", Pango.Weight.BOLD.real)
+            return Pango.Weight.BOLD.real
         else:
-            renderer.set_property("weight", Pango.Weight.NORMAL.real)
+            return Pango.Weight.NORMAL.real
+
+    def _is_lang_selected(self, lang):
+        lang_locales = set(localization.get_language_locales(lang))
+        return not lang_locales.isdisjoint(self._selected_locales)
 
     def _mark_selected_language_bold(self, column, renderer, model, itr, user_data=None):
-        lang_locales = set(localization.get_language_locales(model[itr][2]))
-        if not lang_locales.isdisjoint(self._selected_locales):
-            renderer.set_property("weight", Pango.Weight.BOLD.real)
+        if self._is_lang_selected(model[itr][2]):
+            return Pango.Weight.BOLD.real
         else:
-            renderer.set_property("weight", Pango.Weight.NORMAL.real)
+            return Pango.Weight.NORMAL.real
+
+    def _highlight_selected_language(self, column, renderer, model, itr, user_data=None):
+        if self._is_lang_selected(model[itr][2]):
+            return _HIGHLIGHT_COLOR
+        else:
+            return None
+
+    def _render_lang_highlighted(self, column, renderer, model, itr, user_data=None):
+        if self._is_lang_selected(model[itr][2]):
+            return "emblem-ok-symbolic"
+        else:
+            return None
 
     # Signal handlers.
     def on_locale_toggled(self, renderer, path):
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/accordion.py b/anaconda/pyanaconda/ui/gui/spokes/lib/accordion.py
index 6a5067a..844f725 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -1,7 +1,7 @@
 # vim: set fileencoding=utf-8
 # Mountpoint selector accordion and page classes
 #
-# Copyright (C) 2012  Red Hat, Inc.
+# Copyright (C) 2012-2014 Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -20,23 +20,25 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
-from blivet.size import Size
 
 from pyanaconda.i18n import _
 from pyanaconda.product import productName, productVersion
+from pyanaconda.ui.gui.utils import escape_markup, really_hide, really_show
+from pyanaconda.constants import DEFAULT_AUTOPART_TYPE
+from pyanaconda.storage_utils import AUTOPART_CHOICES
 
 from gi.repository.AnacondaWidgets import MountpointSelector
 from gi.repository import Gtk
 
 __all__ = ["DATA_DEVICE", "SYSTEM_DEVICE",
-           "selectorFromDevice",
+           "newSelectorFromDevice", "updateSelectorFromDevice",
            "Accordion",
            "Page", "UnknownPage", "CreateNewPage"]
 
 DATA_DEVICE = 0
 SYSTEM_DEVICE = 1
 
-def selectorFromDevice(device, selector=None, mountpoint=""):
+def updateSelectorFromDevice(selector, device, mountpoint=""):
     """Create a MountpointSelector from a Device object template.  This
        method should be used whenever constructing a new selector, or when
        setting a bunch of attributes on an existing selector.  For just
@@ -58,17 +60,16 @@ def selectorFromDevice(device, selector=None, mountpoint=""):
     else:
         mp = _("Unknown")
 
-    size = Size(en_spec="%f MB" % device.size)
+    selector.props.name = device.name
+    selector.props.size = str(device.size)
+    selector.props.mountpoint = mp
+    selector.device = device
 
-    if not selector:
-        selector = MountpointSelector(device.name, str(size).upper(), mp)
-        selector._root = None
-    else:
-        selector.props.name = device.name
-        selector.props.size = str(size).upper()
-        selector.props.mountpoint = mp
+def newSelectorFromDevice(device, mountpoint=""):
+    selector = MountpointSelector(device.name, str(device.size))
+    selector._root = None
+    updateSelectorFromDevice(selector, device, mountpoint)
 
-    selector._device = device
     return selector
 
 # An Accordion is a box that goes on the left side of the custom partitioning spoke.  It
@@ -80,11 +81,10 @@ class Accordion(Gtk.Box):
         Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12)
         self._expanders = []
 
-    def addPage(self, contents, cb=None):
-        label = Gtk.Label()
-        label.set_markup("""<span size='large' weight='bold' fgcolor='black'>%s</span>""" % contents.pageTitle)
-        label.set_alignment(0, 0.5)
-        label.set_line_wrap(True)
+    def addPage(self, contents, cb):
+        label = Gtk.Label(label="""<span size='large' weight='bold' fgcolor='black'>%s</span>""" %
+                          escape_markup(contents.pageTitle), use_markup=True,
+                          xalign=0, yalign=0.5, wrap=True)
 
         expander = Gtk.Expander()
         expander.set_label_widget(label)
@@ -154,7 +154,11 @@ class Page(Gtk.Box):
 
         # Create the Data label and a box to store all its members in.
         self._dataBox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self._dataBox.add(self._make_category_label(_("DATA")))
+        self._dataLabel = self._make_category_label(_("DATA"))
+        really_hide(self._dataLabel)
+        self._dataBox.add(self._dataLabel)
+        self._dataBox.connect("add", self._onDataAdded)
+        self._dataBox.connect("remove", self._onDataRemoved)
         self.add(self._dataBox)
 
         # Create the System label and a box to store all its members in.
@@ -167,18 +171,21 @@ class Page(Gtk.Box):
 
     def _make_category_label(self, name):
         label = Gtk.Label()
-        label.set_markup("""<span fgcolor='dark grey' size='large' weight='bold'>%s</span>""" % name)
+        label.set_markup("""<span fgcolor='dark grey' size='large' weight='bold'>%s</span>""" %
+                escape_markup(name))
         label.set_halign(Gtk.Align.START)
         label.set_margin_left(24)
         return label
 
     def addSelector(self, device, cb, mountpoint=""):
-        selector = selectorFromDevice(device, mountpoint=mountpoint)
+        selector = newSelectorFromDevice(device, mountpoint=mountpoint)
         selector.connect("button-press-event", self._onSelectorClicked, cb)
         selector.connect("key-release-event", self._onSelectorClicked, cb)
+        selector.connect("focus-in-event", self._onSelectorFocusIn, cb)
         selector.set_margin_bottom(6)
         self.members.append(selector)
 
+        # pylint: disable=no-member
         if self._mountpointType(selector.props.mountpoint) == DATA_DEVICE:
             self._dataBox.add(selector)
         else:
@@ -215,16 +222,30 @@ class Page(Gtk.Box):
         # show the details for the newly selected object.
         cb(selector)
 
+    def _onSelectorFocusIn(self, selector, event, cb):
+        # could be simple lambda, but this way it looks more similar to the
+        # _onSelectorClicked
+        cb(selector)
+
+    def _onDataAdded(self, container, widget):
+        really_show(self._dataLabel)
+
+    def _onDataRemoved(self, container, widget):
+        # This runs before widget is removed from container, so if it's the last
+        # item then the container will still not be empty.
+        if len(container.get_children()) == 1:
+            really_hide(self._dataLabel)
+
 class UnknownPage(Page):
     def __init__(self, title):
         # For this type of page, there's only one place to store members.
-        # pylint: disable-msg=W0231
+        # pylint: disable=super-init-not-called,non-parent-init-called
         Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=6)
         self.members = []
         self.pageTitle = title
 
     def addSelector(self, device, cb, mountpoint=""):
-        selector = selectorFromDevice(device, mountpoint=mountpoint)
+        selector = newSelectorFromDevice(device, mountpoint=mountpoint)
         selector.connect("button-press-event", self._onSelectorClicked, cb)
         selector.connect("key-release-event", self._onSelectorClicked, cb)
 
@@ -242,8 +263,8 @@ class UnknownPage(Page):
 # of this class will be packed into the Accordion first and then when the new installation
 # is created, it will be removed and replaced with a Page for it.
 class CreateNewPage(Page):
-    def __init__(self, title, cb, partitionsToReuse=True):
-        # pylint: disable-msg=W0231
+    def __init__(self, title, createClickedCB, autopartTypeChangedCB, partitionsToReuse=True):
+        # pylint: disable=super-init-not-called,non-parent-init-called
         Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=6)
         self.members = []
         self.pageTitle = title
@@ -254,49 +275,67 @@ class CreateNewPage(Page):
         self._createBox.set_column_spacing(6)
         self._createBox.set_margin_left(16)
 
-        label = Gtk.Label(_("You haven't created any mount points for your "
+        label = Gtk.Label(label=_("You haven't created any mount points for your "
                             "%(product)s %(version)s installation yet.  "
-                            "You can:") % {"product" : productName, "version" : productVersion})
-        label.set_line_wrap(True)
-        label.set_alignment(0, 0.5)
+                            "You can:") % {"product" : productName, "version" : productVersion},
+                            wrap=True, xalign=0, yalign=0.5)
         self._createBox.attach(label, 0, 0, 2, 1)
 
-        dot = Gtk.Label("•")
-        dot.set_hexpand(False)
+        dot = Gtk.Label(label="•", xalign=0.5, yalign=0.4, hexpand=False)
         self._createBox.attach(dot, 0, 1, 1, 1)
 
-        self._createNewButton = Gtk.LinkButton("", label=_("_Click here to create them automatically."))
+        self._createNewButton = Gtk.LinkButton(uri="", label=_("_Click here to create them automatically."))
         label = self._createNewButton.get_children()[0]
         label.set_alignment(0, 0.5)
         label.set_hexpand(True)
         label.set_line_wrap(True)
         label.set_use_underline(True)
 
+        # Create this now to pass into the callback.  It will be populated later
+        # on in this method.
+        store = Gtk.ListStore(str, int)
+        combo = Gtk.ComboBox(model=store)
+        cellrendr = Gtk.CellRendererText()
+        combo.pack_start(cellrendr, True)
+        combo.add_attribute(cellrendr, "text", 0)
+        combo.connect("changed", autopartTypeChangedCB)
+
         self._createNewButton.set_has_tooltip(False)
         self._createNewButton.set_halign(Gtk.Align.START)
-        self._createNewButton.connect("clicked", cb)
+        self._createNewButton.connect("clicked", createClickedCB, combo)
         self._createNewButton.connect("activate-link", lambda *args: Gtk.true())
         self._createBox.attach(self._createNewButton, 1, 1, 1, 1)
 
-        dot = Gtk.Label("•")
-        dot.set_hexpand(False)
+        dot = Gtk.Label(label="•", xalign=0.5, yalign=0, hexpand=False)
         self._createBox.attach(dot, 0, 2, 1, 1)
 
-        label = Gtk.Label(_("Create new mount points by clicking the '+' button."))
-        label.set_alignment(0, 0.5)
-        label.set_hexpand(True)
-        label.set_line_wrap(True)
+        label = Gtk.Label(label=_("Create new mount points by clicking the '+' button."),
+                          xalign=0, yalign=0.5, hexpand=True, wrap=True)
         self._createBox.attach(label, 1, 2, 1, 1)
 
         if partitionsToReuse:
-            dot = Gtk.Label("•")
-            dot.set_hexpand(False)
+            dot = Gtk.Label(label="•", xalign=0.5, yalign=0, hexpand=False)
             self._createBox.attach(dot, 0, 3, 1, 1)
 
-            label = Gtk.Label(_("Or, assign new mount points to existing partitions after selecting them below."))
-            label.set_alignment(0, 0.5)
-            label.set_hexpand(True)
-            label.set_line_wrap(True)
+            label = Gtk.Label(label=_("Or, assign new mount points to existing "
+                                      "partitions after selecting them below."),
+                              xalign=0, yalign=0.5, hexpand=True, wrap=True)
             self._createBox.attach(label, 1, 3, 1, 1)
 
+        label = Gtk.Label(label=_("_New mount points will use the following partitioning scheme:"),
+                          xalign=0, yalign=0.5, wrap=True, use_underline=True)
+        self._createBox.attach(label, 0, 4, 2, 1)
+        label.set_mnemonic_widget(combo)
+
+        for item in (AUTOPART_CHOICES):
+            itr = store.append([_(item[0]), item[1]])
+            if item[1] == DEFAULT_AUTOPART_TYPE:
+                default = itr
+
+        combo.set_margin_left(18)
+        combo.set_margin_right(18)
+        combo.set_hexpand(False)
+        combo.set_active_iter(default)
+        self._createBox.attach(combo, 0, 5, 2, 1)
+
         self.add(self._createBox)
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/cart.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/cart.glade
index c257c78..819633c 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/cart.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/cart.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="disk_store">
     <columns>
       <!-- column-name isBootDisk -->
@@ -28,7 +29,6 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
-    <property name="mnemonics_visible">False</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -40,14 +40,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label" translatable="yes">_Close</property>
+                <property name="label" translatable="yes" context="GUI|Selected Disks Dialog">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="halign">end</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_close_clicked" swapped="no"/>
               </object>
@@ -98,19 +97,19 @@
                     <property name="can_focus">True</property>
                     <property name="model">disk_store</property>
                     <child internal-child="selection">
-                        <object class="GtkTreeSelection" id="disk_selection">
-                            <signal name="changed" handler="on_selection_changed" swapped="no"/>
-                        </object>
+                      <object class="GtkTreeSelection" id="disk_selection">
+                        <signal name="changed" handler="on_selection_changed" swapped="no"/>
+                      </object>
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="boot_column">
                         <property name="title" translatable="yes">Boot</property>
                         <child>
-                          <object class="GtkCellRendererPixbuf" id="boot_renderer">
-                            <property name="stock_id">gtk-apply</property>
+                          <object class="GtkCellRendererToggle" id="boot_renderer">
+                            <property name="activatable">False</property>
                           </object>
                           <attributes>
-                            <attribute name="visible">0</attribute>
+                            <attribute name="active">0</attribute>
                           </attributes>
                         </child>
                       </object>
@@ -181,12 +180,11 @@
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkButton" id="set_as_boot_button">
-                    <property name="label" translatable="yes">_Set as Boot Device</property>
+                    <property name="label" translatable="yes" context="GUI|Selected Disks Dialog">_Set as Boot Device</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_set_as_boot_clicked" swapped="no"/>
                   </object>
@@ -198,13 +196,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="remove_button">
-                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="label" translatable="yes" context="GUI|Selected Disks Dialog">_Remove</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="halign">start</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
                   </object>
@@ -227,7 +224,6 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Disk summary goes here</property>
-                <property name="use_markup">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/cart.py b/anaconda/pyanaconda/ui/gui/spokes/lib/cart.py
index b3a2ca5..fe0499d 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -22,9 +22,9 @@
 
 from gi.repository import Gtk
 
-from pyanaconda.i18n import _, P_
-from pyanaconda.ui.lib.disks import size_str
+from pyanaconda.i18n import C_, P_
 from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.utils import escape_markup
 from blivet.size import Size
 
 __all__ = ["SelectedDisksDialog"]
@@ -52,15 +52,15 @@ class SelectedDisksDialog(GUIObject):
         self._set_button = self.builder.get_object("set_as_boot_button")
         self._remove_button = self.builder.get_object("remove_button")
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def initialize(self, disks, free, showRemove=True, setBoot=True):
         self._previousID = None
 
         for disk in disks:
             self._store.append([False,
                                 "%s (%s)" % (disk.description, disk.serial),
-                                size_str(disk.size),
-                                size_str(free[disk.name][0]),
+                                str(disk.size),
+                                str(free[disk.name][0]),
                                 disk.name,
                                 disk.id])
         self.disks = disks[:]
@@ -97,7 +97,7 @@ class SelectedDisksDialog(GUIObject):
                 row[IS_BOOT_COL] = True
                 break
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def refresh(self, disks, free, showRemove=True, setBoot=True):
         super(SelectedDisksDialog, self).refresh()
 
@@ -120,21 +120,21 @@ class SelectedDisksDialog(GUIObject):
 
     def _update_summary(self):
         count = 0
-        size = 0
-        free = 0
+        size = Size(0)
+        free = Size(0)
         for row in self._store:
             count += 1
-            size += Size(spec=row[SIZE_COL])
-            free += Size(spec=row[FREE_SPACE_COL])
-
-        size = str(Size(bytes=long(size))).upper()
-        free = str(Size(bytes=long(free))).upper()
+            size += Size(row[SIZE_COL])
+            free += Size(row[FREE_SPACE_COL])
 
+        # pylint: disable=unescaped-markup
         text = P_("<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> "
                    "(unpartitioned and in filesystems)",
                   "<b>%(count)d disks; %(size)s capacity; %(free)s free space</b> "
                    "(unpartitioned and in filesystems)",
-                   count) % {"count" : count, "size" : size, "free" : free}
+                   count) % {"count" : count,
+                             "size" : escape_markup(size),
+                             "free" : escape_markup(free)}
         self._summary_label.set_markup(text)
 
     # signal handlers
@@ -186,9 +186,11 @@ class SelectedDisksDialog(GUIObject):
 
     def _toggle_button_text(self, row):
         if row[IS_BOOT_COL]:
-            self._set_button.set_label(_("_Do not install bootloader"))
+            self._set_button.set_label(C_("GUI|Selected Disks Dialog",
+                "_Do not install bootloader"))
         else:
-            self._set_button.set_label(_("_Set as Boot Device"))
+            self._set_button.set_label(C_("GUI|Selected Disks Dialog",
+                "_Set as Boot Device"))
 
     def on_selection_changed(self, *args):
         itr = self._selection.get_selected()[1]
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
new file mode 100644
index 0000000..e81ef3e
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
@@ -0,0 +1,942 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.2"/>
+  <object class="GtkDialog" id="confirmDeleteDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox2">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="deleteCancelButton">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Confirm Delete Dialog">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="deleteConfirmButton">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Confirm Delete Dialog">_Delete It</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_delete_confirm_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirmLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="yalign">0</property>
+            <property name="wrap">True</property>
+            <attributes>
+              <attribute name="font-desc" value="Cantarell 11"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="removeAllCheckbox">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">deleteCancelButton</action-widget>
+      <action-widget response="1">deleteConfirmButton</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="disk_store">
+    <columns>
+      <!-- column-name disk_col -->
+      <column type="gchararray"/>
+      <!-- column-name capacity_col -->
+      <column type="gchararray"/>
+      <!-- column-name free_col -->
+      <column type="gchararray"/>
+      <!-- column-name serial_col -->
+      <column type="gchararray"/>
+      <!-- column-name id_col -->
+      <column type="gint"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="disks_dialog">
+    <property name="width_request">400</property>
+    <property name="height_request">200</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox4">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure Dialog">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="select_button">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure Dialog">_Select</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_select_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="disk_selection_title_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">CONFIGURE MOUNT POINT</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Select one or more disks this device may reside on.</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">150</property>
+                <child>
+                  <object class="GtkTreeView" id="disk_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">disk_store</property>
+                    <property name="rubber_banding">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="disk_view_selection">
+                        <property name="mode">multiple</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="disk_column">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">Disk</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="disk_renderer"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="capacity_column">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">Capacity</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="capacity_renderer"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="free_column">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">Free</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="free_renderer"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="id_column">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">ID</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="id_renderer"/>
+                          <attributes>
+                            <attribute name="text">3</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">cancel_button</action-widget>
+      <action-widget response="1">select_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkEntryBuffer" id="mountPointEntryBuffer"/>
+  <object class="GtkListStore" id="mountPointStore">
+    <columns>
+      <!-- column-name path -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkEntryCompletion" id="mountPointCompletion">
+    <property name="model">mountPointStore</property>
+  </object>
+  <object class="GtkDialog" id="addDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="margin_top">24</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="addCancelButton">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Add Dialog">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">end</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="addConfirmButton">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Add Dialog">_Add mount point</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">end</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_add_confirm_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label7">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Add Dialog">_Desired Capacity:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">addSizeEntry</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Add Dialog">Mount _Point:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">addMountPointEntry</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label8">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_bottom">12</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ADD A NEW MOUNT POINT</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="scale" value="1.2"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label12">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_bottom">12</property>
+                <property name="label" translatable="yes">More customization options are available
+after creating the mount point below.</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 11"/>
+                  <attribute name="scale" value="1"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="addLabelWarningBox">
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkImage" id="image1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">dialog-warning</property>
+                    <property name="icon_size">2</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="mountPointWarningLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">That mount point is already in
+use.  Try something else?</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 10"/>
+                      <attribute name="scale" value="1"/>
+                      <attribute name="foreground" value="#ffff00000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="addSizeEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">eg: "20 GB", "500mb" (minus the quotation marks)</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="addMountPointEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_entry">True</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry" id="comboboxtext-entry">
+                    <property name="can_focus">True</property>
+                    <property name="buffer">mountPointEntryBuffer</property>
+                    <property name="completion">mountPointCompletion</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">addCancelButton</action-widget>
+      <action-widget response="1">addConfirmButton</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="raidLevelStore">
+    <columns>
+      <!-- column-name raidLevel -->
+      <column type="gchararray"/>
+      <!-- column-name canonRaidLevel -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+        <col id="1">none</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Single &lt;span foreground="grey"&gt;(No Redundancy, No Striping)&lt;/span&gt;</col>
+        <col id="1">single</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID0 &lt;span foreground="grey"&gt;(Performance)&lt;/span&gt;</col>
+        <col id="1">raid0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID1 &lt;span foreground="grey"&gt;(Redundancy)&lt;/span&gt;</col>
+        <col id="1">raid1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID4 &lt;span foreground="grey"&gt;(Error Checking)&lt;/span&gt;</col>
+        <col id="1">raid4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID5 &lt;span foreground="grey"&gt;(Distributed Error Checking)&lt;/span&gt;</col>
+        <col id="1">raid5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID6 &lt;span foreground="grey"&gt;(Redundant Error Checking)&lt;/span&gt;</col>
+        <col id="1">raid6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">RAID10 &lt;span foreground="grey"&gt;(Performance, Redundancy)&lt;/span&gt;</col>
+        <col id="1">raid10</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkTreeModelFilter" id="containerRaidStoreFiltered">
+    <property name="child_model">raidLevelStore</property>
+  </object>
+  <object class="GtkDialog" id="container_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox5">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area5">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="container_cancel_button">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Container Dialog">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="container_save_button">
+                <property name="label" translatable="yes" context="GUI|Custom Partitioning|Container Dialog">_Save</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_save_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="container_dialog_title_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">CONFIGURE CONTAINER</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="container_dialog_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Please create a name for this container and select at least one disk below.</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box11">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="nameLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="GUI|Custom Partitioning|Container Dialog">_Name:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">container_name_entry</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="container_name_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="height_request">150</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkTreeView" id="container_disk_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">disk_store</property>
+                    <property name="search_column">0</property>
+                    <property name="rubber_banding">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection3">
+                        <property name="mode">multiple</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="disk_column1">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">Disk</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="disk_renderer1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="capacity_column1">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">Capacity</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="capacity_renderer1"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="free_column1">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">Free</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="free_renderer1"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="id_column1">
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes">ID</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="id_renderer1"/>
+                          <attributes>
+                            <attribute name="text">3</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="containerRaidLevelLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">RAID Level:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="containerRaidLevelCombo">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">containerRaidStoreFiltered</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="containerRaidLevelRenderer"/>
+                      <attributes>
+                        <attribute name="markup">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="containerEncryptedCheckbox">
+                    <property name="label" translatable="yes">Encrypt</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="containerErrorBox">
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkImage" id="containerErrorImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">dialog-warning</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="containerErrorLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Please enter a valid name.</property>
+                    <property name="wrap">True</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 10"/>
+                      <attribute name="scale" value="1"/>
+                      <attribute name="foreground" value="#ffff00000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="containerSizeBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="containerSizeLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="GUI|Custom Partitioning|Container Dialog">Si_ze policy:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">containerSizeCombo</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="containerSizeCombo">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item translatable="yes">Automatic</item>
+                      <item translatable="yes">As large as possible</item>
+                      <item translatable="yes">Fixed</item>
+                    </items>
+                    <signal name="changed" handler="on_size_changed" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="containerSizeEntry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">6</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">container_cancel_button</action-widget>
+      <action-widget response="1">container_save_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/anaconda/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
new file mode 100644
index 0000000..5370a8b
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
@@ -0,0 +1,657 @@
+# vim: set fileencoding=utf-8
+#
+# Copyright (C) 2012-2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens@redhat.com>
+#                    David Lehman <dlehman@redhat.com>
+#                    Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+"""Helper functions and classes for custom partitioning."""
+
+__all__ = ["size_from_entry", "populate_mountpoint_store", "validate_label",
+           "validate_mountpoint", "get_raid_level",
+           "selectedRaidLevel", "raidLevelSelection",
+           "defaultRaidLevel", "requiresRaidSelection", "defaultContainerRaidLevel",
+           "containerRaidLevelsSupported", "raidLevelsSupported", "get_container_type_name",
+           "AddDialog", "ConfirmDeleteDialog", "DisksDialog", "ContainerDialog",
+           "HelpDialog"]
+
+import functools
+import re
+
+from pyanaconda.product import productName
+from pyanaconda.iutil import lowerASCII
+from pyanaconda.storage_utils import size_from_input
+from pyanaconda.ui.helpers import InputCheck
+from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.helpers import GUIDialogInputCheckHandler
+from pyanaconda.ui.gui.utils import fancy_set_sensitive, really_hide, really_show
+from pyanaconda.i18n import _, N_, C_
+
+from blivet.size import Size
+from blivet.platform import platform
+from blivet.formats import getFormat
+from blivet.devicefactory import SIZE_POLICY_AUTO
+from blivet.devicefactory import SIZE_POLICY_MAX
+from blivet.devicefactory import DEVICE_TYPE_LVM
+from blivet.devicefactory import DEVICE_TYPE_BTRFS
+from blivet.devicefactory import DEVICE_TYPE_LVM_THINP
+from blivet.devicefactory import DEVICE_TYPE_MD
+from blivet.devicefactory import get_supported_raid_levels
+from blivet.devicelibs import btrfs
+from blivet.devicelibs import mdraid
+from blivet.devicelibs import raid
+
+import logging
+log = logging.getLogger("anaconda")
+
+RAID_NOT_ENOUGH_DISKS = N_("The RAID level you have selected (%(level)s) "
+                           "requires more disks (%(min)d) than you "
+                           "currently have selected (%(count)d).")
+
+CONTAINER_DIALOG_TITLE = N_("CONFIGURE %(container_type)s")
+CONTAINER_DIALOG_TEXT = N_("Please create a name for this %(container_type)s "
+                           "and select at least one disk below.")
+
+CONTAINER_TYPE_NAMES = {DEVICE_TYPE_LVM: N_("Volume Group"),
+                        DEVICE_TYPE_LVM_THINP: N_("Volume Group"),
+                        DEVICE_TYPE_BTRFS: N_("Volume")}
+
+# These cannot be specified as mountpoints
+system_mountpoints = ["/dev", "/proc", "/run", "/sys"]
+
+def size_from_entry(entry):
+    size_text = entry.get_text().decode("utf-8").strip()
+    return size_from_input(size_text)
+
+def populate_mountpoint_store(store, used_mountpoints):
+    # sure, add whatever you want to this list. this is just a start.
+    paths = ["/", "/boot", "/home", "/var"] + \
+            platform.bootStage1ConstraintDict["mountpoints"]
+
+    # Sort the list now so all the real mountpoints go to the front, then
+    # add all the pseudo mountpoints we have.
+    paths.sort()
+    paths += ["swap"]
+
+    for fmt in ["appleboot", "biosboot", "prepboot"]:
+        if getFormat(fmt).supported:
+            paths += [fmt]
+
+    for path in paths:
+        if path not in used_mountpoints:
+            store.append([path])
+
+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.
+
+       In the case where the format can not 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.
+
+       :param str label: The label
+       :param DeviceFormat fmt: The device format to label
+
+    """
+    if fmt.exists:
+        return _("Can not relabel already existing filesystem.")
+    if not fmt.labeling():
+        if label == "":
+            return ""
+        else:
+            return _("Can not set label on filesystem.")
+    if not fmt.labelFormatOK(label):
+        return _("Unacceptable label format for filesystem.")
+    return ""
+
+def validate_mountpoint(mountpoint, used_mountpoints, strict=True):
+    if strict:
+        fake_mountpoints = []
+    else:
+        fake_mountpoints = ["swap", "biosboot", "prepboot"]
+
+    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.")
+    elif mountpoint in system_mountpoints:
+        return _("That mount point is invalid. Try something else?")
+    elif (lowerASCII(mountpoint) not in fake_mountpoints and
+          ((len(mountpoint) > 1 and mountpoint.endswith("/")) or
+           not mountpoint.startswith("/") or
+           " " in mountpoint or
+           re.search(r'/\.*/', mountpoint) or
+           re.search(r'/\.+$', mountpoint))):
+        # - does not end with '/' unless mountpoint _is_ '/'
+        # - starts with '/' except for "swap", &c
+        # - does not contain spaces
+        # - does not contain pairs of '/' enclosing zero or more '.'
+        # - does not end with '/' followed by one or more '.'
+        return _("That mount point is invalid. Try something else?")
+    else:
+        return ""
+
+def get_raid_level(device):
+    use_dev = device.raw_device
+
+    raid_level = None
+    if hasattr(use_dev, "level"):
+        raid_level = use_dev.level
+    elif hasattr(use_dev, "dataLevel"):
+        raid_level = use_dev.dataLevel
+    elif hasattr(use_dev, "volume"):
+        raid_level = use_dev.volume.dataLevel
+    elif hasattr(use_dev, "lvs") and len(use_dev.parents) == 1:
+        raid_level = get_raid_level(use_dev.parents[0])
+
+    return raid_level
+
+def selectedRaidLevel(raidLevelCombo):
+    """Interpret the selection of a RAID level combo box.
+
+       :returns: the selected raid level, None if none selected
+       :rtype: instance of blivet.devicelibs.raid.RaidLevel or NoneType
+    """
+    if not raidLevelCombo.get_property("visible"):
+        # the combo is hidden when raid level isn't applicable
+        return None
+
+    itr = raidLevelCombo.get_active_iter()
+    store = raidLevelCombo.get_model()
+
+    if not itr:
+        return
+
+    selected_level = store[itr][1]
+    if selected_level == "none":
+        return None
+    else:
+        return raid.getRaidLevel(selected_level)
+
+def raidLevelSelection(raid_level):
+    """ Returns a string corresponding to the RAID level.
+
+        :param raid_level: a raid level
+        :type raid_level: instance of blivet.devicelibs.raid.RAID or None
+        :returns: a string corresponding to this raid level
+        :rtype: str
+    """
+    return raid_level.name if raid_level else "none"
+
+def defaultRaidLevel(device_type):
+    """ Returns the default RAID level for this device type.
+
+        :param int device_type: an int representing the device_type
+        :returns: the default RAID level for this device type or None
+        :rtype: blivet.devicelibs.raid.RAIDLevel or NoneType
+    """
+    if device_type == DEVICE_TYPE_MD:
+        return mdraid.RAID_levels.raidLevel("raid1")
+
+    return None
+
+def defaultContainerRaidLevel(device_type):
+    """ Returns the default RAID level for this device type's container type.
+
+        :param int device_type: an int representing the device_type
+        :returns: the default RAID level for this device type's container or None
+        :rtype: blivet.devicelibs.raid.RAIDLevel or NoneType
+    """
+    if device_type == DEVICE_TYPE_BTRFS:
+        return btrfs.RAID_levels.raidLevel("single")
+
+    return None
+
+def requiresRaidSelection(device_type):
+    """ Whether GUI requires a RAID level be selected for this device type."""
+    return device_type == DEVICE_TYPE_MD
+
+def memoizer(f):
+    """ A simple decorator that memoizes by means of the shared default
+        value for cache in the result function.
+
+        :param f: a function of a single argument
+        :returns: a memoizing version of f
+    """
+    @functools.wraps(f)
+    def new_func(arg, cache={}):
+        # pylint: disable=dangerous-default-value
+        if arg in cache:
+            return cache[arg]
+
+        result = f(arg)
+        cache[arg] = result
+        return result
+
+    return new_func
+
+@memoizer
+def raidLevelsSupported(device_type):
+    """ The raid levels anaconda supports for this device type.
+
+        It supports any RAID levels that it expects to support and that blivet
+        supports for the given device type.
+
+        Since anaconda only ever allows the user to choose RAID levels for
+        device type DEVICE_TYPE_MD, hiding the RAID menu for all other device
+        types, the function only returns a non-empty set for this device type.
+        If this changes, then so should this function, but at this time it
+        is not clear what RAID levels should be offered for other device types.
+
+        :param int device_type: one of an enumeration of device types
+        :returns: a set of supported raid levels
+        :rtype: a set of instances of blivet.devicelibs.raid.RAIDLevel
+    """
+    if device_type == DEVICE_TYPE_MD:
+        supported = set(raid.RAIDLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10"]))
+    else:
+        supported = set()
+    return get_supported_raid_levels(device_type).intersection(supported)
+
+@memoizer
+def containerRaidLevelsSupported(device_type):
+    """ The raid levels anaconda supports for a container for this
+        device_type.
+
+        For LVM, anaconda supports LVM on RAID, but also allows no RAID.
+
+        :param int device_type: one of an enumeration of device types
+        :returns: a set of supported raid levels
+        :rtype: a set of instances of blivet.devicelibs.raid.RAIDLevel
+    """
+    if device_type in (DEVICE_TYPE_LVM, DEVICE_TYPE_LVM_THINP):
+        supported = set(raid.RAIDLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10"]))
+        return get_supported_raid_levels(DEVICE_TYPE_MD).intersection(supported).union(set([None]))
+    elif device_type == DEVICE_TYPE_BTRFS:
+        supported = set(raid.RAIDLevels(["raid0", "raid1", "raid10", "single"]))
+        return get_supported_raid_levels(DEVICE_TYPE_BTRFS).intersection(supported)
+    return set()
+
+def get_container_type_name(device_type):
+    return CONTAINER_TYPE_NAMES.get(device_type, _("container"))
+
+class AddDialog(GUIObject):
+    builderObjects = ["addDialog", "mountPointStore", "mountPointCompletion", "mountPointEntryBuffer"]
+    mainWidgetName = "addDialog"
+    uiFile = "spokes/lib/custom_storage_helpers.glade"
+
+    def __init__(self, *args, **kwargs):
+        self.mountpoints = kwargs.pop("mountpoints", [])
+        GUIObject.__init__(self, *args, **kwargs)
+        self.size = Size(0)
+        self.mountpoint = ""
+        self._error = False
+
+        store = self.builder.get_object("mountPointStore")
+        populate_mountpoint_store(store, self.mountpoints)
+        self.builder.get_object("addMountPointEntry").set_model(store)
+
+        completion = self.builder.get_object("mountPointCompletion")
+        completion.set_text_column(0)
+        completion.set_popup_completion(True)
+
+        self._warningLabel = self.builder.get_object("mountPointWarningLabel")
+
+    def on_add_confirm_clicked(self, button, *args):
+        self.mountpoint = self.builder.get_object("addMountPointEntry").get_active_text()
+        self._error = validate_mountpoint(self.mountpoint, self.mountpoints,
+                                          strict=False)
+        self._warningLabel.set_text(self._error)
+        self.window.show_all()
+        if self._error:
+            return
+
+        self.size = size_from_entry(self.builder.get_object("addSizeEntry"))
+        self.window.destroy()
+
+    def refresh(self):
+        GUIObject.refresh(self)
+        self._warningLabel.set_text("")
+
+    def run(self):
+        while True:
+            self._error = None
+            rc = self.window.run()
+            if not self._error:
+                return rc
+
+class ConfirmDeleteDialog(GUIObject):
+    builderObjects = ["confirmDeleteDialog"]
+    mainWidgetName = "confirmDeleteDialog"
+    uiFile = "spokes/lib/custom_storage_helpers.glade"
+
+    def __init__(self, *args, **kwargs):
+        GUIObject.__init__(self, *args, **kwargs)
+        self._removeAll = self.builder.get_object("removeAllCheckbox")
+
+    @property
+    def deleteAll(self):
+        return self._removeAll.get_active()
+
+    def on_delete_confirm_clicked(self, button, *args):
+        self.window.destroy()
+
+    # pylint: disable=arguments-differ
+    def refresh(self, mountpoint, device, rootName, snapshots=False):
+        GUIObject.refresh(self)
+        label = self.builder.get_object("confirmLabel")
+
+        if rootName and "_" in rootName:
+            rootName = rootName.replace("_", "__")
+        self._removeAll.set_label(
+                C_("GUI|Custom Partitioning|Confirm Delete Dialog",
+                    "Delete _all other filesystems in the %s root as well.")
+                % rootName)
+        self._removeAll.set_sensitive(rootName is not None)
+
+        if mountpoint:
+            txt = "%s (%s)" % (mountpoint, device)
+        else:
+            txt = device
+
+        if not snapshots:
+            label_text = _("Are you sure you want to delete all of the data on %s?") % txt
+        else:
+            label_text = _("Are you sure you want to delete all of the data on %s, including snapshots and/or subvolumes?") % txt
+
+        label.set_text(label_text)
+
+    def run(self):
+        return self.window.run()
+
+class DisksDialog(GUIObject):
+    builderObjects = ["disks_dialog", "disk_store", "disk_view"]
+    mainWidgetName = "disks_dialog"
+    uiFile = "spokes/lib/custom_storage_helpers.glade"
+
+    def __init__(self, *args, **kwargs):
+        self._disks = kwargs.pop("disks")
+        free = kwargs.pop("free")
+        self.selected = kwargs.pop("selected")[:]
+        GUIObject.__init__(self, *args, **kwargs)
+        self._store = self.builder.get_object("disk_store")
+        # populate the store
+        for disk in self._disks:
+            self._store.append([disk.description,
+                                str(disk.size),
+                                str(free[disk.name][0]),
+                                disk.serial,
+                                disk.id])
+
+        treeview = self.builder.get_object("disk_view")
+        model = treeview.get_model()
+        itr = model.get_iter_first()
+        selected_ids = [d.id for d in self.selected]
+        selection = treeview.get_selection()
+        while itr:
+            disk_id = model.get_value(itr, 4)
+            if disk_id in selected_ids:
+                selection.select_iter(itr)
+
+            itr = model.iter_next(itr)
+
+    def on_cancel_clicked(self, button):
+        self.window.destroy()
+
+    def _get_disk_by_id(self, disk_id):
+        for disk in self._disks:
+            if disk.id == disk_id:
+                return disk
+
+    def on_select_clicked(self, button):
+        treeview = self.builder.get_object("disk_view")
+        model, paths = treeview.get_selection().get_selected_rows()
+        self.selected = []
+        for path in paths:
+            itr = model.get_iter(path)
+            disk_id = model.get_value(itr, 4)
+            self.selected.append(self._get_disk_by_id(disk_id))
+
+        self.window.destroy()
+
+    def run(self):
+        return self.window.run()
+
+class ContainerDialog(GUIObject, GUIDialogInputCheckHandler):
+    builderObjects = ["container_dialog", "disk_store", "container_disk_view",
+                      "containerRaidStoreFiltered", "containerRaidLevelLabel",
+                      "containerRaidLevelCombo", "raidLevelStore",
+                      "containerSizeCombo", "containerSizeEntry",
+                      "containerSizeLabel", "containerEncryptedCheckbox"]
+    mainWidgetName = "container_dialog"
+    uiFile = "spokes/lib/custom_storage_helpers.glade"
+
+    def __init__(self, *args, **kwargs):
+        GUIDialogInputCheckHandler.__init__(self)
+
+        # these are all absolutely required. not getting them is fatal.
+        self._disks = kwargs.pop("disks")
+        free = kwargs.pop("free")
+        self.selected = kwargs.pop("selected")[:]
+        self.name = kwargs.pop("name") or "" # make sure it's a string
+        self.device_type = kwargs.pop("device_type")
+        self.storage = kwargs.pop("storage")
+
+        # these are less critical
+        self.raid_level = kwargs.pop("raid_level", None) or None # not ""
+        self.encrypted = kwargs.pop("encrypted", False)
+        self.exists = kwargs.pop("exists", False)
+
+        self.size_policy = kwargs.pop("size_policy", SIZE_POLICY_AUTO)
+        self.size = kwargs.pop("size", Size(0))
+
+        self._error = None
+        GUIObject.__init__(self, *args, **kwargs)
+
+        self._grabObjects()
+
+        # set up the dialog labels with device-type-specific text
+        container_type = get_container_type_name(self.device_type)
+        title_text = _(CONTAINER_DIALOG_TITLE) % {"container_type": container_type.upper()}
+        self._title_label.set_text(title_text)
+
+        dialog_text = _(CONTAINER_DIALOG_TEXT) % {"container_type": container_type.lower()}
+        self._dialog_label.set_text(dialog_text)
+
+        # populate the dialog widgets
+        self._name_entry.set_text(self.name)
+
+        # populate the store
+        for disk in self._disks:
+            self._store.append([disk.description,
+                                str(disk.size),
+                                str(free[disk.name][0]),
+                                disk.serial,
+                                disk.id])
+
+        model = self._treeview.get_model()
+        itr = model.get_iter_first()
+
+        selected_ids = [d.id for d in self.selected]
+        selection = self._treeview.get_selection()
+        while itr:
+            disk_id = model.get_value(itr, 4)
+            if disk_id in selected_ids:
+                selection.select_iter(itr)
+
+            itr = model.iter_next(itr)
+
+        # XXX how will this be related to the device encryption setting?
+        self._encryptCheckbutton.set_active(self.encrypted)
+
+        # set up the raid level combo
+        # XXX how will this be related to the device raid level setting?
+        self._raidStoreFilter.set_visible_func(self._raid_level_visible)
+        self._raidStoreFilter.refilter()
+        self._populate_raid()
+
+        self._original_size = self.size
+        self._original_size_text = self.size.humanReadable(max_places=None)
+        self._sizeEntry.set_text(self._original_size_text)
+        if self.size_policy == SIZE_POLICY_AUTO:
+            self._sizeCombo.set_active(0)
+        elif self.size_policy == SIZE_POLICY_MAX:
+            self._sizeCombo.set_active(1)
+        else:
+            self._sizeCombo.set_active(2)
+
+        if self.exists:
+            fancy_set_sensitive(self._name_entry, False)
+            self._treeview.set_sensitive(False)
+            fancy_set_sensitive(self._encryptCheckbutton, False)
+            fancy_set_sensitive(self._sizeCombo, False)
+            self._sizeEntry.set_sensitive(False)
+
+        # Check that the container name configured is valid
+        self.add_check(self._name_entry, self._checkNameEntry)
+
+    def _grabObjects(self):
+        self._title_label = self.builder.get_object("container_dialog_title_label")
+        self._dialog_label = self.builder.get_object("container_dialog_label")
+        self._error_label = self.builder.get_object("containerErrorLabel")
+
+        self._name_entry = self.builder.get_object("container_name_entry")
+
+        self._encryptCheckbutton = self.builder.get_object("containerEncryptedCheckbox")
+        self._raidStoreFilter = self.builder.get_object("containerRaidStoreFiltered")
+
+        self._store = self.builder.get_object("disk_store")
+        self._treeview = self.builder.get_object("container_disk_view")
+
+        self._sizeCombo = self.builder.get_object("containerSizeCombo")
+        self._sizeEntry = self.builder.get_object("containerSizeEntry")
+
+        self._raidLevelCombo = self.builder.get_object("containerRaidLevelCombo")
+        self._raidLevelLabel = self.builder.get_object("containerRaidLevelLabel")
+
+        self._save_button = self.builder.get_object("container_save_button")
+
+    def _get_disk_by_id(self, disk_id):
+        for disk in self._disks:
+            if disk.id == disk_id:
+                return disk
+
+    def on_save_clicked(self, button):
+        if self.exists:
+            self.window.destroy()
+            return
+
+        model, paths = self._treeview.get_selection().get_selected_rows()
+
+        raid_level = selectedRaidLevel(self._raidLevelCombo)
+        if raid_level:
+            min_disks = raid_level.min_members
+            if len(paths) < min_disks:
+                self._error = (_(RAID_NOT_ENOUGH_DISKS) % {"level" : raid_level,
+                                                           "min" : min_disks,
+                                                           "count" : len(paths)})
+                self._error_label.set_text(self._error)
+                self.window.show_all()
+                return
+
+        idx = self._sizeCombo.get_active()
+        if idx == 0:
+            size = SIZE_POLICY_AUTO
+        elif idx == 1:
+            size = SIZE_POLICY_MAX
+        elif idx == 2:
+            if self._original_size_text != self._sizeEntry.get_text():
+                size = size_from_entry(self._sizeEntry)
+                if size is None:
+                    size = SIZE_POLICY_MAX
+            else:
+                size = self._original_size
+
+        # now save the changes
+
+        self.selected = []
+        for path in paths:
+            itr = model.get_iter(path)
+            disk_id = model.get_value(itr, 4)
+            self.selected.append(self._get_disk_by_id(disk_id))
+
+        self.name = self._name_entry.get_text().strip()
+        self.raid_level = raid_level
+        self.encrypted = self._encryptCheckbutton.get_active()
+        self.size_policy = size
+
+        self._error_label.set_text("")
+        self.window.destroy()
+
+    def run(self):
+        while True:
+            self._error = None
+            rc = self.window.run()
+            if not self._error:
+                return rc
+
+    def on_size_changed(self, combo):
+        active_index = combo.get_active()
+        if active_index == 0:
+            self._sizeEntry.set_sensitive(False)
+        elif active_index == 1:
+            self._sizeEntry.set_sensitive(False)
+        else:
+            self._sizeEntry.set_sensitive(True)
+
+
+    def _raid_level_visible(self, model, itr, user_data):
+        raid_level_str = model[itr][1]
+        raid_level = raid.getRaidLevel(raid_level_str) if raid_level_str != "none" else None
+        return raid_level in containerRaidLevelsSupported(self.device_type)
+
+    def _populate_raid(self):
+        """ Set up the raid-specific portion of the device details.
+
+            Hide the RAID level menu if this device type does not support RAID.
+            Choose a default RAID level.
+        """
+        if not containerRaidLevelsSupported(self.device_type):
+            map(really_hide, [self._raidLevelLabel, self._raidLevelCombo])
+            return
+
+        raid_level = self.raid_level or defaultContainerRaidLevel(self.device_type)
+        raid_level_name = raidLevelSelection(raid_level)
+
+        # Set a default RAID level in the combo.
+        for (i, row) in enumerate(self._raidLevelCombo.get_model()):
+            log.debug("container dialog: raid level %s", row[1])
+            if row[1] == raid_level_name:
+                self._raidLevelCombo.set_active(i)
+                break
+
+        map(really_show, [self._raidLevelLabel, self._raidLevelCombo])
+        fancy_set_sensitive(self._raidLevelCombo, not self.exists)
+
+    def _checkNameEntry(self, inputcheck):
+        container_name = self.get_input(inputcheck.input_obj).strip()
+
+        # Check that the container name is valid
+        safename = self.storage.safeDeviceName(container_name)
+        if container_name != safename:
+            return _("Invalid container name")
+
+        return InputCheck.CHECK_OK
+
+    def set_status(self, inputcheck):
+        # Use the superclass set_status to set the error message
+        GUIDialogInputCheckHandler.set_status(self, inputcheck)
+
+        # Change the sensitivity of the Save button
+        self._save_button.set_sensitive(next(self.failed_checks, None) == None)
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
new file mode 100644
index 0000000..d5280c3
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.6"/>
+  <object class="GtkDialog" id="unformattedDasdDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">UNFORMATTED DASDS</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="udCancelButton">
+                <property name="label" translatable="yes" context="GUI|DAD Format Dialog">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="udOKButton">
+                <property name="label" translatable="yes" context="GUI|DAD Format Dialog">_OK</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="ud-grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">12</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="unformattedDasdDesc">
+                <property name="width_request">300</property>
+                <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="wrap">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 12"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="unformattedDasdTitle">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="label" translatable="yes">Unformatted DASDs Detected</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell Bold 12"/>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="udLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">List unformatted DASDs here.</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="warningBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkImage" id="warnIcon">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">dialog-warning</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Warning&lt;/b&gt;: All storage changes made using the installer will be lost when you choose to format.</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook" id="formatNotebook">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="show_tabs">False</property>
+            <child>
+              <object class="GtkButton" id="formatButton">
+                <property name="label" translatable="yes" context="GUI|DAD Format Dialog">_Format with dasdfmt</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_format_clicked" swapped="no"/>
+              </object>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkGrid" id="formatBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="row_spacing">18</property>
+                <property name="column_spacing">6</property>
+                <child>
+                  <object class="GtkSpinner" id="spinner4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="active">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="formatLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">Current DASD being formatted.</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="returnToHubLabel1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">You may &lt;a href=""&gt;go back to the main menu&lt;/a&gt; to complete other
+installation options while formatting completes.</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                    <property name="track_visited_links">False</property>
+                    <signal name="activate-link" handler="return_to_hub_link_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkGrid" id="formatDoneBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label18">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Disk formatting complete.</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label19">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Pressing 'OK' below will take you to the disk selection screen where you will need to re-select your disks.</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="image3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">emblem-ok-symbolic</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="height">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">udCancelButton</action-widget>
+      <action-widget response="1">udOKButton</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/dasdfmt.py b/anaconda/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
new file mode 100644
index 0000000..1b94705
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
@@ -0,0 +1,133 @@
+# DASD format dialog
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Samantha N. Bueno <sbueno@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
+#
+
+from pyanaconda.threads import threadMgr, AnacondaThread
+from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.utils import gtk_action_wait, gtk_call_once
+from pyanaconda import constants
+from pyanaconda.i18n import _
+import threading
+
+from blivet.devicelibs.dasd import format_dasd
+from blivet.errors import DasdFormatError
+
+import logging
+log = logging.getLogger("anaconda")
+
+__all__ = ["DasdFormatDialog"]
+
+class DasdFormatDialog(GUIObject):
+    builderObjects = ["unformattedDasdDialog"]
+    mainWidgetName = "unformattedDasdDialog"
+    uiFile = "spokes/lib/dasdfmt.glade"
+
+    def __init__(self, data, storage, to_format):
+        GUIObject.__init__(self, data)
+
+        self.storage = storage
+        self.to_format = to_format
+
+        self._notebook = self.builder.get_object("formatNotebook")
+        self._cancel_button = self.builder.get_object("udCancelButton")
+        self._ok_button = self.builder.get_object("udOKButton")
+        self._unformatted_label = self.builder.get_object("udLabel")
+        self._formatting_label = self.builder.get_object("formatLabel")
+        self._warn_box = self.builder.get_object("warningBox")
+        self._hub_label = self.builder.get_object("returnToHubLabel1")
+
+        if len(self.to_format) > 0:
+            self._unformatted_label.set_text("\n".join("/dev/" + d for d in to_format))
+        else:
+            self._unformatted_label.set_text("")
+
+        # epoch is only increased when user interrupts action to return to hub
+        self._epoch = 0
+        self._epoch_lock = threading.Lock()
+
+    def run(self):
+        rc = self.window.run()
+        with self._epoch_lock:
+            # Destroy window with epoch lock so we don't accidentally end
+            # formatting
+            self.window.destroy()
+            if rc == 2:
+                # User clicked uri to return to hub. We need to catch this here so
+                # that we can halt all further dialog actions
+                self._epoch += 1
+        return rc
+
+    def return_to_hub_link_clicked(self, label, uri):
+        """
+        The user clicked on the link that takes them back to the hub.  We need
+        to kill the _check_format watcher and then emit a special response ID
+        indicating the user did not press OK.
+
+        NOTE: There is no button with response_id=2.
+        """
+        self.window.response(2)
+
+    def run_dasdfmt(self, epoch_started, *args):
+        """ Loop through our disks and run dasdfmt against them. """
+        for disk in self.to_format:
+            try:
+                gtk_call_once(self._formatting_label.set_text, _("Formatting /dev/%s. This may take a moment.") % disk)
+                format_dasd(disk)
+            except DasdFormatError as err:
+                # Log errors if formatting fails, but don't halt the installer
+                log.error(str(err))
+                continue
+
+        with self._epoch_lock:
+            self.update_dialog(epoch_started)
+
+    def on_format_clicked(self, *args):
+        """
+        Once the format button is clicked, the option to cancel expires.
+        We also need to display the spinner showing activity.
+        """
+        self._cancel_button.set_sensitive(False)
+        self._ok_button.set_sensitive(False)
+        self._notebook.set_current_page(1)
+
+        # Loop through all of our unformatted DASDs and format them
+        threadMgr.add(AnacondaThread(name=constants.THREAD_DASDFMT,
+                                target=self.run_dasdfmt, args=(self._epoch,)))
+
+    @gtk_action_wait
+    def update_dialog(self, epoch_started):
+        """
+        This optionally updates the Gtk dialog box, assuming the user has not
+        clicked to return back to the summary hub.
+        """
+        if epoch_started == self._epoch:
+            # we only want to change anything on the dialog if we are in the
+            # same epoch as it is; the only time we should not be running these
+            # commands is if a user clicks return_to_hub
+            self._notebook.set_current_page(2)
+            self._cancel_button.set_sensitive(False)
+            self._ok_button.set_sensitive(True)
+
+            # Seems a little silly to have some of this text still displayed
+            # when everything is done.
+            self._unformatted_label.set_text("")
+            self._hub_label.set_text("")
+            self._warn_box.set_visible(False)
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.glade
index 964475e..41eae01 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="detailedTextBuffer"/>
   <object class="GtkDialog" id="detailedErrorDialog">
     <property name="height_request">350</property>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.py b/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.py
index 613fef8..f8082f4 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/detailederror.py
@@ -19,7 +19,7 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
-from pyanaconda.i18n import _
+from pyanaconda.i18n import C_
 from pyanaconda.ui.gui import GUIObject
 
 __all__ = ["DetailedErrorDialog"]
@@ -46,7 +46,7 @@ class DetailedErrorDialog(GUIObject):
         GUIObject.__init__(self, *args, **kwargs)
 
         if not buttons:
-            widget = self.window.add_button(_("_Cancel"), 0)
+            widget = self.window.add_button(C_("GUI|Detailed Error Dialog", "_Cancel"), 0)
         else:
             buttonbox = self.builder.get_object("detailedButtonBox")
             i = 0
@@ -56,7 +56,7 @@ class DetailedErrorDialog(GUIObject):
 
                 # Quit buttons should always appear left-most, unless it's the
                 # only button.  Then it should appear on the right.
-                if button == _("_Quit") and len(buttons) > 1:
+                if button == C_("GUI|Detailed Error Dialog", "_Quit") and len(buttons) > 1:
                     buttonbox.set_child_secondary(widget, True)
 
                 i += 1
@@ -67,7 +67,7 @@ class DetailedErrorDialog(GUIObject):
         if label:
             self.builder.get_object("detailedLabel").set_text(label)
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def refresh(self, msg):
         buf = self.builder.get_object("detailedTextBuffer")
         buf.set_text(msg, -1)
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade
new file mode 100644
index 0000000..3cb530e
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="entropyDialog">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">etched-out</property>
+        <child>
+          <object class="GtkBox" id="mainBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">6</property>
+            <property name="margin_right">6</property>
+            <property name="margin_top">6</property>
+            <property name="margin_bottom">6</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">3</property>
+            <child>
+              <object class="GtkLabel" id="messageLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="vexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">The system needs better quality of random data, you can improve it by typing randomly on keyboard and moving your mouse. The installation will continue automatically regardless of random data quality when time runs out.</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">60</property>
+                <property name="max_width_chars">60</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="headerLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="vexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Random data quality:</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">60</property>
+                <property name="max_width_chars">60</property>
+                <property name="margin_top">3</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="progressBar">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="show_text">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/entropy_dialog.py b/anaconda/pyanaconda/ui/gui/spokes/lib/entropy_dialog.py
new file mode 100644
index 0000000..df9d866
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/entropy_dialog.py
@@ -0,0 +1,98 @@
+# Dialog for waiting for enough random data entropy
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+import time
+import math
+
+from gi.repository import Gtk, GLib
+
+from pyanaconda.i18n import P_
+from pyanaconda.constants import MAX_ENTROPY_WAIT
+from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.utils import gtk_action_wait
+from blivet.util import get_current_entropy
+
+__all__ = ["run_entropy_dialog"]
+
+# in milliseconds
+LOOP_TIMEOUT = 250
+
+@gtk_action_wait
+def run_entropy_dialog(ksdata, desired_entropy):
+    """Show dialog with waiting for entropy"""
+
+    dialog = EntropyDialog(ksdata, desired_entropy)
+    dialog.run()
+
+    return dialog.force_cont
+
+class EntropyDialog(GUIObject):
+    builderObjects = ["entropyDialog"]
+    mainWidgetName = "entropyDialog"
+    uiFile = "spokes/lib/entropy_dialog.glade"
+
+    def __init__(self, data, desired_entropy):
+        GUIObject.__init__(self, data)
+        self._desired_entropy = desired_entropy
+        self._progress_bar = self.builder.get_object("progressBar")
+        self._terminate = False
+        self._started = 0
+        self.force_cont = False
+        self._num_loops = 0
+
+    def run(self):
+        self.window.show_all()
+
+        # XXX: Is it better to rely on Gtk running the self._update_progress
+        # method every ~250msec or rely on NTP not changing system time right
+        # now and use time.time()?
+        self._num_loops = 0
+        GLib.timeout_add(LOOP_TIMEOUT, self._update_progress)
+        Gtk.main()
+        self.window.destroy()
+
+    def _update_progress(self):
+        if self._terminate:
+            # give users time to realize they should stop typing
+            time.sleep(3)
+            Gtk.main_quit()
+            # remove the method from idle queue
+            return False
+        else:
+            self._num_loops += 1
+            current_entropy = get_current_entropy()
+            current_fraction = min(float(current_entropy) / self._desired_entropy, 1.0)
+            remaining = (MAX_ENTROPY_WAIT * 1000 - self._num_loops * LOOP_TIMEOUT) / 1000 / 60.0
+
+            self._progress_bar.set_fraction(current_fraction)
+            self._progress_bar.set_text("%(pct)d %% (%(rem)d %(min)s remaining)" % {"pct": (int(current_fraction * 100)),
+                                                                                    "rem": math.ceil(remaining),
+                                                                                    "min": P_("minute", "minutes", int(remaining))})
+
+            # if we have enough our time ran out, terminate the dialog, but let
+            # the progress_bar refresh in the main loop
+            self._terminate = (current_entropy >= self._desired_entropy) or (remaining <= 0)
+
+            self.force_cont = (remaining <= 0)
+
+            # keep updating
+            return True
+
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py b/anaconda/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py
index ee4921b..1874647 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py
@@ -24,10 +24,11 @@ screens handling languages or locales configuration.
 
 """
 
+import os
 from gi.repository import Gtk, Pango
 from pyanaconda import localization
 from pyanaconda.iutil import strip_accents
-from pyanaconda.ui.gui.utils import set_treeview_selection, get_default_widget_direction, timed_action
+from pyanaconda.ui.gui.utils import set_treeview_selection, timed_action, override_cell_property
 
 class LangLocaleHandler(object):
     """
@@ -54,12 +55,11 @@ class LangLocaleHandler(object):
 
     def initialize(self):
         # Render an arrow for the chosen language
-        if get_default_widget_direction() == Gtk.TextDirection.LTR:
-            self._arrow = Gtk.Image.new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png")
-        else:
-            self._arrow = Gtk.Image.new_from_file("/usr/share/anaconda/pixmaps/left-arrow-icon.png")
-        self._langSelectedColumn.set_cell_data_func(self._langSelectedRenderer,
-                                                    self._render_lang_selected)
+        datadir = os.environ.get("ANACONDA_WIDGETS_DATADIR", "/usr/share/anaconda")
+        self._right_arrow = Gtk.Image.new_from_file(os.path.join(datadir, "pixmaps", "right-arrow-icon.png"))
+        self._left_arrow = Gtk.Image.new_from_file(os.path.join(datadir, "pixmaps", "left-arrow-icon.png"))
+        override_cell_property(self._langSelectedColumn, self._langSelectedRenderer,
+                               "pixbuf", self._render_lang_selected)
 
         # fill the list with available translations
         for lang in localization.get_available_translations():
@@ -95,10 +95,15 @@ class LangLocaleHandler(object):
     def _render_lang_selected(self, column, renderer, model, itr, user_data=None):
         (lang_store, sel_itr) = self._langSelection.get_selected()
 
-        if sel_itr and lang_store[sel_itr][2] == model[itr][2]:
-            renderer.set_property("pixbuf", self._arrow.get_pixbuf())
+        if Gtk.get_locale_direction() == Gtk.TextDirection.LTR:
+            _arrow = self._right_arrow
         else:
-            renderer.set_property("pixbuf", None)
+            _arrow = self._left_arrow
+
+        if sel_itr and lang_store[sel_itr][2] == model[itr][2]:
+            return _arrow.get_pixbuf()
+        else:
+            return None
 
     def _add_language(self, store, native, english, lang):
         """Override this method with a valid implementation"""
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.glade
index 731019a..57e4870 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.glade
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires AnacondaWidgets 1.0 -->
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.6"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="GtkDialog" id="passphrase_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
+    <property name="default_width">600</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
     <child internal-child="vbox">
@@ -12,35 +14,18 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="passphrase_dialog_title_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="ypad">1</property>
-            <property name="label" translatable="yes">DISK ENCRYPTION PASSPHRASE</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="passphrase_cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Passphrase Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="halign">end</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -50,9 +35,10 @@
             </child>
             <child>
               <object class="GtkButton" id="passphrase_save_button">
-                <property name="label" translatable="yes">_Save Passphrase</property>
+                <property name="label" translatable="yes" context="GUI|Passphrase Dialog">_Save Passphrase</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_save_clicked" swapped="no"/>
@@ -71,6 +57,23 @@
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel" id="passphrase_dialog_title_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="ypad">1</property>
+            <property name="label" translatable="yes">DISK ENCRYPTION PASSPHRASE</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkLabel" id="passphrase_description_label">
             <property name="visible">True</property>
@@ -97,15 +100,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Passphrase:</property>
+                <property name="label" translatable="yes" context="GUI|Passphrase Dialog">_Passphrase:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">passphrase_entry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -115,15 +116,12 @@
                 <property name="visibility">False</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">32</property>
-                <signal name="changed" handler="on_passphrase_changed" swapped="no"/>
-                <signal name="focus-out-event" handler="on_passphrase_editing_done" swapped="no"/>
                 <signal name="activate" handler="on_entry_activated" swapped="no"/>
+                <signal name="changed" handler="on_passphrase_changed" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -131,33 +129,27 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Confirm:</property>
+                <property name="label" translatable="yes" context="GUI|Passphrase Dialog">Con_firm:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">confirm_entry</property>
+                <property name="mnemonic_widget">confirm_pw_entry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="confirm_entry">
+              <object class="GtkEntry" id="confirm_pw_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visibility">False</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">32</property>
-                <signal name="changed" handler="on_confirm_changed" swapped="no"/>
                 <signal name="activate" handler="on_entry_activated" swapped="no"/>
-                <signal name="focus-out-event" handler="on_confirm_editing_done" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -166,7 +158,17 @@
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkLevelBar" id="strength_bar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="max_value">4</property>
+                    <property name="mode">discrete</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="strength_label">
@@ -183,9 +185,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
@@ -196,11 +196,47 @@
                 <property name="halign">center</property>
                 <property name="label_width">4</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="passphrase_warning_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkImage" id="passphrase_warning_image">
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="icon_name">image-missing</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="passphrase_warning_label">
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
+                    <property name="wrap">True</property>
+                    <property name="max_width_chars">1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="width">2</property>
               </packing>
             </child>
           </object>
@@ -211,7 +247,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="warning_box">
+          <object class="GtkBox" id="keymap_warning_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -219,7 +255,7 @@
               <object class="GtkImage" id="image2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_name">dialog-warning</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -228,11 +264,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="passphrase_warning_label">
+              <object class="GtkLabel" id="keymap_warning_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Warning: You won't be able to switch between keyboard layouts (from the default one) when you decrypt your disks after install.</property>
-                <property name="use_markup">True</property>
                 <property name="wrap">True</property>
               </object>
               <packing>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.py b/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.py
index 0fcefd9..685d711 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/passphrase.py
@@ -19,12 +19,14 @@
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
 #
 
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk
 
 import pwquality
 
+from pyanaconda.ui.helpers import InputCheck
 from pyanaconda.ui.gui import GUIObject
-
+from pyanaconda.ui.gui.helpers import GUIInputCheckHandler
+from pyanaconda.constants import PW_ASCII_CHARS
 from pyanaconda.i18n import _, N_
 
 __all__ = ["PassphraseDialog"]
@@ -32,51 +34,47 @@ __all__ = ["PassphraseDialog"]
 ERROR_WEAK = N_("You have provided a weak passphrase: %s")
 ERROR_NOT_MATCHING = N_("Passphrases do not match.")
 
-class PassphraseDialog(GUIObject):
+class PassphraseDialog(GUIObject, GUIInputCheckHandler):
     builderObjects = ["passphrase_dialog"]
     mainWidgetName = "passphrase_dialog"
     uiFile = "spokes/lib/passphrase.glade"
 
     def __init__(self, data):
         GUIObject.__init__(self, data)
+        GUIInputCheckHandler.__init__(self)
 
-        self._confirm_entry = self.builder.get_object("confirm_entry")
+        self._confirm_entry = self.builder.get_object("confirm_pw_entry")
         self._passphrase_entry = self.builder.get_object("passphrase_entry")
 
         self._save_button = self.builder.get_object("passphrase_save_button")
 
+        self._strength_bar = self.builder.get_object("strength_bar")
         self._strength_label = self.builder.get_object("strength_label")
 
+        self._passphrase_warning_image = self.builder.get_object("passphrase_warning_image")
+        self._passphrase_warning_label = self.builder.get_object("passphrase_warning_label")
+
+        # Set the offset values for the strength bar colors
+        self._strength_bar.add_offset_value("low", 2)
+        self._strength_bar.add_offset_value("medium", 3)
+        self._strength_bar.add_offset_value("high", 4)
+
         # These will be set up later.
-        self._strength_bar = None
         self._pwq = None
         self._pwq_error = None
         self.passphrase = ""
 
+        self._passphrase_match_check = self.add_check(self._passphrase_entry, self._checkMatch)
+        self._confirm_match_check = self.add_check(self._confirm_entry, self._checkMatch)
+        self._strength_check = self.add_check(self._passphrase_entry, self._checkStrength)
+        self._ascii_check = self.add_check(self._passphrase_entry, self._checkASCII)
+
     def refresh(self):
         super(PassphraseDialog, self).refresh()
 
-        # disable input methods for the passphrase Entry widgets and make sure
-        # the focus change mask is enabled
+        # disable input methods for the passphrase Entry widgets
         self._passphrase_entry.set_property("im-module", "")
-        self._passphrase_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, "")
-        self._passphrase_entry.add_events(Gdk.EventMask.FOCUS_CHANGE_MASK)
         self._confirm_entry.set_property("im-module", "")
-        self._confirm_entry.add_events(Gdk.EventMask.FOCUS_CHANGE_MASK)
-
-        self._save_button.set_can_default(True)
-
-        # add the passphrase strength meter
-        self._strength_bar = Gtk.LevelBar()
-        self._strength_bar.set_mode(Gtk.LevelBarMode.DISCRETE)
-        self._strength_bar.set_min_value(0)
-        self._strength_bar.set_max_value(4)
-        self._strength_bar.add_offset_value("low", 2)
-        self._strength_bar.add_offset_value("medium", 3)
-        self._strength_bar.add_offset_value("high", 4)
-        box = self.builder.get_object("strength_box")
-        box.pack_start(self._strength_bar, False, True, 0)
-        box.show_all()
 
         # set up passphrase quality checker
         self._pwq = pwquality.PWQSettings()
@@ -93,6 +91,12 @@ class PassphraseDialog(GUIObject):
 
         self._update_passphrase_strength()
 
+        # Update the check states and force a status update
+        self._passphrase_match_check.update_check_status()
+        self._strength_check.update_check_status()
+        self._ascii_check.update_check_status()
+        self.set_status(None)
+
     def run(self):
         self.refresh()
         self.window.show_all()
@@ -125,44 +129,63 @@ class PassphraseDialog(GUIObject):
         self._strength_bar.set_value(val)
         self._strength_label.set_text(text)
 
-    def _set_entry_icon(self, entry, icon, msg):
-        entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, icon)
-        entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, msg)
+    def set_status(self, inputcheck):
+        # Set the warning message with the result from the first failed check
+        failed_check = next(self.failed_checks_with_message, None)
 
-    def on_passphrase_changed(self, entry):
-        self._update_passphrase_strength()
-        if entry.get_text() and entry.get_text() == self._confirm_entry.get_text():
-            self._set_entry_icon(self._confirm_entry, "", "")
+        if failed_check:
+            result_icon, result_message = failed_check.check_status
+            self._passphrase_warning_image.set_from_icon_name(result_icon, Gtk.IconSize.BUTTON)
+            self._passphrase_warning_label.set_text(result_message)
+            self._passphrase_warning_image.set_visible(True)
+            self._passphrase_warning_label.set_visible(True)
+        else:
+            self._passphrase_warning_image.set_visible(False)
+            self._passphrase_warning_label.set_visible(False)
+
+        # The save button should only be sensitive if the match check passes
+        if self._passphrase_match_check.check_status == InputCheck.CHECK_OK and \
+                self._confirm_match_check.check_status == InputCheck.CHECK_OK:
             self._save_button.set_sensitive(True)
         else:
             self._save_button.set_sensitive(False)
 
-        if not self._pwq_error:
-            self._set_entry_icon(entry, "", "")
+    def _checkASCII(self, inputcheck):
+        passphrase = self.get_input(inputcheck.input_obj)
 
-    def on_passphrase_editing_done(self, entry, *args):
+        if passphrase and any(char not in PW_ASCII_CHARS for char in passphrase):
+            return ("dialog-warning", _("Passphrase contains non-ASCII characters"))
+        else:
+            return InputCheck.CHECK_OK
+
+    def _checkStrength(self, inputcheck):
         if self._pwq_error:
-            icon = "gtk-dialog-error"
-            msg = _(ERROR_WEAK) % self._pwq_error
-            self._set_entry_icon(entry, icon, msg)
-
-    def on_confirm_changed(self, entry):
-        if entry.get_text() and entry.get_text() == self._passphrase_entry.get_text():
-            self._set_entry_icon(entry, "", "")
-            self._save_button.set_sensitive(True)
+            return ("dialog-error", _(ERROR_WEAK) % self._pwq_error)
         else:
-            self._save_button.set_sensitive(False)
+            return InputCheck.CHECK_OK
 
-    def on_confirm_editing_done(self, entry, *args):
+    def _checkMatch(self, inputcheck):
         passphrase = self._passphrase_entry.get_text()
         confirm = self._confirm_entry.get_text()
         if passphrase != confirm:
-            icon = "gtk-dialog-error"
-            msg = ERROR_NOT_MATCHING
-            self._set_entry_icon(entry, icon, _(msg))
-            self._save_button.set_sensitive(False)
+            result = ("dialog-error", _(ERROR_NOT_MATCHING))
         else:
-            self._set_entry_icon(entry, "", "")
+            result = InputCheck.CHECK_OK
+
+        # If the check succeeded, reset the status of the other check object
+        # Disable the current check to prevent a cycle
+        if result == InputCheck.CHECK_OK:
+            inputcheck.enabled = False
+            if inputcheck == self._passphrase_match_check:
+                self._confirm_match_check.update_check_status()
+            else:
+                self._passphrase_match_check.update_check_status()
+            inputcheck.enabled = True
+
+        return result
+
+    def on_passphrase_changed(self, entry):
+        self._update_passphrase_strength()
 
     def on_save_clicked(self, button):
         self.passphrase = self._passphrase_entry.get_text()
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.glade
index 201604d..08ecb20 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="refreshDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -21,11 +22,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="refreshCancelButton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Refresh Dialog|Rescan">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -35,12 +36,12 @@
             </child>
             <child>
               <object class="GtkButton" id="refreshOKButton">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes" context="GUI|Refresh Dialog|Rescan">_OK</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -101,8 +102,8 @@
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-dialog-warning</property>
-                    <property name="icon-size">2</property>
+                    <property name="icon_name">dialog-warning</property>
+                    <property name="icon_size">2</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -136,9 +137,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="show_tabs">False</property>
+                <property name="show_border">False</property>
                 <child>
                   <object class="GtkButton" id="rescanButton">
-                    <property name="label" translatable="yes">_Rescan Disks</property>
+                    <property name="label" translatable="yes" context="GUI|Refresh Dialog|Rescan">_Rescan Disks</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -201,8 +203,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -214,8 +214,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -233,7 +231,6 @@ installation options while this scan completes.</property>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
@@ -254,14 +251,14 @@ installation options while this scan completes.</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Disk rescan complete.&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Disk rescan complete.</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -275,20 +272,17 @@ installation options while this scan completes.</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkImage" id="image2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="stock">gtk-apply</property>
+                        <property name="icon_name">emblem-ok-symbolic</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
                         <property name="height">2</property>
                       </packing>
                     </child>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.py b/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.py
index 2b61cf7..396c38f 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/refresh.py
@@ -89,9 +89,8 @@ class RefreshDialog(GUIObject):
         self._notebook.set_current_page(1)
 
         # And now to fire up the storage reinitialization.
-        protectedNames = map(lambda d: d.name, self.storage.protectedDevices)
         threadMgr.add(AnacondaThread(name=constants.THREAD_STORAGE, target=storageInitialize,
-                                     args=(self.storage, self.data, protectedNames)))
+                                     args=(self.storage, self.data, self.storage.devicetree.protectedDevNames)))
 
         self._elapsed = 0
 
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/resize.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/resize.glade
index 0a4bce9..147f22e 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/resize.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/resize.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkTreeStore" id="diskStore">
     <columns>
       <!-- column-name diskID -->
@@ -15,10 +16,12 @@
       <column type="gchararray"/>
       <!-- column-name diskEditable -->
       <column type="gboolean"/>
+      <!-- column-name diskType -->
+      <column type="gint"/>
       <!-- column-name diskTooltip -->
       <column type="gchararray"/>
       <!-- column-name diskResizeTarget -->
-      <column type="gint"/>
+      <column type="guint64"/>
       <!-- column-name diskName -->
       <column type="gchararray"/>
     </columns>
@@ -49,11 +52,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelButton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Reclaim Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -64,7 +67,7 @@
             </child>
             <child>
               <object class="GtkButton" id="resizeButton">
-                <property name="label" translatable="yes">_Reclaim space</property>
+                <property name="label" translatable="yes" context="GUI|Reclaim Dialog">_Reclaim space</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -161,7 +164,7 @@
                         <child>
                           <object class="GtkCellRendererText" id="nameRenderer"/>
                           <attributes>
-                            <attribute name="text">8</attribute>
+                            <attribute name="text">9</attribute>
                           </attributes>
                         </child>
                       </object>
@@ -194,7 +197,6 @@
                         <child>
                           <object class="GtkCellRendererText" id="actionRenderer"/>
                           <attributes>
-                            <attribute name="visible">5</attribute>
                             <attribute name="text">4</attribute>
                           </attributes>
                         </child>
@@ -216,7 +218,7 @@
                 <property name="margin_top">6</property>
                 <child>
                   <object class="GtkButton" id="preserveButton">
-                    <property name="label" translatable="yes">_Preserve</property>
+                    <property name="label" translatable="yes" context="GUI|Reclaim Dialog">_Preserve</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -232,7 +234,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="deleteButton">
-                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="label" translatable="yes" context="GUI|Reclaim Dialog">_Delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -248,7 +250,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="shrinkButton">
-                    <property name="label" translatable="yes">_Shrink</property>
+                    <property name="label" translatable="yes" context="GUI|Reclaim Dialog">_Shrink</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -264,7 +266,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="deleteAllButton">
-                    <property name="label" translatable="yes">Delete _all</property>
+                    <property name="label" translatable="yes" context="GUI|Reclaim Dialog">Delete _all</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/resize.py b/anaconda/pyanaconda/ui/gui/spokes/lib/resize.py
index 1081f8a..e71ee92 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/resize.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/resize.py
@@ -21,14 +21,12 @@
 
 from __future__ import division
 from collections import namedtuple
-from math import ceil
 
 from gi.repository import Gdk, Gtk
 
-from pyanaconda.i18n import _, N_, P_
-from pyanaconda.ui.lib.disks import size_str
+from pyanaconda.i18n import _, C_, N_, P_
 from pyanaconda.ui.gui import GUIObject
-from pyanaconda.ui.gui.utils import timed_action
+from pyanaconda.ui.gui.utils import escape_markup, timed_action
 from blivet.size import Size
 
 __all__ = ["ResizeDialog"]
@@ -39,17 +37,23 @@ FILESYSTEM_COL = 2
 RECLAIMABLE_COL = 3
 ACTION_COL = 4
 EDITABLE_COL = 5
-TOOLTIP_COL = 6
-RESIZE_TARGET_COL = 7
-NAME_COL = 8
+TYPE_COL = 6
+TOOLTIP_COL = 7
+RESIZE_TARGET_COL = 8
+NAME_COL = 9
+
+TY_NORMAL = 0
+TY_FREE_SPACE = 1
+TY_PROTECTED = 2
 
 PartStoreRow = namedtuple("PartStoreRow", ["id", "desc", "fs", "reclaimable",
-                                           "action", "editable", "tooltip",
-                                           "target", "name"])
+                                           "action", "editable", "ty",
+                                           "tooltip", "target", "name"])
 
 PRESERVE = N_("Preserve")
 SHRINK = N_("Shrink")
 DELETE = N_("Delete")
+NOTHING = ""
 
 class ResizeDialog(GUIObject):
     builderObjects = ["actionStore", "diskStore", "resizeDialog", "resizeAdjustment"]
@@ -62,7 +66,7 @@ class ResizeDialog(GUIObject):
         self.payload = payload
 
         self._initialFreeSpace = Size(0)
-        self._selectedReclaimableSpace = 0
+        self._selectedReclaimableSpace = Size(0)
 
         self._actionStore = self.builder.get_object("actionStore")
         self._diskStore = self.builder.get_object("diskStore")
@@ -76,7 +80,7 @@ class ResizeDialog(GUIObject):
 
         self._required_label = self.builder.get_object("requiredSpaceLabel")
         markup = self._required_label.get_label()
-        self._required_label.set_markup(markup % size_str(self.payload.spaceRequired))
+        self._required_label.set_markup(markup % escape_markup(str(self.payload.spaceRequired)))
 
         self._reclaimDescLabel = self.builder.get_object("reclaimDescLabel")
 
@@ -113,10 +117,10 @@ class ResizeDialog(GUIObject):
 
     def populate(self, disks):
         totalDisks = 0
-        totalReclaimableSpace = 0
+        totalReclaimableSpace = Size(0)
 
         self._initialFreeSpace = Size(0)
-        self._selectedReclaimableSpace = 0
+        self._selectedReclaimableSpace = Size(0)
 
         canShrinkSomething = False
 
@@ -128,17 +132,18 @@ class ResizeDialog(GUIObject):
 
             if disk.partitioned:
                 fstype = ""
-                diskReclaimableSpace = 0
+                diskReclaimableSpace = Size(0)
             else:
-                fstype = disk.format.type
+                fstype = disk.format.name
                 diskReclaimableSpace = disk.size
 
             itr = self._diskStore.append(None, [disk.id,
-                                                "%s %s" % (size_str(int(disk.size)), disk.description),
+                                                "%s %s" % (disk.size.humanReadable(max_places=1), disk.description),
                                                 fstype,
                                                 "<span foreground='grey' style='italic'>%s total</span>",
                                                 _(PRESERVE),
                                                 editable,
+                                                TY_NORMAL,
                                                 self._get_tooltip(disk),
                                                 int(disk.size),
                                                 disk.name])
@@ -153,19 +158,26 @@ class ResizeDialog(GUIObject):
                     if dev.resizable:
                         freeSize = dev.size - dev.minSize
                         resizeString = _("%(freeSize)s of %(devSize)s") \
-                                       % {"freeSize": size_str(int(freeSize)), "devSize": size_str(int(dev.size))}
+                                       % {"freeSize": freeSize.humanReadable(max_places=1), "devSize": dev.size.humanReadable(max_places=1)}
                         if not dev.protected:
                             canShrinkSomething = True
                     else:
                         freeSize = dev.size
-                        resizeString = "<span foreground='grey'>%s</span>" % _("Not resizeable")
+                        resizeString = "<span foreground='grey'>%s</span>" % \
+                                escape_markup(_("Not resizeable"))
+
+                    if dev.protected:
+                        ty = TY_PROTECTED
+                    else:
+                        ty = TY_NORMAL
 
                     self._diskStore.append(itr, [dev.id,
                                                  self._description(dev),
-                                                 dev.format.type,
+                                                 dev.format.name,
                                                  resizeString,
                                                  _(PRESERVE),
                                                  not dev.protected,
+                                                 ty,
                                                  self._get_tooltip(dev),
                                                  int(dev.size),
                                                  dev.name])
@@ -174,22 +186,24 @@ class ResizeDialog(GUIObject):
             # And then add another uneditable line that lists how much space is
             # already free in the disk.
             diskFree = free_space[disk.name][0]
-            converted = diskFree.convertTo(en_spec="mb")
-            if int(converted):
+            if diskFree >= Size("1MiB"):
+                freeSpaceString = "<span foreground='grey' style='italic'>%s</span>" % \
+                        escape_markup(_("Free space"))
                 self._diskStore.append(itr, [disk.id,
-                                             _("""<span foreground='grey' style='italic'>Free space</span>"""),
+                                             freeSpaceString,
                                              "",
-                                             "<span foreground='grey' style='italic'>%s</span>" % size_str(int(diskFree)),
-                                             _(PRESERVE),
+                                             "<span foreground='grey' style='italic'>%s</span>" % escape_markup(diskFree.humanReadable(max_places=1)),
+                                             NOTHING,
                                              False,
+                                             TY_FREE_SPACE,
                                              self._get_tooltip(disk),
-                                             int(converted),
+                                             diskFree,
                                              ""])
                 self._initialFreeSpace += diskFree
 
             # And then go back and fill in the total reclaimable space for the
             # disk, now that we know what each partition has reclaimable.
-            self._diskStore[itr][RECLAIMABLE_COL] = self._diskStore[itr][RECLAIMABLE_COL] % size_str(int(diskReclaimableSpace))
+            self._diskStore[itr][RECLAIMABLE_COL] = self._diskStore[itr][RECLAIMABLE_COL] % diskReclaimableSpace
 
             totalDisks += 1
             totalReclaimableSpace += diskReclaimableSpace
@@ -208,16 +222,19 @@ class ResizeDialog(GUIObject):
                              "installation below.")
 
         self._reclaimDescLabel.set_text(description)
+        self._update_reclaim_button(Size(0))
 
     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)",
-                      nDisks) % {"count" : nDisks, "size" : size_str(totalReclaimable)}
+                      nDisks) % {"count" : escape_markup(str(nDisks)),
+                                 "size" : escape_markup(totalReclaimable)}
             self._reclaimable_label.set_markup(text)
 
         if selectedReclaimable is not None:
-            text = _("Total selected space to reclaim: <b>%s</b>") % size_str(selectedReclaimable)
+            text = _("Total selected space to reclaim: <b>%s</b>") % \
+                    escape_markup(selectedReclaimable)
             self._selected_label.set_markup(text)
 
     def _setup_slider(self, device, value):
@@ -226,30 +243,40 @@ class ResizeDialog(GUIObject):
            slider and keyboard support.  Any devices that are not resizable
            will not have a slider displayed, so they do not need to be worried
            with here.
+
+           :param device: The device
+           :type device: PartitionDevice
+           :param value: default value to set
+           :type value: Size
         """
-        self._resizeSlider.handler_block_by_func(self.on_resize_value_changed)
-        self._resizeSlider.set_range(int(ceil(device.minSize)), int(device.size))
-        self._resizeSlider.handler_unblock_by_func(self.on_resize_value_changed)
-        self._resizeSlider.set_value(value)
+        # Convert the Sizes to ints
+        minSize = int(device.minSize)
+        size = int(device.size)
+        default_value = int(value)
 
         # The slider needs to be keyboard-accessible.  We'll make small movements change in
         # 1% increments, and large movements in 5% increments.
-        distance = int(device.size) - int(ceil(device.minSize))
-        onePercent = distance*0.01
-        fivePercent = distance*0.05
-        twentyPercent = distance*0.2
+        distance = size - minSize
+        onePercent = int(distance / 100)
+        fivePercent = int(distance / 20)
+        twentyPercent = int(distance / 5)
+
+        self._resizeSlider.handler_block_by_func(self.on_resize_value_changed)
+        self._resizeSlider.set_range(minSize, size)
+        self._resizeSlider.handler_unblock_by_func(self.on_resize_value_changed)
+        self._resizeSlider.set_value(default_value)
 
         adjustment = self.builder.get_object("resizeAdjustment")
-        adjustment.configure(value, int(ceil(device.minSize)), int(device.size), onePercent, fivePercent, 0)
+        adjustment.configure(default_value, minSize, size, onePercent, fivePercent, 0)
 
         # And then the slider needs a couple tick marks for easier navigation.
         self._resizeSlider.clear_marks()
         for i in range(1, 5):
-            self._resizeSlider.add_mark(int(ceil(device.minSize)) + i*twentyPercent, Gtk.PositionType.BOTTOM, None)
+            self._resizeSlider.add_mark(minSize + i * twentyPercent, Gtk.PositionType.BOTTOM, None)
 
         # Finally, add tick marks for the ends.
-        self._resizeSlider.add_mark(int(ceil(device.minSize)), Gtk.PositionType.BOTTOM, size_str(int(ceil(device.minSize))))
-        self._resizeSlider.add_mark(int(device.size), Gtk.PositionType.BOTTOM, size_str(int(device.size)))
+        self._resizeSlider.add_mark(minSize, Gtk.PositionType.BOTTOM, str(device.minSize))
+        self._resizeSlider.add_mark(size, Gtk.PositionType.BOTTOM, str(device.size))
 
     def _update_action_buttons(self, row):
         obj = PartStoreRow(*row)
@@ -270,7 +297,7 @@ class ResizeDialog(GUIObject):
         self._shrinkButton.set_sensitive(device.resizable)
 
         if device.resizable:
-            self._setup_slider(device, obj.target)
+            self._setup_slider(device, Size(obj.target))
 
         # Then, disable the button for whatever action is currently selected.
         # It doesn't make a lot of sense to allow clicking that.
@@ -283,15 +310,9 @@ class ResizeDialog(GUIObject):
             self._deleteButton.set_sensitive(False)
 
     def _update_reclaim_button(self, got):
-        # The reclaim button is sensitive if two conditions are met:
-        # (1) There's enough available space (existing free/unpartitioned space,
-        #     shrink space, etc.) on all disks.
-        # (2) At least one destructive action has been chosen.  We can detect
-        #     this by checking whether got is non-zero.
-        need = self.payload.spaceRequired
-        self._resizeButton.set_sensitive(got+self._initialFreeSpace >= need and got > Size(0))
+        self._resizeButton.set_sensitive(got+self._initialFreeSpace >= self.payload.spaceRequired)
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def refresh(self, disks):
         super(ResizeDialog, self).refresh()
 
@@ -319,14 +340,14 @@ class ResizeDialog(GUIObject):
     def _sumReclaimableSpace(self, model, path, itr, *args):
         obj = PartStoreRow(*model[itr])
 
-        if not obj.editable:
+        device = self.storage.devicetree.getDeviceByID(obj.id)
+        if device.isDisk and device.partitioned:
             return False
 
-        device = self.storage.devicetree.getDeviceByID(obj.id)
         if obj.action == _(PRESERVE):
             return False
         if obj.action == _(SHRINK):
-            self._selectedReclaimableSpace += int(device.size) - obj.target
+            self._selectedReclaimableSpace += device.size - Size(obj.target)
         elif obj.action == _(DELETE):
             self._selectedReclaimableSpace += int(device.size)
 
@@ -358,6 +379,14 @@ class ResizeDialog(GUIObject):
         if device.isDisk and device.partitioned:
             partItr = self._diskStore.iter_children(itr)
             while partItr:
+                # Immutable entries are those that we can't do anything to - like
+                # the free space lines.  We just want to leave them in the display
+                # for information, but you can't choose to preserve/delete/shrink
+                # them.
+                if self._diskStore[partItr][TYPE_COL] in [TY_FREE_SPACE, TY_PROTECTED]:
+                    partItr = self._diskStore.iter_next(partItr)
+                    continue
+
                 self._diskStore[partItr][ACTION_COL] = _(newAction)
 
                 # If the user marked a whole disk for deletion, they can't go in and
@@ -372,13 +401,29 @@ class ResizeDialog(GUIObject):
 
         # And then we're keeping a running tally of how much space the user
         # has selected to reclaim, so reflect that in the UI.
-        self._selectedReclaimableSpace = 0
+        self._selectedReclaimableSpace = Size(0)
         self._diskStore.foreach(self._sumReclaimableSpace, None)
         self._update_labels(selectedReclaimable=self._selectedReclaimableSpace)
 
-        self._update_reclaim_button(Size(en_spec="%f MB" % self._selectedReclaimableSpace))
+        self._update_reclaim_button(self._selectedReclaimableSpace)
         self._update_action_buttons(selectedRow)
 
+    def _recursiveRemove(self, device):
+        """ Remove a device, or if it has protected children, just remove the
+            unprotected children.
+        """
+        if not any(d for d in self.storage.devices \
+                   if device in d.parents and d.protected):
+            # No protected children, remove the device
+            self.storage.recursiveRemove(device)
+        else:
+            # Only remove unprotected children
+            unprotected = (d for d in self.storage.devices \
+                           if device in d.parents and not d.protected)
+            for child in unprotected:
+                if child in self.storage.devices:
+                    self.storage.recursiveRemove(child)
+
     def _scheduleActions(self, model, path, itr, *args):
         obj = PartStoreRow(*model[itr])
         device = self.storage.devicetree.getDeviceByID(obj.id)
@@ -390,11 +435,12 @@ class ResizeDialog(GUIObject):
             return False
         elif obj.action == _(SHRINK) and int(device.size) != int(obj.target):
             if device.resizable:
-                self.storage.resizeDevice(device, obj.target)
+                aligned = device.alignTargetSize(Size(obj.target))
+                self.storage.resizeDevice(device, aligned)
             else:
-                self.storage.recursiveRemove(device)
+                self._recursiveRemove(device)
         elif obj.action == _(DELETE):
-            self.storage.recursiveRemove(device)
+            self._recursiveRemove(device)
 
         return False
 
@@ -402,12 +448,12 @@ class ResizeDialog(GUIObject):
         self._diskStore.foreach(self._scheduleActions, None)
 
     def on_delete_all_clicked(self, button, *args):
-        if button.get_label() == _("Delete _all"):
+        if button.get_label() == C_("GUI|Reclaim Dialog", "Delete _all"):
             action = DELETE
-            button.set_label(_("Preserve _all"))
+            button.set_label(C_("GUI|Reclaim Dialog", "Preserve _all"))
         else:
             action = PRESERVE
-            button.set_label(_("Delete _all"))
+            button.set_label(C_("GUI|Reclaim Dialog", "Delete _all"))
 
         itr = self._diskStore.get_iter_first()
         while itr:
@@ -447,21 +493,21 @@ class ResizeDialog(GUIObject):
     def on_resize_value_changed(self, rng):
         (model, itr) = self._selection.get_selected()
 
-        old_delta = int(rng.get_adjustment().get_upper())- model[itr][RESIZE_TARGET_COL]
+        old_delta = Size(rng.get_adjustment().get_upper()) - int(model[itr][RESIZE_TARGET_COL])
         self._selectedReclaimableSpace -= old_delta
 
         # Update the target size in the store.
-        model[itr][RESIZE_TARGET_COL] = int(rng.get_value())
+        model[itr][RESIZE_TARGET_COL] = Size(rng.get_value())
 
         # Update the "Total selected space" label.
-        delta = int(rng.get_adjustment().get_upper()) - int(rng.get_value())
+        delta = Size(rng.get_adjustment().get_upper()) - int(rng.get_value())
         self._selectedReclaimableSpace += delta
         self._update_labels(selectedReclaimable=self._selectedReclaimableSpace)
 
         # And then the reclaim button, in case they've made enough space.
-        self._update_reclaim_button(Size(en_spec="%f MB" % self._selectedReclaimableSpace))
+        self._update_reclaim_button(self._selectedReclaimableSpace)
 
     def resize_slider_format(self, scale, value):
         # This makes the value displayed under the slider prettier than just a
         # single number.
-        return size_str(value)
+        return str(Size(value))
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/summary.glade b/anaconda/pyanaconda/ui/gui/spokes/lib/summary.glade
index 3a39e7d..e1584f6 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/summary.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/summary.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.2"/>
   <object class="GtkListStore" id="actionStore">
     <columns>
       <!-- column-name actionOrder -->
@@ -36,7 +37,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="summaryCancelButton">
-                <property name="label" translatable="yes">_Cancel &amp; Return to Custom Partitioning</property>
+                <property name="label" translatable="yes" context="GUI|Summary Dialog">_Cancel &amp; Return to Custom Partitioning</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -51,7 +52,7 @@
             </child>
             <child>
               <object class="GtkButton" id="summaryAcceptButton">
-                <property name="label" translatable="yes">_Accept Changes</property>
+                <property name="label" translatable="yes" context="GUI|Summary Dialog">_Accept Changes</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/lib/summary.py b/anaconda/pyanaconda/ui/gui/spokes/lib/summary.py
index 8d320cc..f98db86 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/lib/summary.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/lib/summary.py
@@ -20,6 +20,7 @@
 #
 
 from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.utils import escape_markup
 
 from blivet.deviceaction import ACTION_TYPE_DESTROY, ACTION_TYPE_RESIZE, ACTION_OBJECT_FORMAT
 
@@ -34,15 +35,17 @@ class ActionSummaryDialog(GUIObject):
         GUIObject.__init__(self, data)
         self._store = self.builder.get_object("actionStore")
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def initialize(self, actions):
         for (i, action) in enumerate(actions, start=1):
             mountpoint = ""
 
             if action.type in [ACTION_TYPE_DESTROY, ACTION_TYPE_RESIZE]:
-                typeString = """<span foreground='red'>%s</span>""" % action.typeDesc.title()
+                typeString = """<span foreground='red'>%s</span>""" % \
+                        escape_markup(action.typeDesc.title())
             else:
-                typeString = """<span foreground='green'>%s</span>""" % action.typeDesc.title()
+                typeString = """<span foreground='green'>%s</span>""" % \
+                        escape_markup(action.typeDesc.title())
                 if action.obj == ACTION_OBJECT_FORMAT:
                     mountpoint = getattr(action.device.format, "mountpoint", "")
 
@@ -52,7 +55,7 @@ class ActionSummaryDialog(GUIObject):
                                 action.device.name,
                                 mountpoint])
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def refresh(self, actions):
         GUIObject.refresh(self)
 
diff --git a/anaconda/pyanaconda/ui/gui/spokes/network.glade b/anaconda/pyanaconda/ui/gui/spokes/network.glade
index 0a6ce13..c39f768 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/network.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/network.glade
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
+  <object class="GtkListStore" id="liststore_add_device">
+    <columns>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+      <!-- column-name type -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Bond</col>
+        <col id="1" translatable="yes">bond</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Team</col>
+        <col id="1" translatable="yes">team</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Vlan</col>
+        <col id="1" translatable="yes">vlan</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="add_device_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -19,11 +42,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_device_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Network|Add Device Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -33,11 +56,11 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add_device_create">
-                <property name="label">gtk-add</property>
+                <property name="label" translatable="yes" context="GUI|Network|Add Device Dialog">_Add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -62,7 +85,7 @@
               <object class="GtkLabel" id="label_add_device">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Select the type of device you wish to add</property>
+                <property name="label" translatable="yes" context="GUI|Network|Add Device Dialog">_Select the type of device you wish to add</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">combobox_add_device</property>
               </object>
@@ -105,28 +128,6 @@
       <action-widget response="1">button_add_device_create</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="liststore_add_device">
-    <columns>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-      <!-- column-name type -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Bond</col>
-        <col id="1" translatable="yes">bond</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Team</col>
-        <col id="1" translatable="yes">team</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Vlan</col>
-        <col id="1" translatable="yes">vlan</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkListStore" id="liststore_devices">
     <columns>
       <!-- column-name icon -->
@@ -136,7 +137,7 @@
       <!-- column-name sort -->
       <column type="gchararray"/>
       <!-- column-name object -->
-      <column type="GObject"/>
+      <column type="PyObject"/>
     </columns>
   </object>
   <object class="GtkListStore" id="liststore_wireless_network">
@@ -155,10 +156,2126 @@
       <column type="guint"/>
     </columns>
   </object>
-  <object class="AnacondaStandaloneWindow" id="networkStandaloneWindow">
-    <property name="startup_id">filler</property>
+  <object class="AnacondaSpokeWindow" id="networkWindow">
+    <property name="can_focus">False</property>
+    <property name="window_name" translatable="yes">NETWORK &amp; HOSTNAME</property>
+    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
+    <child internal-child="main_box">
+      <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="nav_box">
+          <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
+            <child internal-child="nav_area">
+              <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
+                <property name="can_focus">False</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="alignment">
+          <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
+            <property name="can_focus">False</property>
+            <property name="margin_top">12</property>
+            <property name="yalign">0</property>
+            <property name="bottom_padding">48</property>
+            <property name="left_padding">24</property>
+            <property name="right_padding">24</property>
+            <child internal-child="action_area">
+              <object class="GtkBox" id="networkWindow-actionArea">
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="live_hint_label">
+                    <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="ellipsize">start</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="networkControlBox_vbox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkBox" id="network_config_vbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <object class="GtkBox" id="hbox2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkBox" id="vbox10">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="devices_scrolledwindow">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="shadow_type">in</property>
+                                    <property name="min_content_width">300</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="treeview_devices">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="model">liststore_devices</property>
+                                        <property name="headers_visible">False</property>
+                                        <property name="search_column">2</property>
+                                        <property name="show_expanders">False</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="treeview-selection3"/>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolbar" id="devices_toolbar">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="toolbar_style">icons</property>
+                                    <property name="show_arrow">False</property>
+                                    <property name="icon_size">1</property>
+                                    <child>
+                                      <object class="GtkToolButton" id="add_toolbutton">
+                                        <property name="width_request">42</property>
+                                        <property name="height_request">36</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="icon_name">list-add-symbolic</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="remove_toolbutton">
+                                        <property name="width_request">42</property>
+                                        <property name="height_request">36</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="icon_name">list-remove-symbolic</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <style>
+                                      <class name="inline-toolbar"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkNotebook" id="notebook_types">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="show_border">False</property>
+                                <child>
+                                  <object class="GtkBox" id="vbox6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="border_width">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkGrid" id="grid1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">start</property>
+                                        <property name="row_spacing">10</property>
+                                        <property name="column_spacing">6</property>
+                                        <child>
+                                          <object class="GtkImage" id="image_wired_device">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <property name="xalign">1</property>
+                                            <property name="pixel_size">48</property>
+                                            <property name="icon_name">network-wired</property>
+                                            <property name="icon_size">6</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="vbox4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">start</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label_wired_device">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Wired</property>
+                                                <property name="ellipsize">end</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                  <attribute name="scale" value="1.2"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label_wired_status">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Cable unplugged</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment_wired_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <child>
+                                              <object class="GtkSwitch" id="device_wired_off_switch">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">start</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_slaves">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Slaves</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_slaves">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_dns">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="yalign">0</property>
+                                            <property name="label" translatable="yes">DNS</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">10</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_dns">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                            <property name="wrap">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">10</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_route">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Default Route</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">9</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_route">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">9</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_subnet">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Subnet Mask</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">8</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_subnet">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">8</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_ipv6">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IPv6 Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">7</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_ipv6">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">::1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">7</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_ipv4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IPv4 Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_ipv4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_speed">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Speed</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_speed">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">1 Mb/s</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_mac">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Hardware Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_mac">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">AA:BB:CC:DD:55:66:77:88</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_parent">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Parent</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_vlanid">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Vlan ID</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_parent">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_vlanid">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkGrid" id="alignment1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="margin_top">12</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <child>
+                                          <object class="GtkButton" id="button_wired_options">
+                                            <property name="label" translatable="yes" context="GUI|Network|Wired">C_onfigure...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="tooltip_text" translatable="yes">To apply the configuration immediately turn the device off and on.</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">end</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">wired</property>
+                                  </object>
+                                  <packing>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="vbox5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="border_width">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkGrid" id="grid2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">start</property>
+                                        <property name="row_spacing">10</property>
+                                        <property name="column_spacing">6</property>
+                                        <child>
+                                          <object class="GtkImage" id="image_wireless_device">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <property name="xalign">1</property>
+                                            <property name="pixel_size">48</property>
+                                            <property name="icon_name">network-wireless</property>
+                                            <property name="icon_size">6</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="vbox3">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">start</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label_wireless_device">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Wireless</property>
+                                                <property name="ellipsize">end</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                  <attribute name="scale" value="1.2"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label_wireless_status">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Not connected</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_mac">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Hardware Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_speed">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Speed</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_ipv4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IPv4 Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_ipv6">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IPv6 Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_route">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Default Route</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">7</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_dns">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="yalign">0</property>
+                                            <property name="label" translatable="yes">DNS</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">8</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_mac">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">AA:BB:CC:DD:55:66:77:88</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_speed">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">1 Mb/s</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_ipv4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">5</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_ipv6">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">::1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">6</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_route">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">7</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_dns">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                            <property name="wrap">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">8</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment_wireless_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <child>
+                                              <object class="GtkSwitch" id="device_wireless_off_switch">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">start</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_security">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Security</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wireless_network_name">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Wireless">_Network Name</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">combobox_wireless_network_name</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_hotspot_network_name">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Network Name</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">9</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_hotspot_security_key">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Security Key</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">10</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wireless_security">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">WPA</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="combobox_wireless_network_name">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="model">liststore_wireless_network</property>
+                                            <property name="has_entry">True</property>
+                                            <property name="entry_text_column">1</property>
+                                            <child internal-child="entry">
+                                              <object class="GtkEntry" id="combobox-entry4">
+                                                <property name="can_focus">False</property>
+                                                <property name="invisible_char">●</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">4</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_hotspot_network_name">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">My Hot Spot</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">9</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_hotspot_security_key">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">My Secret</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">10</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkGrid" id="alignment2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="margin_top">12</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <child>
+                                          <object class="GtkButton" id="start_hotspot_button">
+                                            <property name="label" translatable="yes" context="GUI|Network|Wireless">_Use as Hotspot...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="valign">end</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="stop_hotspot_button">
+                                            <property name="label" translatable="yes" context="GUI|Network|Wireless">_Stop Hotspot...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="valign">end</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="button_wireless_options">
+                                            <property name="label" translatable="yes" context="GUI|Network|Wireless">_Configure...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">end</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label16">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">wireless</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="vbox7">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="border_width">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkGrid" id="grid3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">start</property>
+                                        <property name="row_spacing">10</property>
+                                        <property name="column_spacing">6</property>
+                                        <child>
+                                          <object class="GtkImage" id="image_mobilebb_device">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <property name="xalign">1</property>
+                                            <property name="pixel_size">48</property>
+                                            <property name="icon_name">network-cellular-connected-symbolic</property>
+                                            <property name="icon_size">6</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="vbox11">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">start</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label_mobilebb_device">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Mobile Broadband</property>
+                                                <property name="ellipsize">end</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                  <attribute name="scale" value="1.2"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label_mobilebb_status">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Not connected</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_imei">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IMEI</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_speed">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Speed</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_provider">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Provider</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_imei">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">1234567890</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_speed">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">1 Mb/s</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_provider">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">SuperTel Supremo	</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_ipv4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">4</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_ipv6">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">5</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_route">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">6</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_mobilebb_dns">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">7</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment_mobilebb_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_ipv4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IP Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_ipv6">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">IPv6 Address</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_route">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Default Route</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mobilebb_dns">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="yalign">0</property>
+                                            <property name="label" translatable="yes">DNS</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">7</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="yalign">1</property>
+                                        <property name="xscale">0</property>
+                                        <property name="yscale">0</property>
+                                        <property name="top_padding">12</property>
+                                        <child>
+                                          <object class="GtkButton" id="button_mobilebb_options">
+                                            <property name="label" translatable="yes" context="GUI|Network|Mobile Broadband">_Configure...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label17">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">mobilebb</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="vbox9">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="border_width">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkGrid" id="grid4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">start</property>
+                                        <property name="row_spacing">10</property>
+                                        <property name="column_spacing">6</property>
+                                        <child>
+                                          <object class="GtkImage" id="image_vpn_device">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <property name="xalign">1</property>
+                                            <property name="pixel_size">48</property>
+                                            <property name="icon_name">network-vpn</property>
+                                            <property name="icon_size">6</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="vbox12">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">start</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label_vpn_device">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">VPN</property>
+                                                <property name="ellipsize">end</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                  <attribute name="scale" value="1.2"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label_vpn_status">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Not connected</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_vpn_service_type">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">VPN Type</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_vpn_gateway">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Gateway</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_vpn_group_name">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Group Name</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_vpn_group_password">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Group Password</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_vpn_username">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Username</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_vpn_service_type">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">openvpn</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_vpn_gateway">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">AA:BB:CC:DD:55:66:77:88</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_vpn_group_name">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">SEKRIT</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_vpn_group_password">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">**********</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">4</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_vpn_username">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">smithy</property>
+                                            <property name="selectable">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">5</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment_vpn_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="yalign">1</property>
+                                        <property name="xscale">0</property>
+                                        <property name="yscale">0</property>
+                                        <property name="top_padding">12</property>
+                                        <child>
+                                          <object class="GtkButton" id="button_vpn_options">
+                                            <property name="label" translatable="yes" context="GUI|Network|VPN">_Configure...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label55">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">vpn</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">3</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="vbox8">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="border_width">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkGrid" id="grid5">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">start</property>
+                                        <property name="row_spacing">10</property>
+                                        <property name="column_spacing">6</property>
+                                        <child>
+                                          <object class="GtkImage" id="image_proxy_device">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <property name="xalign">1</property>
+                                            <property name="pixel_size">48</property>
+                                            <property name="icon_name">preferences-system-network</property>
+                                            <property name="icon_size">6</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="vbox13">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="valign">start</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label_proxy_device">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Proxy</property>
+                                                <property name="ellipsize">end</property>
+                                                <attributes>
+                                                  <attribute name="weight" value="bold"/>
+                                                  <attribute name="scale" value="1.2"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label_proxy_status">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label">Not connected</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment_proxy_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_proxy_method">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Proxy">_Method</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">combobox_proxy_mode</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBoxText" id="combobox_proxy_mode">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_proxy_url">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Proxy">_Configuration URL</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">entry_proxy_url</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="entry_proxy_url">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="width">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_proxy_http">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Proxy">HTTP _Proxy</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">entry_proxy_http</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_proxy_https">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Proxy">H_TTPS Proxy</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">entry_proxy_https</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_proxy_ftp">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Proxy">_FTP Proxy</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">entry_proxy_ftp</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_proxy_socks">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes" context="GUI|Network|Proxy">_Socks Host</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">entry_proxy_socks</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_proxy_warning">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">WPAD warning...</property>
+                                            <property name="wrap">True</property>
+                                            <property name="width_chars">50</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">7</property>
+                                            <property name="width">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="entry_proxy_http">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="spinbutton_proxy_http">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                            <property name="xalign">1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="entry_proxy_https">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="entry_proxy_ftp">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="entry_proxy_socks">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="spinbutton_proxy_https">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                            <property name="xalign">1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="spinbutton_proxy_ftp">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                            <property name="xalign">1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="spinbutton_proxy_socks">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">●</property>
+                                            <property name="xalign">1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="top_attach">6</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label46">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">proxy</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">4</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="vboxNodevice">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="border_width">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">No network devices available</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">5</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">nodevice</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">5</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="network_config_vbox-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Network Config Box</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="hbox54">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkButton" id="button_unlock">
+                            <property name="label" translatable="yes" context="GUI|Network">Unloc_k</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox_flight_mode">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">3</property>
+                            <child>
+                              <object class="GtkLabel" id="label_flight_mode">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" context="GUI|Network">_Airplane Mode</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="hbox54-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">More Network Config Box</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box_hostname">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">10</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <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="use_underline">True</property>
+                            <property name="mnemonic_widget">entry_hostname</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="entry_hostname">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">●</property>
+                            <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>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="networkWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">NETWORK &amp; HOSTNAME</property>
+      </object>
+    </child>
+  </object>
+  <object class="AnacondaStandaloneWindow" id="networkStandaloneWindow">
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">NETWORK CONFIGURATION</property>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaStandaloneWindow-main_box5">
@@ -177,6 +2294,9 @@
                 <child>
                   <placeholder/>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -228,2275 +2348,6 @@ updates available for you.</property>
       </object>
     </child>
   </object>
-  <object class="AnacondaSpokeWindow" id="networkWindow">
-    <property name="startup_id">filler</property>
-    <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
-    <property name="window_name" translatable="yes">NETWORK CONFIGURATION</property>
-    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
-    <child internal-child="main_box">
-      <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child internal-child="nav_box">
-          <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
-            <property name="can_focus">False</property>
-            <child internal-child="nav_area">
-              <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
-                <property name="can_focus">False</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="alignment">
-          <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
-            <property name="can_focus">False</property>
-            <property name="margin_top">12</property>
-            <property name="yalign">0</property>
-            <property name="bottom_padding">48</property>
-            <property name="left_padding">24</property>
-            <property name="right_padding">24</property>
-            <child internal-child="action_area">
-              <object class="GtkBox" id="networkWindow-actionArea">
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="live_hint_label">
-                    <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="ellipsize">start</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="networkControlBox_vbox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkVBox" id="network_config_vbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkVBox" id="vbox10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="devices_scrolledwindow">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="shadow_type">in</property>
-                                    <property name="min_content_width">300</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="treeview_devices">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="model">liststore_devices</property>
-                                        <property name="headers_visible">False</property>
-                                        <property name="search_column">2</property>
-                                        <property name="show_expanders">False</property>
-                                        <child internal-child="selection">
-                                          <object class="GtkTreeSelection" id="treeview-selection3"/>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolbar" id="devices_toolbar">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <property name="icon_size">1</property>
-                                    <style>
-                                      <class name="inline-toolbar"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkToolButton" id="add_toolbutton">
-                                        <property name="width_request">42</property>
-                                        <property name="height_request">36</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="icon_name">list-add-symbolic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="remove_toolbutton">
-                                        <property name="width_request">42</property>
-                                        <property name="height_request">36</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="icon_name">list-remove-symbolic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkNotebook" id="notebook_types">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="show_border">False</property>
-                                <child>
-                                  <object class="GtkVBox" id="vbox6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="border_width">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkGrid" id="grid1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">start</property>
-                                        <property name="row_spacing">10</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_wired_device">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <property name="xalign">1</property>
-                                            <property name="pixel_size">48</property>
-                                            <property name="icon_name">network-wired</property>
-                                            <property name="icon-size">6</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="valign">start</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="spacing">3</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label_wired_device">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Wired</property>
-                                                <property name="ellipsize">end</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="bold"/>
-                                                  <attribute name="scale" value="1.2"/>
-                                                </attributes>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label_wired_status">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Cable unplugged</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment_wired_switch">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <child>
-                                              <object class="GtkSwitch" id="device_wired_off_switch">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="halign">end</property>
-                                                <property name="valign">start</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_slaves">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Slaves</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_slaves">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_dns">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="yalign">0</property>
-                                            <property name="label" translatable="yes">DNS</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">10</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_dns">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                            <property name="wrap">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">10</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_route">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Default Route</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">9</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_route">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">9</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_subnet">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Subnet Mask</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">8</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_subnet">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">8</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_ipv6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IPv6 Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_ipv6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">::1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_ipv4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IPv4 Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_ipv4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Speed</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">1 Mb/s</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_mac">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Hardware Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_mac">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">AA:BB:CC:DD:55:66:77:88</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_parent">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Parent</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wired_vlanid">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Vlan ID</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_parent">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wired_vlanid">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkGrid" id="alignment1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_top">12</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">True</property>
-                                        <child>
-                                          <object class="GtkButton" id="button_wired_options">
-                                            <property name="label" translatable="yes">C_onfigure...</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">end</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child type="tab">
-                                  <object class="GtkLabel" id="label5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">wired</property>
-                                  </object>
-                                  <packing>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="vbox5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="border_width">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkGrid" id="grid2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">start</property>
-                                        <property name="row_spacing">10</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_wireless_device">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <property name="xalign">1</property>
-                                            <property name="pixel_size">48</property>
-                                            <property name="icon_name">network-wireless</property>
-                                            <property name="icon-size">6</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox3">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="valign">start</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="spacing">3</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label_wireless_device">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Wireless</property>
-                                                <property name="ellipsize">end</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="bold"/>
-                                                  <attribute name="scale" value="1.2"/>
-                                                </attributes>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label_wireless_status">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Not connected</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_mac">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Hardware Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Speed</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_ipv4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IPv4 Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_ipv6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IPv6 Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_route">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Default Route</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_dns">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="yalign">0</property>
-                                            <property name="label" translatable="yes">DNS</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">8</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_mac">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">AA:BB:CC:DD:55:66:77:88</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">1 Mb/s</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_ipv4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_ipv6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">::1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_route">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_dns">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                            <property name="wrap">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">8</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment_wireless_switch">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <child>
-                                              <object class="GtkSwitch" id="device_wireless_off_switch">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="halign">end</property>
-                                                <property name="valign">start</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_security">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Security</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_wireless_network_name">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Network Name</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">combobox_wireless_network_name</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_hotspot_network_name">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Network Name</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">9</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_hotspot_security_key">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Security Key</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">10</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_wireless_security">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">WPA</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" id="combobox_wireless_network_name">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="model">liststore_wireless_network</property>
-                                            <property name="has_entry">True</property>
-                                            <property name="entry_text_column">1</property>
-                                            <child internal-child="entry">
-                                              <object class="GtkEntry" id="combobox-entry4">
-                                                <property name="can_focus">False</property>
-                                                <property name="invisible_char">●</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_hotspot_network_name">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">My Hot Spot</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">9</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_hotspot_security_key">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">My Secret</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">10</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkGrid" id="alignment2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_top">12</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">True</property>
-                                        <child>
-                                          <object class="GtkButton" id="start_hotspot_button">
-                                            <property name="label" translatable="yes">_Use as Hotspot...</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">end</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton" id="stop_hotspot_button">
-                                            <property name="label" translatable="yes">_Stop Hotspot...</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">end</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton" id="button_wireless_options">
-                                            <property name="label" translatable="yes">_Configure...</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">end</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child type="tab">
-                                  <object class="GtkLabel" id="label16">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">wireless</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="vbox7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="border_width">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkGrid" id="grid3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">start</property>
-                                        <property name="row_spacing">10</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_mobilebb_device">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <property name="xalign">1</property>
-                                            <property name="pixel_size">48</property>
-                                            <property name="icon_name">network-cellular-connected-symbolic</property>
-                                            <property name="icon-size">6</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox11">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="valign">start</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="spacing">3</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label_mobilebb_device">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Mobile Broadband</property>
-                                                <property name="ellipsize">end</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="bold"/>
-                                                  <attribute name="scale" value="1.2"/>
-                                                </attributes>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label_mobilebb_status">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Not connected</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_imei">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IMEI</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Speed</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_provider">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Provider</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_imei">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">1234567890</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">1 Mb/s</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_provider">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">SuperTel Supremo	</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_ipv4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">127.0.0.1</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_ipv6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_route">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_mobilebb_dns">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment_mobilebb_switch">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_ipv4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IP Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_ipv6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">IPv6 Address</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_route">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Default Route</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_mobilebb_dns">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="yalign">0</property>
-                                            <property name="label" translatable="yes">DNS</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="top_padding">12</property>
-                                        <child>
-                                          <object class="GtkButton" id="button_mobilebb_options">
-                                            <property name="label" translatable="yes">_Configure...</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child type="tab">
-                                  <object class="GtkLabel" id="label17">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">mobilebb</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">2</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="vbox9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="border_width">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkGrid" id="grid4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">start</property>
-                                        <property name="row_spacing">10</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_vpn_device">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <property name="xalign">1</property>
-                                            <property name="pixel_size">48</property>
-                                            <property name="icon_name">network-vpn</property>
-                                            <property name="icon-size">6</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox12">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="valign">start</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="spacing">3</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label_vpn_device">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">VPN</property>
-                                                <property name="ellipsize">end</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="bold"/>
-                                                  <attribute name="scale" value="1.2"/>
-                                                </attributes>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label_vpn_status">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Not connected</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_vpn_service_type">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">VPN Type</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_vpn_gateway">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Gateway</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_vpn_group_name">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Group Name</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_vpn_group_password">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Group Password</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_vpn_username">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Username</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_vpn_service_type">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">openvpn</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_vpn_gateway">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">AA:BB:CC:DD:55:66:77:88</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_vpn_group_name">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">SEKRIT</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_vpn_group_password">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">**********</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_vpn_username">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">smithy</property>
-                                            <property name="selectable">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment_vpn_switch">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="top_padding">12</property>
-                                        <child>
-                                          <object class="GtkButton" id="button_vpn_options">
-                                            <property name="label" translatable="yes">_Configure...</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                                <child type="tab">
-                                  <object class="GtkLabel" id="label55">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">vpn</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">3</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="vbox8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="border_width">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkGrid" id="grid5">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">start</property>
-                                        <property name="row_spacing">10</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_proxy_device">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <property name="xalign">1</property>
-                                            <property name="pixel_size">48</property>
-                                            <property name="icon_name">preferences-system-network</property>
-                                            <property name="icon-size">6</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox13">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="valign">start</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="spacing">3</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label_proxy_device">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Proxy</property>
-                                                <property name="ellipsize">end</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="bold"/>
-                                                  <attribute name="scale" value="1.2"/>
-                                                </attributes>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label_proxy_status">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label">Not connected</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment_proxy_switch">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_proxy_method">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Method</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">combobox_proxy_mode</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" id="combobox_proxy_mode">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_proxy_url">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Configuration URL</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">entry_proxy_url</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="entry_proxy_url">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">2</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_proxy_http">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">HTTP _Proxy</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">entry_proxy_http</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_proxy_https">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">H_TTPS Proxy</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">entry_proxy_https</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_proxy_ftp">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_FTP Proxy</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">entry_proxy_ftp</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="heading_proxy_socks">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Socks Host</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">entry_proxy_socks</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label_proxy_warning">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">WPAD warning...</property>
-                                            <property name="wrap">True</property>
-                                            <property name="width_chars">50</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">3</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="entry_proxy_http">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="spinbutton_proxy_http">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="xalign">1</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="entry_proxy_https">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="entry_proxy_ftp">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="entry_proxy_socks">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="spinbutton_proxy_https">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="xalign">1</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="spinbutton_proxy_ftp">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="xalign">1</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">5</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="spinbutton_proxy_socks">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">●</property>
-                                            <property name="xalign">1</property>
-                                            <property name="invisible_char_set">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">1</property>
-                                            <property name="height">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
-                                <child type="tab">
-                                  <object class="GtkLabel" id="label46">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">proxy</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">4</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="vboxNodevice">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="border_width">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">No network devices available</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">5</property>
-                                  </packing>
-                                </child>
-                                <child type="tab">
-                                  <object class="GtkLabel" id="label1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">nodevice</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">5</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox54">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkButton" id="button_unlock">
-                            <property name="label" translatable="yes">Unloc_k</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox_flight_mode">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">3</property>
-                            <child>
-                              <object class="GtkLabel" id="label_flight_mode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Airplane Mode</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box_hostname">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_top">10</property>
-                        <property name="spacing">5</property>
-                        <child>
-                          <object class="GtkLabel" id="label_hostname">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Hostname:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">entry_hostname</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry_hostname">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">●</property>
-                            <property name="width_chars">35</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkDialog" id="secret_agent_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -2514,11 +2365,11 @@ updates available for you.</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Network|Authentication Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <property name="image_position">right</property>
               </object>
               <packing>
@@ -2529,11 +2380,11 @@ updates available for you.</property>
             </child>
             <child>
               <object class="GtkButton" id="connect_button">
-                <property name="label">gtk-connect</property>
+                <property name="label" translatable="yes" context="GUI|Network|Authentication Dialog">C_onnect</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2564,7 +2415,7 @@ updates available for you.</property>
                 <property name="valign">start</property>
                 <property name="hexpand">True</property>
                 <property name="xpad">15</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="icon_name">dialog-password-symbolic</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2584,8 +2435,10 @@ updates available for you.</property>
                     <property name="halign">start</property>
                     <property name="margin_bottom">6</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Authentication required by wireless network&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Authentication required by wireless network</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/password.glade b/anaconda/pyanaconda/ui/gui/spokes/password.glade
index 392299f..158f871 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/password.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/password.glade
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.6"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="AnacondaSpokeWindow" id="passwordWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">ROOT PASSWORD</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
@@ -68,16 +67,13 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Root Password:</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes" context="GUI|Password">_Root Password:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">pw</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -85,16 +81,13 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Confirm:</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes" context="GUI|Password">_Confirm:</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">confirm</property>
+                        <property name="mnemonic_widget">confirmPW</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -104,27 +97,33 @@
                         <property name="visibility">False</property>
                         <property name="invisible_char">●</property>
                         <signal name="changed" handler="_updatePwQuality" swapped="no"/>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="pw-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Password</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkEntry" id="confirm">
+                      <object class="GtkEntry" id="confirmPW">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
                         <property name="invisible_char">●</property>
                         <property name="activates_default">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="confirmPW-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Confirm Password</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -136,8 +135,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -181,8 +178,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -196,7 +191,6 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                         <property name="width">2</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -220,5 +214,10 @@
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="passwordWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">ROOT PASSWORD</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/password.glade.orig b/anaconda/pyanaconda/ui/gui/spokes/password.glade.orig
new file mode 100644
index 0000000..392299f
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/password.glade.orig
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.6 -->
+  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <object class="AnacondaSpokeWindow" id="passwordWindow">
+    <property name="startup_id">filler</property>
+    <property name="can_focus">False</property>
+    <property name="startup_id">filler</property>
+    <property name="window_name" translatable="yes">ROOT PASSWORD</property>
+    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
+    <child internal-child="main_box">
+      <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="nav_box">
+          <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
+            <child internal-child="nav_area">
+              <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
+                <property name="can_focus">False</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
+                <property name="margin_top">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="alignment">
+          <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
+            <property name="can_focus">False</property>
+            <property name="yalign">0</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0.5</property>
+            <child internal-child="action_area">
+              <object class="GtkBox" id="AnacondaSpokeWindow-action_area1">
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkCheckButton" id="lock">
+                    <property name="label" translatable="yes">Lock root account</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="clicked" handler="on_lock_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="pwgrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="pwlabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Root Password:</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">pw</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="confirmlabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Confirm:</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">confirm</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="pw">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="visibility">False</property>
+                        <property name="invisible_char">●</property>
+                        <signal name="changed" handler="_updatePwQuality" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="confirm">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="visibility">False</property>
+                        <property name="invisible_char">●</property>
+                        <property name="activates_default">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="capslock">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLevelBar" id="password_bar">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="value">2</property>
+                            <property name="max_value">4</property>
+                            <property name="mode">discrete</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="password_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="xpad">6</property>
+                            <property name="label" translatable="yes">empty password</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="details">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">The root account is used for administering the system.  Enter a password for the root user.</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/password.py b/anaconda/pyanaconda/ui/gui/spokes/password.py
index 0b4c9c9..ebb4ba5 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/password.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/password.py
@@ -1,6 +1,6 @@
 # root password spoke class
 #
-# Copyright (C) 2012 Red Hat, Inc.
+# Copyright (C) 2012-2014 Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -17,36 +17,42 @@
 # Red Hat, Inc.
 #
 # Red Hat Author(s): Jesse Keating <jkeating@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
 #
 
-from pyanaconda.i18n import _, N_
+from pyanaconda.flags import flags
+from pyanaconda.i18n import _, CN_
 from pyanaconda.users import cryptPassword, validatePassword
 
-from pyanaconda.ui.gui import GUICheck
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui.categories.user_settings import UserSettingsCategory
+from pyanaconda.ui.categories.user_settings import UserSettingsCategory
+from pyanaconda.ui.gui.helpers import GUISpokeInputCheckHandler
 from pyanaconda.ui.common import FirstbootSpokeMixIn
+from pyanaconda.ui.helpers import InputCheck
 
 from pyanaconda.constants import PASSWORD_EMPTY_ERROR, PASSWORD_CONFIRM_ERROR_GUI,\
         PASSWORD_STRENGTH_DESC, PASSWORD_WEAK, PASSWORD_WEAK_WITH_ERROR,\
-        PASSWORD_WEAK_CONFIRM, PASSWORD_WEAK_CONFIRM_WITH_ERROR
+        PASSWORD_WEAK_CONFIRM, PASSWORD_WEAK_CONFIRM_WITH_ERROR, PW_ASCII_CHARS, PASSWORD_ASCII
 
 __all__ = ["PasswordSpoke"]
 
 
-class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
+class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
     builderObjects = ["passwordWindow"]
 
     mainWidgetName = "passwordWindow"
+    focusWidgetName = "pw"
     uiFile = "spokes/password.glade"
+    helpFile = "PasswordSpoke.xml"
 
     category = UserSettingsCategory
 
     icon = "dialog-password-symbolic"
-    title = N_("_ROOT PASSWORD")
+    title = CN_("GUI|Spoke", "_ROOT PASSWORD")
 
     def __init__(self, *args):
         NormalSpoke.__init__(self, *args)
+        GUISpokeInputCheckHandler.__init__(self)
         self._lock = self.data.rootpw.lock
         self._kickstarted = False
 
@@ -54,13 +60,14 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
         NormalSpoke.initialize(self)
         # place holders for the text boxes
         self.pw = self.builder.get_object("pw")
-        self.confirm = self.builder.get_object("confirm")
+        self.confirm = self.builder.get_object("confirmPW")
         self.lock = self.builder.get_object("lock")
 
         # Install the password checks:
         # - Has a password been specified?
         # - If a password has been specified and there is data in the confirm box, do they match?
         # - How strong is the password?
+        # - Does the password contain non-ASCII characters?
         # - Is there any data in the confirm box?
         self.add_check(self.pw, self._checkPasswordEmpty)
 
@@ -73,14 +80,16 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self._confirm_check = self.add_check(self.confirm, self._checkPasswordConfirm)
         self._password_check = self.add_check(self.pw, self._checkPasswordConfirm)
 
-        # Keep a reference for this check, since it has to be manually run for the
+        # Keep a reference for these checks, since they have to be manually run for the
         # click Done twice check.
         self._pwStrengthCheck = self.add_check(self.pw, self._checkPasswordStrength)
+        self._pwASCIICheck = self.add_check(self.pw, self._checkPasswordASCII)
 
         self.add_check(self.confirm, self._checkPasswordEmpty)
 
-        # Counter for the click Done twice check override
-        self._waivePasswordClicks = 0
+        # Counters for checks that ask the user to click Done to confirm
+        self._waiveStrengthClicks = 0
+        self._waiveASCIIClicks = 0
 
         # Password validation data
         self._pwq_error = None
@@ -102,7 +111,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def refresh(self):
         # Enable the input checks in case they were disabled on the last exit
         for check in self.checks:
-            check.enable()
+            check.enabled = True
         self.lock.set_active(self._lock)
         self.on_lock_clicked(self.lock)
         self.pw.emit("changed")
@@ -138,15 +147,16 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
     def apply(self):
         pw = self.pw.get_text()
-        if pw:
-            self.data.rootpw.password = cryptPassword(pw)
-            self.data.rootpw.isCrypted = True
-        self.data.rootpw.lock = self._lock
 
         # value from the kickstart changed
         self.data.rootpw.seen = False
         self._kickstarted = False
 
+        if pw:
+            self.data.rootpw.password = cryptPassword(pw)
+            self.data.rootpw.isCrypted = True
+        self.data.rootpw.lock = self._lock
+
         self.pw.set_placeholder_text("")
         self.confirm.set_placeholder_text("")
 
@@ -154,30 +164,29 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def completed(self):
         return bool(self.data.rootpw.password or self.data.rootpw.lock)
 
-    def _checkPasswordEmpty(self, editable, data):
+    @property
+    def sensitive(self):
+        return not (self.completed and flags.automatedInstall
+                    and self.data.rootpw.seen)
+
+    def _checkPasswordEmpty(self, inputcheck):
         """Check whether a password has been specified at all."""
 
         # If the password was set by kickstart, skip this check
         if self._kickstarted:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
 
-        if not editable.get_text():
-            if editable == self.pw:
+        if not self.get_input(inputcheck.input_obj):
+            if inputcheck.input_obj == self.pw:
                 return _(PASSWORD_EMPTY_ERROR)
             else:
                 return _(PASSWORD_CONFIRM_ERROR_GUI)
         else:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
 
-    def _checkPasswordConfirm(self, editable=None, reset_status=None):
+    def _checkPasswordConfirm(self, inputcheck):
         """Check whether the password matches the confirmation data."""
 
-        # This check is triggered by changes to either the password field or the
-        # confirmation field. If this method is being run from a successful check
-        # to reset the status, just return success
-        if reset_status:
-            return GUICheck.CHECK_OK
-
         pw = self.pw.get_text()
         confirm = self.confirm.get_text()
         lock = self.lock.get_active()
@@ -191,18 +200,21 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         # Skip the check if no password is required
         elif (not pw and not confirm) and self._kickstarted:
-            result = GUICheck.CHECK_OK
+            result = InputCheck.CHECK_OK
         elif confirm and (pw != confirm):
             result = _(PASSWORD_CONFIRM_ERROR_GUI)
         else:
-            result = GUICheck.CHECK_OK
+            result = InputCheck.CHECK_OK
 
         # If the check succeeded, reset the status of the other check object
-        if result == GUICheck.CHECK_OK:
-            if editable == self.confirm:
-                self._password_check.update_check_status(check_data=True)
+        # Disable the current check to prevent a cycle
+        inputcheck.enabled = False
+        if result == InputCheck.CHECK_OK:
+            if inputcheck == self._confirm_check:
+                self._password_check.update_check_status()
             else:
-                self._confirm_check.update_check_status(check_data=True)
+                self._confirm_check.update_check_status()
+        inputcheck.enabled = True
 
         return result
 
@@ -215,8 +227,9 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         pwtext = self.pw.get_text()
 
-        # Reset the counter used for the "press Done twice" logic
-        self._waivePasswordClicks = 0
+        # Reset the counters used for the "press Done twice" logic
+        self._waiveStrengthClicks = 0
+        self._waiveASCIIClicks = 0
 
         self._pwq_valid, strength, self._pwq_error = validatePassword(pwtext, "root")
 
@@ -235,7 +248,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self.pw_bar.set_value(val)
         self.pw_label.set_text(text)
 
-    def _checkPasswordStrength(self, editable=None, data=None):
+    def _checkPasswordStrength(self, inputcheck):
         """Update the error message based on password strength.
 
            Convert the strength set by _updatePwQuality into an error message.
@@ -246,7 +259,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         # Skip the check if no password is required
         if (not pw and not confirm) and self._kickstarted:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
 
         # Check for validity errors
         if (not self._pwq_valid) and (self._pwq_error):
@@ -256,9 +269,9 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         if pwstrength < 2:
             # If Done has been clicked twice, waive the check
-            if self._waivePasswordClicks > 1:
-                return GUICheck.CHECK_OK
-            elif self._waivePasswordClicks == 1:
+            if self._waiveStrengthClicks > 1:
+                return InputCheck.CHECK_OK
+            elif self._waiveStrengthClicks == 1:
                 if self._pwq_error:
                     return _(PASSWORD_WEAK_CONFIRM_WITH_ERROR) % self._pwq_error
                 else:
@@ -269,16 +282,40 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
                 else:
                     return _(PASSWORD_WEAK)
         else:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
+
+    def _checkPasswordASCII(self, inputcheck):
+        """Set an error message if the password contains non-ASCII characters.
+
+           Like the password strength check, this check can be bypassed by
+           pressing Done twice.
+        """
+
+        # If Done has been clicked, waive the check
+        if self._waiveASCIIClicks > 0:
+            return InputCheck.CHECK_OK
+
+        password = self.get_input(inputcheck.input_obj)
+        if password and any(char not in PW_ASCII_CHARS for char in password):
+            return _(PASSWORD_ASCII)
+
+        return InputCheck.CHECK_OK
 
     def on_back_clicked(self, button):
-        # Add a click and re-check the password strength
-        self._waivePasswordClicks += 1
-        self._pwStrengthCheck.update_check_status()
+        # If the failed check is for password strenght or non-ASCII
+        # characters, add a click to the counter and check again
+        failed_check = next(self.failed_checks_with_message, None)
+        if failed_check == self._pwStrengthCheck:
+            self._waiveStrengthClicks += 1
+            self._pwStrengthCheck.update_check_status()
+        elif failed_check == self._pwASCIICheck:
+            self._waiveASCIIClicks += 1
+            self._pwASCIICheck.update_check_status()
 
         # If neither the password nor the confirm field are set, skip the checks
         if (not self.pw.get_text()) and (not self.confirm.get_text()):
             for check in self.checks:
-                check.disable()
+                check.enabled = False
 
-        NormalSpoke.on_back_clicked(self, button)
+        if GUISpokeInputCheckHandler.on_back_clicked(self, button):
+            NormalSpoke.on_back_clicked(self, button)
diff --git a/anaconda/pyanaconda/ui/gui/spokes/software.glade b/anaconda/pyanaconda/ui/gui/spokes/software.glade
index 8f1242c..5818fea 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/software.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/software.glade
@@ -1,38 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
-  <object class="GtkListStore" id="addonStore">
-    <columns>
-      <!-- column-name addonSelected -->
-      <column type="gboolean"/>
-      <!-- column-name addonMarkup -->
-      <column type="gchararray"/>
-      <!-- column-name addonName -->
-      <column type="gchararray"/>
-      <!-- column-name addonSeparator -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="environmentStore">
-    <columns>
-      <!-- column-name envSelected -->
-      <column type="gboolean"/>
-      <!-- column-name envMarkup -->
-      <column type="gchararray"/>
-      <!-- column-name envName -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
+  <requires lib="gtk+" version="3.10"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="AnacondaSpokeWindow" id="softwareWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">SOFTWARE SELECTION</property>
-    <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
+    <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
         <property name="can_focus">False</property>
@@ -95,8 +72,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -115,8 +90,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -128,51 +101,16 @@
                         <property name="hscrollbar_policy">never</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTreeView" id="addonView">
+                          <object class="GtkViewport" id="addonViewport">
+                            <property name="width_request">250</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="border_width">12</property>
-                            <property name="model">addonStore</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="search_column">0</property>
-                            <signal name="button-release-event" handler="on_addon_view_clicked" swapped="no"/>
-                            <signal name="key-release-event" handler="on_addon_view_clicked" swapped="no"/>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="addonSelector"/>
-                            </child>
+                            <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkTreeViewColumn" id="addonSelectedCol">
-                                <property name="title" translatable="no">Selected</property>
-                                <signal name="clicked" handler="on_addon_toggled" swapped="no"/>
-                                <child>
-                                  <object class="GtkCellRendererToggle" id="addonSelectedRenderer">
-                                    <property name="yalign">0</property>
-                                    <signal name="toggled" handler="on_addon_toggled" swapped="no"/>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="addonDescCol">
-                                <property name="title" translatable="yes">column</property>
-                                <property name="expand">True</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="addonDescRenderer">
-                                    <property name="width">250</property>
-                                    <property name="yalign">0</property>
-                                    <property name="wrap_mode">word-char</property>
-                                    <property name="wrap_width">200</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="markup">1</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkListBox" id="addonListBox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <signal name="row-activated" handler="on_addon_activated" swapped="no"/>
                               </object>
                             </child>
                           </object>
@@ -181,64 +119,28 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkScrolledWindow" id="environmentScrolledWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="events">GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTreeView" id="environmentView">
+                          <object class="GtkViewport" id="environmentViewport">
+                            <property name="width_request">250</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="border_width">12</property>
-                            <property name="model">environmentStore</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="search_column">0</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="environmentSelector">
-                                <signal name="changed" handler="on_environment_selection_changed" swapped="no"/>
-                              </object>
-                            </child>
+                            <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkTreeViewColumn" id="environmentSelectedCol">
-                                <property name="title" translatable="yes">column</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" id="environmentSelectedRenderer">
-                                    <property name="yalign">0</property>
-                                    <property name="radio">True</property>
-                                    <signal name="toggled" handler="on_environment_toggled" swapped="no"/>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="environmentDescCol">
-                                <property name="title" translatable="yes">column</property>
-                                <property name="expand">True</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="environmentDescRenderer">
-                                    <property name="width">250</property>
-                                    <property name="yalign">0</property>
-                                    <property name="wrap_mode">word-char</property>
-                                    <property name="wrap_width">200</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="markup">1</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkListBox" id="environmentListBox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <signal name="row-activated" handler="on_environment_activated" swapped="no"/>
                               </object>
                             </child>
                           </object>
@@ -247,8 +149,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/software.py b/anaconda/pyanaconda/ui/gui/spokes/software.py
index 6c76abc..8fa17cc 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/software.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/software.py
@@ -19,19 +19,22 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
-from gi.repository import Gdk
+from gi.repository import Gtk, Pango
 
 from pyanaconda.flags import flags
-from pyanaconda.i18n import _, N_
-from pyanaconda.packaging import MetadataError
+from pyanaconda.i18n import _, C_, CN_
+from pyanaconda.packaging import PackagePayload, payloadMgr
 from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda import constants
 
 from pyanaconda.ui.communication import hubQ
 from pyanaconda.ui.gui.spokes import NormalSpoke
 from pyanaconda.ui.gui.spokes.lib.detailederror import DetailedErrorDialog
-from pyanaconda.ui.gui.utils import enlightbox, gtk_action_wait
-from pyanaconda.ui.gui.categories.software import SoftwareCategory
+from pyanaconda.ui.gui.utils import gtk_action_wait, escape_markup
+from pyanaconda.ui.categories.software import SoftwareCategory
+
+import logging
+log = logging.getLogger("anaconda")
 
 import sys
 
@@ -41,11 +44,12 @@ class SoftwareSelectionSpoke(NormalSpoke):
     builderObjects = ["addonStore", "environmentStore", "softwareWindow"]
     mainWidgetName = "softwareWindow"
     uiFile = "spokes/software.glade"
+    helpFile = "SoftwareSpoke.xml"
 
     category = SoftwareCategory
 
     icon = "package-x-generic-symbolic"
-    title = N_("_SOFTWARE SELECTION")
+    title = CN_("GUI|Spoke", "_SOFTWARE SELECTION")
 
     # Add-on selection states
     # no user interaction with this add-on
@@ -65,15 +69,8 @@ class SoftwareSelectionSpoke(NormalSpoke):
         self.excludedGroups = []
         self.environment = None
 
-        self._addonStore = self.builder.get_object("addonStore")
-        self._environmentStore = self.builder.get_object("environmentStore")
-
-        # Used to determine which add-ons to display for each environment.
-        # The dictionary keys are environment IDs. The dictionary values are two-tuples
-        # consisting of lists of add-on group IDs. The first list is the add-ons specific
-        # to the environment, and the second list is the other add-ons possible for the
-        # environment.
-        self._environmentAddons = {}
+        self._environmentListBox = self.builder.get_object("environmentListBox")
+        self._addonListBox = self.builder.get_object("addonListBox")
 
         # Used to store how the user has interacted with add-ons for the default add-on
         # selection logic. The dictionary keys are group IDs, and the values are selection
@@ -84,12 +81,28 @@ class SoftwareSelectionSpoke(NormalSpoke):
         self._origAddons = []
         self._origEnvironment = None
 
-        # We need to tell the addon view whether something is a separator or not.
-        self.builder.get_object("addonView").set_row_separator_func(self._addon_row_is_separator, None)
+        # Register event listeners to update our status on payload events
+        payloadMgr.addListener(payloadMgr.STATE_PACKAGE_MD, self._downloading_package_md)
+        payloadMgr.addListener(payloadMgr.STATE_GROUP_MD, self._downloading_group_md)
+        payloadMgr.addListener(payloadMgr.STATE_FINISHED, self._payload_finished)
+        payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error)
+
+    # Payload event handlers
+    def _downloading_package_md(self):
+        hubQ.send_message(self.__class__.__name__, _("Downloading package metadata..."))
+
+    def _downloading_group_md(self):
+        hubQ.send_message(self.__class__.__name__, _("Downloading group metadata..."))
+
+    def _payload_finished(self):
+        self.environment = self.data.packages.environment
+
+    def _payload_error(self):
+        hubQ.send_message(self.__class__.__name__, payloadMgr.error)
 
     def _apply(self):
-        row = self._get_selected_environment()
-        if not row:
+        env = self._get_selected_environment()
+        if not env:
             return
 
         addons = self._get_selected_addons()
@@ -99,8 +112,8 @@ class SoftwareSelectionSpoke(NormalSpoke):
 
         self._selectFlag = False
         self.payload.data.packages.groupList = []
-        self.payload.selectEnvironment(row[2])
-        self.environment = row[2]
+        self.payload.selectEnvironment(env)
+        self.environment = env
         for group in self.selectedGroups:
             self.payload.selectGroup(group)
 
@@ -135,24 +148,27 @@ class SoftwareSelectionSpoke(NormalSpoke):
 
     @property
     def completed(self):
-        processingDone = not threadMgr.get(constants.THREAD_CHECK_SOFTWARE) and \
-                         not self._errorMsgs and self.txid_valid
+        processingDone = bool(not threadMgr.get(constants.THREAD_CHECK_SOFTWARE) and
+                              not threadMgr.get(constants.THREAD_PAYLOAD) and
+                              not self._errorMsgs and self.txid_valid)
 
+        # we should always check processingDone before checking the other variables,
+        # as they might be inconsistent until processing is finished
         if flags.automatedInstall:
             return processingDone and self.data.packages.seen
         else:
-            return self._get_selected_environment() is not None and processingDone
+            return processingDone and self._get_selected_environment() is not None
 
     @property
     def changed(self):
-        row = self._get_selected_environment()
-        if not row:
+        env = self._get_selected_environment()
+        if not env:
             return True
 
         addons = self._get_selected_addons()
 
         # Don't redo dep solving if nothing's changed.
-        if row[2] == self._origEnvironment and set(addons) == set(self._origAddons) and \
+        if env == self._origEnvironment and set(addons) == set(self._origAddons) and \
            self.txid_valid:
             return False
 
@@ -170,13 +186,13 @@ class SoftwareSelectionSpoke(NormalSpoke):
         # repo metadata from the mirror list, or we detected a DVD/CD.
 
         return bool(not threadMgr.get(constants.THREAD_SOFTWARE_WATCHER) and
-                    not threadMgr.get(constants.THREAD_PAYLOAD_MD) and
+                    not threadMgr.get(constants.THREAD_PAYLOAD) and
                     not threadMgr.get(constants.THREAD_CHECK_SOFTWARE) and
                     self.payload.baseRepo is not None)
 
     @property
     def showable(self):
-        return not flags.livecdInstall and not self.data.method.method == "liveimg"
+        return isinstance(self.payload, PackagePayload)
 
     @property
     def status(self):
@@ -189,8 +205,8 @@ class SoftwareSelectionSpoke(NormalSpoke):
         if not self.txid_valid:
             return _("Source changed - please verify")
 
-        row = self._get_selected_environment()
-        if not row:
+        env = self._get_selected_environment()
+        if not env:
             # Kickstart installs with %packages will have a row selected, unless
             # they did an install without a desktop environment.  This should
             # catch that one case.
@@ -199,7 +215,7 @@ class SoftwareSelectionSpoke(NormalSpoke):
 
             return _("Nothing selected")
 
-        return self.payload.environmentDescription(row[2])[0]
+        return self.payload.environmentDescription(env)[0]
 
     def initialize(self):
         NormalSpoke.initialize(self)
@@ -207,44 +223,17 @@ class SoftwareSelectionSpoke(NormalSpoke):
                       target=self._initialize))
 
     def _initialize(self):
-        hubQ.send_message(self.__class__.__name__, _("Downloading package metadata..."))
-
         threadMgr.wait(constants.THREAD_PAYLOAD)
 
-        hubQ.send_message(self.__class__.__name__, _("Downloading group metadata..."))
-
-        # we have no way to select environments with kickstart right now
-        # so don't try.
-        if flags.automatedInstall and self.data.packages.seen:
-            # We don't want to do a full refresh, just join the metadata thread
-            threadMgr.wait(constants.THREAD_PAYLOAD_MD)
-        else:
-            # Grabbing the list of groups could potentially take a long time
-            # at first (yum does a lot of magic property stuff, some of which
-            # involves side effects like network access.  We need to reference
-            # them here, outside of the main thread, to not block the UI.
-            try:
-                # pylint: disable-msg=W0104
-                self.payload.environments
-                # pylint: disable-msg=W0104
-                self.payload.groups
-
-                # Parse the environments and groups into the form we want
-                self._parseEnvironments()
-            except MetadataError:
-                hubQ.send_message(self.__class__.__name__,
-                                  _("No installation source available"))
-                return
-
-            # And then having done all that slow downloading, we need to do the first
-            # refresh of the UI here so there's an environment selected by default.
-            # This happens inside the main thread by necessity.  We can't do anything
-            # that takes any real amount of time, or it'll block the UI from updating.
+        if not flags.automatedInstall or not self.data.packages.seen:
+            # having done all the slow downloading, we need to do the first refresh
+            # of the UI here so there's an environment selected by default.  This
+            # happens inside the main thread by necessity.  We can't do anything
+            # that takes any real amount of time, or it'll block the UI from
+            # updating.
             if not self._first_refresh():
                 return
 
-        self.payload.release()
-
         hubQ.send_ready(self.__class__.__name__, False)
 
         # If packages were provided by an input kickstart file (or some other means),
@@ -252,19 +241,6 @@ class SoftwareSelectionSpoke(NormalSpoke):
         self._apply()
 
     def _parseEnvironments(self):
-        self._environmentAddons = {}
-
-        for environment in self.payload.environments:
-            self._environmentAddons[environment] = ([], [])
-
-            # Determine which groups are specific to this environment and which other groups
-            # are available in this environment.
-            for grp in self.payload.groups:
-                if self.payload.environmentHasOption(environment, grp):
-                    self._environmentAddons[environment][0].append(grp)
-                elif self.payload._isGroupVisible(grp) and self.payload._groupHasInstallableMembers(grp):
-                    self._environmentAddons[environment][1].append(grp)
-
         # Set all of the add-on selection states to the default
         self._addonStates = {}
         for grp in self.payload.groups:
@@ -272,64 +248,84 @@ class SoftwareSelectionSpoke(NormalSpoke):
 
     @gtk_action_wait
     def _first_refresh(self):
-        try:
-            self.refresh()
-            return True
-        except MetadataError:
-            hubQ.send_message(self.__class__.__name__, _("No installation source available"))
-            return False
+        self.refresh()
+        return True
+
+    def _add_row(self, listbox, name, desc, button, clicked):
+        row = Gtk.ListBoxRow()
+        box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6)
+
+        button.set_valign(Gtk.Align.START)
+        button.connect("toggled", clicked, row)
+        box.add(button)
+
+        label = Gtk.Label(label="<b>%s</b>\n%s" % (escape_markup(name), escape_markup(desc)),
+                          use_markup=True, wrap=True, wrap_mode=Pango.WrapMode.WORD_CHAR,
+                          hexpand=True, xalign=0, yalign=0.5)
+        box.add(label)
+
+        row.add(box)
+        listbox.insert(row, -1)
 
     def refresh(self):
         NormalSpoke.refresh(self)
 
-        threadMgr.wait(constants.THREAD_PAYLOAD_MD)
+        threadMgr.wait(constants.THREAD_PAYLOAD)
 
-        self._environmentStore.clear()
         if self.environment not in self.payload.environments:
             self.environment = None
 
         firstEnvironment = True
+        firstRadio = None
+
+        self._clear_listbox(self._environmentListBox)
+
         for environment in self.payload.environments:
             (name, desc) = self.payload.environmentDescription(environment)
 
-            itr = self._environmentStore.append([environment == self.environment, "<b>%s</b>\n%s" % (name, desc), environment])
-            # Either:
-            # (1) Select the environment given by kickstart or selected last
-            #     time this spoke was displayed; or
-            # (2) Select the first environment given by display order as the
-            #     default if nothing is selected.
-            if (environment == self.environment) or \
-               (not self.environment and firstEnvironment):
+            radio = Gtk.RadioButton(group=firstRadio)
+
+            # automatically select an environment if this is an interactive install
+            active = environment == self.environment or \
+                     not flags.automatedInstall and not self.environment and firstEnvironment
+            radio.set_active(active)
+            if active:
                 self.environment = environment
-                sel = self.builder.get_object("environmentSelector")
-                sel.select_iter(itr)
+
+            self._add_row(self._environmentListBox, name, desc, radio,
+                    self.on_radio_button_toggled)
+            firstRadio = firstRadio or radio
 
             firstEnvironment = False
 
         self.refreshAddons()
-
-    def _addon_row_is_separator(self, model, itr, *args):
-        # The last column of the model tells us if this row is a separator or not.
-        return model[itr][3]
+        self._environmentListBox.show_all()
+        self._addonListBox.show_all()
 
     def _addAddon(self, grp):
         (name, desc) = self.payload.groupDescription(grp)
 
-        # If the add-on was previously selected by the user, select it
-        if self._addonStates[grp] == self._ADDON_SELECTED:
-            selected = True
-        # If the add-on was previously de-selected by the user, de-select it
-        elif self._addonStates[grp] == self._ADDON_DESELECTED:
-            selected = False
-        # Otherwise, use the default state
+        if grp in self._addonStates:
+            # If the add-on was previously selected by the user, select it
+            if self._addonStates[grp] == self._ADDON_SELECTED:
+                selected = True
+            # If the add-on was previously de-selected by the user, de-select it
+            elif self._addonStates[grp] == self._ADDON_DESELECTED:
+                selected = False
+            # Otherwise, use the default state
+            else:
+                selected = self.payload.environmentOptionIsDefault(self.environment, grp)
         else:
             selected = self.payload.environmentOptionIsDefault(self.environment, grp)
 
-        self._addonStore.append([selected, "<b>%s</b>\n%s" % (name, desc), grp, False])
+        check = Gtk.CheckButton()
+        check.set_active(selected)
+        self._add_row(self._addonListBox, name, desc, check, self.on_checkbox_toggled)
 
     def refreshAddons(self):
-        self._addonStore.clear()
-        if self.environment and (self.environment in self._environmentAddons):
+        if self.environment and (self.environment in self.payload.environmentAddons):
+            self._clear_listbox(self._addonListBox)
+
             # We have two lists:  One of addons specific to this environment,
             # and one of all the others.  The environment-specific ones will be displayed
             # first and then a separator, and then the generic ones.  This is to make it
@@ -340,13 +336,18 @@ class SoftwareSelectionSpoke(NormalSpoke):
             # state will be used. Otherwise, the add-on will be selected if it is a default
             # for this environment.
 
-            for grp in self._environmentAddons[self.environment][0]:
+            addSep = len(self.payload.environmentAddons[self.environment][0]) > 0 and \
+                     len(self.payload.environmentAddons[self.environment][1]) > 0
+
+            for grp in self.payload.environmentAddons[self.environment][0]:
                 self._addAddon(grp)
 
-            # This marks a separator in the view.
-            self._addonStore.append([False, "", "", True])
+            # This marks a separator in the view - only add it if there's both environment
+            # specific and generic addons.
+            if addSep:
+                self._addonListBox.insert(Gtk.Separator(), -1)
 
-            for grp in self._environmentAddons[self.environment][1]:
+            for grp in self.payload.environmentAddons[self.environment][1]:
                 self._addAddon(grp)
 
         self._selectFlag = True
@@ -356,106 +357,116 @@ class SoftwareSelectionSpoke(NormalSpoke):
         else:
             self.clear_info()
 
+    def _allAddons(self):
+        return self.payload.environmentAddons[self.environment][0] + \
+               [""] + \
+               self.payload.environmentAddons[self.environment][1]
+
     def _get_selected_addons(self):
-        return [row[2] for row in self._addonStore if row[0]]
+        retval = []
+
+        addons = self._allAddons()
+
+        for (ndx, row) in enumerate(self._addonListBox.get_children()):
+            box = row.get_children()[0]
+
+            if isinstance(box, Gtk.Separator):
+                continue
+
+            button = box.get_children()[0]
+            if button.get_active():
+                retval.append(addons[ndx])
+
+        return retval
 
-    # Returns the row in the store corresponding to what's selected on the
-    # left hand panel, or None if nothing's selected.
     def _get_selected_environment(self):
-        environmentView = self.builder.get_object("environmentView")
-        itr = environmentView.get_selection().get_selected()[1]
-        if not itr:
-            return None
+        # Returns the currently selected environment (self.environment
+        # is set in both initilize() and apply(), so we don't need to
+        # care about the state of the internal data model at all)
+        return self.environment
 
-        return self._environmentStore[itr]
+    def _clear_listbox(self, listbox):
+        for child in listbox.get_children():
+            listbox.remove(child)
+            del(child)
 
     @property
     def txid_valid(self):
         return self._tx_id == self.payload.txID
 
     # Signal handlers
-    def on_environment_toggled(self, renderer, path):
+    def on_checkbox_toggled(self, button, row):
+        row.activate()
+
+    def on_radio_button_toggled(self, radio, row):
+        # If the radio button toggled to inactive, don't reactivate the row
+        if not radio.get_active():
+            return
+        row.activate()
+
+    def on_environment_activated(self, listbox, row):
         if not self._selectFlag:
             return
 
-        # First, mark every row as unselected so the radio button on whatever
-        # row was previously selected will be cleared out.
-        for row in self._environmentStore:
-            row[0] = False
+        box = row.get_children()[0]
+        button = box.get_children()[0]
 
-        # Then, remove all the groups that were selected by the previously
+        button.handler_block_by_func(self.on_radio_button_toggled)
+        button.set_active(True)
+        button.handler_unblock_by_func(self.on_radio_button_toggled)
+
+        # Remove all the groups that were selected by the previously
         # selected environment.
-        for groupid in self.payload.environmentGroups(self.environment):
-            if groupid in self.selectedGroups:
-                self.selectedGroups.remove(groupid)
+        if self.environment:
+            for groupid in self.payload.environmentGroups(self.environment):
+                if groupid in self.selectedGroups:
+                    self.selectedGroups.remove(groupid)
 
         # Then mark the clicked environment as selected and update the screen.
-        self._environmentStore[path][0] = True
-        self.environment = self._environmentStore[path][2]
+        self.environment = self.payload.environments[row.get_index()]
         self.refreshAddons()
+        self._addonListBox.show_all()
 
-    def on_environment_selection_changed(self, selection):
-        (model, itr) = selection.get_selected()
-        if not itr:
+    def on_addon_activated(self, listbox, row):
+        box = row.get_children()[0]
+        if isinstance(box, Gtk.Separator):
             return
 
-        # Only do something if the row's not previously been selected.
-        if not model[itr][0]:
-            self.on_environment_toggled(None, model.get_path(itr))
+        button = box.get_children()[0]
+        addons = self._allAddons()
+        group = addons[row.get_index()]
 
-    def on_addon_toggled(self, renderer, path):
-        selected = not self._addonStore[path][0]
-        group = self._addonStore[path][2]
-        self._addonStore[path][0] = selected
-        if selected:
-            if group not in self.selectedGroups:
-                self.selectedGroups.append(group)
+        wasActive = group in self.selectedGroups
+
+        button.handler_block_by_func(self.on_checkbox_toggled)
+        button.set_active(not wasActive)
+        button.handler_unblock_by_func(self.on_checkbox_toggled)
+
+        if wasActive:
+            self.selectedGroups.remove(group)
+            self._addonStates[group] = self._ADDON_DESELECTED
+        else:
+            self.selectedGroups.append(group)
 
             if group in self.excludedGroups:
                 self.excludedGroups.remove(group)
 
             self._addonStates[group] = self._ADDON_SELECTED
 
-        else:
-            if group in self.selectedGroups:
-                self.selectedGroups.remove(group)
-
-            self._addonStates[group] = self._ADDON_DESELECTED
-
-    def on_addon_view_clicked(self, view, event, *args):
-        if event and not event.type in [Gdk.EventType.BUTTON_RELEASE, Gdk.EventType.KEY_RELEASE]:
-            return
-
-        if event and event.type == Gdk.EventType.KEY_RELEASE and \
-           event.keyval not in [Gdk.KEY_space, Gdk.KEY_Return, Gdk.KEY_ISO_Enter, Gdk.KEY_KP_Enter, Gdk.KEY_KP_Space]:
-            return
-
-        selection = view.get_selection()
-        (model, itr) = selection.get_selected()
-        if not itr:
-            return
-
-        # If the user clicked on the first column, they've clicked on the checkbox which was
-        # handled separately from this signal handler.  Handling it again here will result in
-        # the checkbox being toggled yet again.  So, we need to return in that case.
-        col = view.get_cursor()[1]
-        if not col or col.get_title() == "Selected":
-            return
-
-        # Always do something here, since addons can be toggled.
-        self.on_addon_toggled(None, model.get_path(itr))
-
     def on_info_bar_clicked(self, *args):
         if not self._errorMsgs:
             return
 
-        label = _("The following software marked for installation has errors.  "
-                  "This is likely caused by an error with\nyour installation source.  "
-                  "You can change your installation source or quit the installer.")
-        dialog = DetailedErrorDialog(self.data, buttons=[_("_Quit"), _("_Cancel"),
-                                                         _("_Modify Software Source")],
-                                                label=label)
-        with enlightbox(self.window, dialog.window):
+        label = _("The software marked for installation has the following errors.  "
+                  "This is likely caused by an error with your installation source.  "
+                  "You can quit the installer, change your software source, or change "
+                  "your software selections.")
+        dialog = DetailedErrorDialog(self.data,
+                buttons=[C_("GUI|Software Selection|Error Dialog", "_Quit"),
+                         C_("GUI|Software Selection|Error Dialog", "_Modify Software Source"),
+                         C_("GUI|Software Selection|Error Dialog", "Modify _Selections")],
+                label=label)
+        with self.main_window.enlightbox(dialog.window):
             dialog.refresh(self._errorMsgs)
             rc = dialog.run()
 
@@ -465,9 +476,11 @@ class SoftwareSelectionSpoke(NormalSpoke):
             # Quit.
             sys.exit(0)
         elif rc == 1:
-            # Close the dialog so the user can change selections.
-            pass
-        elif rc == 2:
             # Send the user to the installation source spoke.
             self.skipTo = "SourceSpoke"
             self.window.emit("button-clicked")
+        elif rc == 2:
+            # Close the dialog so the user can change selections.
+            pass
+        else:
+            pass
diff --git a/anaconda/pyanaconda/ui/gui/spokes/source.glade b/anaconda/pyanaconda/ui/gui/spokes/source.glade
index fb1d520..a3969ea 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/source.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/source.glade
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="GtkFileFilter" id="isoFilter">
     <patterns>
       <pattern>*.iso</pattern>
     </patterns>
   </object>
-  <object class="GtkDialog" id="isoChooserDialog">
-    <property name="width_request">550</property>
-    <property name="height_request">320</property>
+  <object class="GtkFileChooserDialog" id="isoChooserDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
+    <property name="create_folders">False</property>
+    <property name="filter">isoFilter</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="can_focus">False</property>
@@ -25,11 +26,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelChooserButton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes" context="GUI|Software Source|ISO Chooser Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -39,11 +40,11 @@
             </child>
             <child>
               <object class="GtkButton" id="openChooserButton">
-                <property name="label">gtk-open</property>
+                <property name="label" translatable="yes" context="GUI|Software Source|ISO Chooser Dialog">_Open</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -60,18 +61,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFileChooserWidget" id="isoChooser">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="create_folders">False</property>
-            <property name="filter">isoFilter</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
+          <placeholder/>
         </child>
       </object>
     </child>
@@ -90,7 +80,6 @@
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
-    <property name="has_resize_grip">False</property>
     <signal name="close" handler="on_close" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -103,7 +92,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="doneButton">
-                <property name="label" translatable="yes">_Done</property>
+                <property name="label" translatable="yes" context="GUI|Software Source|Media Check Dialog">_Done</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -221,7 +210,6 @@
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
-    <property name="has_resize_grip">False</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="can_focus">False</property>
@@ -233,7 +221,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="proxyCancelButton">
-                <property name="label" translatable="yes">_Cancel</property>
+                <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -247,13 +235,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="proxyAddButton">
-                <property name="label" translatable="yes">_Add</property>
+              <object class="GtkButton" id="proxyOkButton">
+                <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_Ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_proxy_add_clicked" swapped="no"/>
+                <signal name="clicked" handler="on_proxy_ok_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -276,7 +264,7 @@
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkCheckButton" id="enableProxyCheck">
-                <property name="label" translatable="yes">_Enable HTTP Proxy</property>
+                <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_Enable HTTP Proxy</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -309,16 +297,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Proxy URL&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_Proxy URL</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">proxyURLEntry</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -332,8 +320,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -346,8 +332,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -362,7 +346,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="enableAuthCheck">
-                    <property name="label" translatable="yes">_Use Authentication</property>
+                    <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_Use Authentication</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -389,16 +373,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;User_name&lt;/b&gt;</property>
-                        <property name="use_markup">True</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>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -406,16 +390,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Pass_word&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">Pass_word</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">proxyPasswordEntry</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -423,12 +407,11 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
+                        <signal name="changed" handler="on_proxyUsernameEntry_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -437,12 +420,11 @@
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
                         <property name="invisible_char">●</property>
+                        <signal name="changed" handler="on_proxyPasswordEntry_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
@@ -470,7 +452,7 @@
     </child>
     <action-widgets>
       <action-widget response="0">proxyCancelButton</action-widget>
-      <action-widget response="0">proxyAddButton</action-widget>
+      <action-widget response="0">proxyOkButton</action-widget>
     </action-widgets>
   </object>
   <object class="GtkListStore" id="repoStore">
@@ -482,11 +464,12 @@
       <!-- column-name repo -->
       <column type="PyObject"/>
     </columns>
+    <signal name="row-changed" handler="on_repoStore_row_changed" swapped="no"/>
+    <signal name="row-deleted" handler="on_repoStore_row_deleted" swapped="no"/>
+    <signal name="row-inserted" handler="on_repoStore_row_inserted" swapped="no"/>
   </object>
   <object class="AnacondaSpokeWindow" id="sourceWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">INSTALLATION SOURCE</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
@@ -499,6 +482,9 @@
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
                 <property name="can_focus">False</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -514,793 +500,40 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="yalign">0</property>
-            <property name="top_padding">12</property>
-            <property name="bottom_padding">48</property>
             <property name="left_padding">24</property>
-            <property name="right_padding">24</property>
             <child internal-child="action_area">
               <object class="GtkBox" id="sourceWindow-actionArea">
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">Which installation source would you like to use?</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 10"/>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="autodetectRadioButton">
-                    <property name="label" translatable="yes">_Auto-detected installation media:</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="no_show_all">True</property>
-                    <property name="margin_left">12</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">isoRadioButton</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="autodetectBox">
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="no_show_all">True</property>
-                    <property name="margin_left">24</property>
-                    <child>
-                      <object class="GtkLabel" id="autodetectDeviceLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Device:</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="autodetectLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Label:</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="verifyMediaButton">
-                        <property name="label" translatable="yes">_Verify</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">12</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" handler="on_verify_media_clicked" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="isoRadioButton">
-                    <property name="label" translatable="yes">_ISO file:</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="no_show_all">True</property>
-                    <property name="margin_left">12</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="isoBox">
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="no_show_all">True</property>
-                    <property name="margin_left">24</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">D_evice:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">isoPartitionCombo</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="isoPartitionCombo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="model">partitionStore</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="partitionRenderer"/>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="isoChooserButton">
-                        <property name="label" translatable="yes">_Choose an ISO</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" handler="on_chooser_clicked" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="verifyIsoButton">
-                        <!-- check_accelerators: not active at same time as verifyMediaButton -->
-                        <property name="label" translatable="yes">_Verify</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" handler="on_verify_iso_clicked" object="isoChooserButton" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="networkRadioButton">
-                    <property name="label" translatable="yes">_On the network:</property>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">isoRadioButton</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="networkBox">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">24</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
+                    <property name="hscrollbar_policy">never</property>
                     <child>
-                      <object class="GtkGrid" id="urlBox">
+                      <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">6</property>
+                        <property name="margin_right">24</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkComboBoxText" id="protocolComboBox">
+                          <object class="GtkBox" id="box4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="active">0</property>
-                            <items>
-                              <item>http://</item>
-                              <item>https://</item>
-                              <item>ftp://</item>
-                              <item translatable="yes">nfs</item>
-                              <item translatable="yes">Closest mirror</item>
-                            </items>
-                            <signal name="changed" handler="on_protocol_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="urlEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="proxyButton">
-                            <property name="label" translatable="yes">_Proxy setup...</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_proxy_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="mirrorlistCheckbox">
-                            <property name="label" translatable="yes">This URL refers to a _mirror list.</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="no_show_all">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="nfsOptsBox">
-                        <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">N_FS mount options:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">nfsOptsEntry</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="nfsOptsEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">This field is optional.</property>
-                            <property name="tooltip_text" translatable="yes">This field is optional.</property>
-                            <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="updatesBox">
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_top">12</property>
-                        <property name="label" translatable="yes">Updates</property>
-                        <attributes>
-                          <attribute name="font-desc" value="Cantarell 10"/>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="noUpdatesCheckbox">
-                        <property name="label" translatable="yes">Don't install the latest available software _updates. Install the default versions provided by the install source above.</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin_left">12</property>
-                        <property name="margin_bottom">12</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="on_noUpdatesCheckbox_toggled" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">9</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label11">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="xalign">0.50999999046325684</property>
-                    <property name="label" translatable="yes">Additional repositories</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 10"/>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">10</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">start</property>
-                    <property name="margin_left">12</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="column_spacing">24</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="reposScrolledWindow">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="shadow_type">in</property>
-                        <property name="min_content_width">250</property>
-                        <child>
-                          <object class="GtkViewport" id="reposViewport">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <child>
-                              <object class="GtkTreeView" id="repoTreeView">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">repoStore</property>
-                                <property name="enable_search">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="repoSelection">
-                                    <signal name="changed" handler="on_repoSelection_changed" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="repoEnabledColumn">
-                                    <property name="title" translatable="yes">Enabled</property>
-                                    <child>
-                                      <object class="GtkCellRendererToggle" id="repoEnableRenderer">
-                                        <signal name="toggled" handler="on_repoEnable_toggled" swapped="no"/>
-                                      </object>
-                                      <attributes>
-                                        <attribute name="active">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="repoNameColumn">
-                                    <property name="title" translatable="yes">Name</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="repoNameRenderer"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolbar" id="toolbar1">
-                        <property name="height_request">36</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="toolbar_style">icons</property>
-                        <property name="show_arrow">False</property>
-                        <property name="icon_size">1</property>
-                        <style>
-                          <class name="inline-toolbar"/>
-                        </style>
-                        <child>
-                          <object class="GtkToolButton" id="addButton">
-                            <property name="width_request">42</property>
-                            <property name="height_request">36</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Add a new repository.</property>
-                            <property name="tooltip_text" translatable="yes">Add a new repository.</property>
-                            <property name="label" translatable="yes">Add</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">list-add-symbolic</property>
-                            <signal name="clicked" handler="on_addRepo_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="removeButton">
-                            <property name="width_request">42</property>
-                            <property name="height_request">36</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Remove the selected repository.</property>
-                            <property name="tooltip_text" translatable="yes">Remove the selected repository.</property>
-                            <property name="label" translatable="yes">Remove</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">list-remove-symbolic</property>
-                            <signal name="clicked" handler="on_removeRepo_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="resetButton">
-                            <property name="width_request">42</property>
-                            <property name="height_request">36</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Revert to the previous list of repositories.</property>
-                            <property name="tooltip_text" translatable="yes">Revert to the previous list of repositories.</property>
-                            <property name="label" translatable="yes">Reset</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">view-refresh</property>
-                            <signal name="clicked" handler="on_resetRepos_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkGrid" id="repoEntryBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="column_spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="repoUrlEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_markup" translatable="yes">URL for the repository, without protocol.</property>
-                            <property name="tooltip_text" translatable="yes">URL for the repository, without protocol.</property>
-                            <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                            <signal name="changed" handler="on_repoUrl_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="repoProxyUrlEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_markup" translatable="yes">URL of proxy in the form of protocol://host:[port]</property>
-                            <property name="tooltip_text" translatable="yes">URL of proxy in the form of protocol://host:[port]</property>
-                            <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                            <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <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="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                            <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="repoProxyPasswordEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_markup" translatable="yes">Optional proxy password.</property>
-                            <property name="visibility">False</property>
-                            <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                            <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">6</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="repoMirrorlistCheckbox">
-                            <property name="label" translatable="yes">This URL refers to a mirror list.</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="margin_left">12</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_repoMirrorlistCheckbox_toggled" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Name:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">repoNameEntry</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="repoProtocolComboBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_markup" translatable="yes">Protocol for the repository URL.</property>
-                            <property name="tooltip_text" translatable="yes">Protocol for the repository URL.</property>
-                            <property name="active">0</property>
-                            <property name="entry_text_column">0</property>
-                            <property name="id_column">1</property>
-                            <items>
-                              <item>http://</item>
-                              <item>https://</item>
-                              <item>ftp://</item>
-                            </items>
-                            <signal name="changed" handler="on_repoUrl_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">P_roxy URL:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">repoProxyUrlEntry</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">U_sername:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">repoProxyUsernameEntry</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Pass_word:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">repoProxyPasswordEntry</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">6</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="repoNameWarningBox">
-                            <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkImage" id="image1">
+                              <object class="GtkLabel" id="label1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="ypad">3</property>
-                                <property name="stock">gtk-dialog-warning</property>
-                                <property name="icon-size">2</property>
+                                <property name="halign">start</property>
+                                <property name="label" translatable="yes">Which installation source would you like to use?</property>
+                                <attributes>
+                                  <attribute name="font-desc" value="Cantarell 10"/>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1309,16 +542,16 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="repoNameWarningLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0.43000000715255737</property>
-                                <property name="label" translatable="yes">Invalid repository name. Try something else?</property>
-                                <attributes>
-                                  <attribute name="font-desc" value="Cantarell 10"/>
-                                  <attribute name="scale" value="1"/>
-                                  <attribute name="foreground" value="#cccc00000000"/>
-                                </attributes>
+                              <object class="GtkRadioButton" id="autodetectRadioButton">
+                                <property name="label" translatable="yes" context="GUI|Software Source">_Auto-detected installation media:</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="margin_left">12</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">isoRadioButton</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1326,94 +559,735 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkGrid" id="autodetectBox">
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="margin_left">24</property>
+                                <child>
+                                  <object class="GtkLabel" id="autodetectDeviceLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Device:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="autodetectLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Label:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="verifyMediaButton">
+                                    <property name="label" translatable="yes" context="GUI|Software Source">_Verify</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin_left">12</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="clicked" handler="on_verify_media_clicked" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="height">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="isoRadioButton">
+                                <property name="label" translatable="yes" context="GUI|Software Source">_ISO file:</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="margin_left">12</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="isoBox">
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="margin_left">24</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="valign">start</property>
+                                    <property name="label" translatable="yes" context="GUI|Software Source">D_evice:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">isoPartitionCombo</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="isoPartitionCombo">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="valign">start</property>
+                                    <property name="model">partitionStore</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="partitionRenderer"/>
+                                      <attributes>
+                                        <attribute name="text">1</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="isoChooserButton">
+                                    <property name="label" translatable="yes" context="GUI|Software Source">_Choose an ISO</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="valign">start</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="clicked" handler="on_chooser_clicked" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="verifyIsoButton">
+                                    <!-- check_accelerators: verifyMediaButton -->
+                                    <property name="label" translatable="yes" context="GUI|Software Source">_Verify</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="valign">start</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="clicked" handler="on_verify_iso_clicked" object="isoChooserButton" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="networkRadioButton">
+                                <property name="label" translatable="yes" context="GUI|Software Source">_On the network:</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="margin_left">12</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">isoRadioButton</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="networkBox">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">24</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkGrid" id="urlBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="row_spacing">6</property>
+                                    <property name="column_spacing">6</property>
+                                    <child>
+                                      <object class="GtkComboBoxText" id="protocolComboBox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="active">0</property>
+                                        <items>
+                                          <item id="http">http://</item>
+                                          <item id="https">https://</item>
+                                          <item id="ftp">ftp://</item>
+                                          <item id="nfs">nfs</item>
+                                          <item id="Closest mirror" translatable="yes">Closest mirror</item>
+                                        </items>
+                                        <signal name="changed" handler="on_protocol_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="urlEntry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="invisible_char">●</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="proxyButton">
+                                        <property name="label" translatable="yes" context="GUI|Software Source">_Proxy setup...</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="use_underline">True</property>
+                                        <signal name="clicked" handler="on_proxy_clicked" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="mirrorlistCheckbox">
+                                        <property name="label" translatable="yes" context="GUI|Software Source">This URL refers to a _mirror list.</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="nfsOptsBox">
+                                    <property name="can_focus">False</property>
+                                    <property name="no_show_all">True</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes" context="GUI|Software Source">N_FS mount options:</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">nfsOptsEntry</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="nfsOptsEntry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">This field is optional.</property>
+                                        <property name="tooltip_text" translatable="yes">This field is optional.</property>
+                                        <property name="invisible_char">●</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="updatesBox">
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="margin_top">12</property>
+                                    <property name="label" translatable="yes">Updates</property>
+                                    <attributes>
+                                      <attribute name="font-desc" value="Cantarell 10"/>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="noUpdatesCheckbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="margin_left">12</property>
+                                    <property name="margin_bottom">12</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_noUpdatesCheckbox_toggled" swapped="no"/>
+                                    <child>
+                                      <object class="GtkLabel" id="label10">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes" context="GUI|Software Source">Don't install the latest available software _updates. Install the default versions provided by the installation source above.</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="wrap">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">7</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label11">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="xalign">0.50999999046325684</property>
+                                <property name="label" translatable="yes">Additional repositories</property>
+                                <attributes>
+                                  <attribute name="font-desc" value="Cantarell 10"/>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">8</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="valign">start</property>
+                                <property name="margin_left">12</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="column_spacing">24</property>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="reposScrolledWindow">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="shadow_type">in</property>
+                                    <property name="min_content_width">250</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="repoTreeView">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="model">repoStore</property>
+                                        <property name="enable_search">False</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="repoSelection">
+                                            <signal name="changed" handler="on_repoSelection_changed" swapped="no"/>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="repoEnabledColumn">
+                                            <property name="title" translatable="yes">Enabled</property>
+                                            <child>
+                                              <object class="GtkCellRendererToggle" id="repoEnableRenderer">
+                                                <signal name="toggled" handler="on_repoEnable_toggled" swapped="no"/>
+                                              </object>
+                                              <attributes>
+                                                <attribute name="active">0</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="repoNameColumn">
+                                            <property name="title" translatable="yes">Name</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="repoNameRenderer"/>
+                                              <attributes>
+                                                <attribute name="text">1</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolbar" id="toolbar1">
+                                    <property name="height_request">36</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="toolbar_style">icons</property>
+                                    <property name="show_arrow">False</property>
+                                    <property name="icon_size">1</property>
+                                    <child>
+                                      <object class="GtkToolButton" id="addButton">
+                                        <property name="width_request">42</property>
+                                        <property name="height_request">36</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Add a new repository.</property>
+                                        <property name="tooltip_text" translatable="yes">Add a new repository.</property>
+                                        <property name="label" translatable="yes" context="GUI|Software Source">A_dd</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="icon_name">list-add-symbolic</property>
+                                        <signal name="clicked" handler="on_addRepo_clicked" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="removeButton">
+                                        <property name="width_request">42</property>
+                                        <property name="height_request">36</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Remove the selected repository.</property>
+                                        <property name="tooltip_text" translatable="yes">Remove the selected repository.</property>
+                                        <property name="label" translatable="yes" context="GUI|Software Source">_Remove</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="icon_name">list-remove-symbolic</property>
+                                        <signal name="clicked" handler="on_removeRepo_clicked" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="resetButton">
+                                        <property name="width_request">42</property>
+                                        <property name="height_request">36</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Revert to the previous list of repositories.</property>
+                                        <property name="tooltip_text" translatable="yes">Revert to the previous list of repositories.</property>
+                                        <property name="label" translatable="yes" context="GUI|Software Source">Rese_t</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="icon_name">view-refresh</property>
+                                        <signal name="clicked" handler="on_resetRepos_clicked" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">True</property>
+                                      </packing>
+                                    </child>
+                                    <style>
+                                      <class name="inline-toolbar"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="repoEntryBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="column_spacing">6</property>
+                                    <child>
+                                      <object class="GtkEntry" id="repoUrlEntry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip_markup" translatable="yes">URL for the repository, without protocol.</property>
+                                        <property name="tooltip_text" translatable="yes">URL for the repository, without protocol.</property>
+                                        <property name="invisible_char">●</property>
+                                        <signal name="changed" handler="on_repoUrl_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="repoProxyUrlEntry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip_markup" translatable="yes">URL of proxy in the form of protocol://host:[port]</property>
+                                        <property name="tooltip_text" translatable="yes">URL of proxy in the form of protocol://host:[port]</property>
+                                        <property name="invisible_char">●</property>
+                                        <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <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="invisible_char">●</property>
+                                        <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="repoProxyPasswordEntry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Optional proxy password.</property>
+                                        <property name="visibility">False</property>
+                                        <property name="invisible_char">●</property>
+                                        <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">5</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="repoMirrorlistCheckbox">
+                                        <property name="label" translatable="yes" context="GUI|Software Source">This URL refers to a mirror _list.</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="margin_left">12</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_repoMirrorlistCheckbox_toggled" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label14">
+                                        <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">_Name:</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">repoNameEntry</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" id="repoProtocolComboBox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="tooltip_markup" translatable="yes">Protocol for the repository URL.</property>
+                                        <property name="tooltip_text" translatable="yes">Protocol for the repository URL.</property>
+                                        <property name="active">0</property>
+                                        <items>
+                                          <item id="http">http://</item>
+                                          <item id="https">https://</item>
+                                          <item id="ftp">ftp://</item>
+                                          <item id="nfs">nfs</item>
+                                        </items>
+                                        <signal name="changed" handler="on_repoProtocolComboBox_changed" swapped="no"/>
+                                        <signal name="changed" handler="on_repoUrl_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label15">
+                                        <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">Pro_xy URL:</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">repoProxyUrlEntry</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label16">
+                                        <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">U_sername:</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">repoProxyUsernameEntry</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label17">
+                                        <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">Pass_word:</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">repoProxyPasswordEntry</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">5</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="repoNameEntry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Name of the repository.</property>
+                                        <property name="tooltip_text" translatable="yes">Name of the repository.</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="invisible_char">●</property>
+                                        <signal name="changed" handler="on_repoNameEntry_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="height">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">9</property>
+                              </packing>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="repoNameEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_markup" translatable="yes">Name of the repository.</property>
-                            <property name="tooltip_text" translatable="yes">Name of the repository.</property>
-                            <property name="hexpand">True</property>
-                            <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
-                            <signal name="changed" handler="on_repoNameEntry_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="repoNamesWarningBox">
-                        <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="stock">gtk-dialog-warning</property>
-                            <property name="icon-size">2</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="repoNamesWarningLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Duplicate names in list of additional repositories.</property>
-                            <attributes>
-                              <attribute name="font-desc" value="Cantarell 10"/>
-                              <attribute name="scale" value="1"/>
-                              <attribute name="foreground" value="#cccc00000000"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">11</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/source.py b/anaconda/pyanaconda/ui/gui/spokes/source.py
index 3f093aa..67e968c 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/source.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/source.py
@@ -25,22 +25,25 @@ import time
 import logging
 log = logging.getLogger("anaconda")
 
-import os, signal, string
+import os, signal, re
 
-from gi.repository import GLib
+from gi.repository import GLib, Gtk
 
 from pyanaconda.flags import flags
-from pyanaconda.i18n import _, N_
+from pyanaconda.i18n import _, N_, CN_
 from pyanaconda.image import opticalInstallMedia, potentialHdisoSources
 from pyanaconda.ui.communication import hubQ
+from pyanaconda.ui.helpers import InputCheck, InputCheckHandler
 from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.gui.helpers import GUIDialogInputCheckHandler, GUISpokeInputCheckHandler
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui.categories.software import SoftwareCategory
-from pyanaconda.ui.gui.utils import enlightbox, gtk_action_wait
+from pyanaconda.ui.categories.software import SoftwareCategory
+from pyanaconda.ui.gui.utils import fire_gtk_action
 from pyanaconda.iutil import ProxyString, ProxyStringError, cmp_obj_attrs
-from pyanaconda.ui.gui.utils import gtk_call_once, really_hide, really_show
+from pyanaconda.ui.gui.utils import gtk_call_once, really_hide, really_show, fancy_set_sensitive
 from pyanaconda.threads import threadMgr, AnacondaThread
-from pyanaconda.packaging import PayloadError, MetadataError
+from pyanaconda.packaging import PackagePayload, payloadMgr
+from pyanaconda.regexes import REPO_NAME_VALID, URL_PARSE, HOSTNAME_PATTERN_WITHOUT_ANCHORS
 from pyanaconda import constants
 
 from blivet.util import get_mount_paths
@@ -49,29 +52,61 @@ __all__ = ["SourceSpoke"]
 
 BASEREPO_SETUP_MESSAGE = N_("Setting up installation source...")
 METADATA_DOWNLOAD_MESSAGE = N_("Downloading package metadata...")
-METADATA_ERROR_MESSAGE = N_("Error downloading package metadata...")
 
-# These need to be in the same order as the items in protocolComboBox in source.glade.
-PROTOCOL_HTTP = 0
-PROTOCOL_HTTPS = 1
-PROTOCOL_FTP = 2
-PROTOCOL_NFS = 3
-PROTOCOL_MIRROR = 4
+# These need to match the IDs in protocolComboBox and repoProtocolComboBox in source.glade.
+PROTOCOL_HTTP = 'http'
+PROTOCOL_HTTPS = 'https'
+PROTOCOL_FTP = 'ftp'
+PROTOCOL_NFS = 'nfs'
+PROTOCOL_MIRROR = 'Closest mirror'
 
 # Repo Store Columns
 REPO_ENABLED_COL = 0
 REPO_NAME_COL = 1
 REPO_OBJ = 2
 
-REPO_PROTO = [(0, "http://"), (1, "https://"), (2, "ftp://")]
+REPO_PROTO = {PROTOCOL_HTTP:  "http://",
+              PROTOCOL_HTTPS: "https://",
+              PROTOCOL_FTP:   "ftp://",
+              PROTOCOL_NFS:   "nfs://"
+              }
 
-class ProxyDialog(GUIObject):
+def _validateProxy(proxy_string, username_set, password_set):
+    """Validate a proxy string and return an input code usable by InputCheck
+
+       :param str proxy_string: the proxy URL string
+       :param bool username_set: Whether a username has been specified external to the URL
+       :param bool password_set: Whether a password has been speicifed external to the URL
+    """
+    proxy_match = URL_PARSE.match(proxy_string)
+    if not proxy_match:
+        return _("Invalid proxy URL")
+
+    # Ensure the protocol is something that makes sense
+    protocol = proxy_match.group("protocol")
+    if protocol and protocol not in ('http://', 'https://', 'ftp://'):
+        return _("Invalid proxy protocol: %s") % protocol
+
+    # Path and anything after makes no sense for a proxy URL
+    # Allow '/' as a path so you can use http://proxy.example.com:8080/
+    if (proxy_match.group("path") and proxy_match.group("path") != "/") \
+            or proxy_match.group("query") or proxy_match.group("fragment"):
+        return _("Extra characters in proxy URL")
+
+    # Check if if authentication data is both in the URL and specified externally
+    if (proxy_match.group("username") or proxy_match.group("password")) and (username_set or password_set):
+        return _("Proxy authentication data duplicated")
+
+    return InputCheck.CHECK_OK
+
+class ProxyDialog(GUIObject, GUIDialogInputCheckHandler):
     builderObjects = ["proxyDialog"]
     mainWidgetName = "proxyDialog"
     uiFile = "spokes/source.glade"
 
     def __init__(self, data, proxy_url):
         GUIObject.__init__(self, data)
+        GUIDialogInputCheckHandler.__init__(self)
         self.proxyUrl = proxy_url
 
         self._proxyCheck = self.builder.get_object("enableProxyCheck")
@@ -82,32 +117,55 @@ class ProxyDialog(GUIObject):
         self._proxyURLEntry = self.builder.get_object("proxyURLEntry")
         self._proxyUsernameEntry = self.builder.get_object("proxyUsernameEntry")
         self._proxyPasswordEntry = self.builder.get_object("proxyPasswordEntry")
+        self._proxyOkButton = self.builder.get_object("proxyOkButton")
+
+        self._proxyValidate = self.add_check(self._proxyURLEntry, self._checkProxyURL)
+        self._proxyValidate.update_check_status()
+
+    def _checkProxyURL(self, inputcheck):
+        proxy_string = self.get_input(inputcheck.input_obj)
+
+        # Don't set an error icon on empty input, but keep the add button insensitive.
+        if not proxy_string:
+            return InputCheck.CHECK_SILENT
+
+        username_set = self._proxyUsernameEntry.is_sensitive() and self._proxyUsernameEntry.get_text()
+        password_set = self._proxyPasswordEntry.is_sensitive() and self._proxyPasswordEntry.get_text()
+
+        return _validateProxy(proxy_string, username_set, password_set)
+
+    def set_status(self, inputcheck):
+        # Use the superclass set_status to set the error message
+        GUIDialogInputCheckHandler.set_status(self, inputcheck)
+
+        # Change the sensitivity of the Add button
+        self._proxyOkButton.set_sensitive(inputcheck.check_status == InputCheck.CHECK_OK)
+
+    # Update the proxy validation check on username and password changes to catch
+    # changes in duplicated authentication data
+    def on_proxyUsernameEntry_changed(self, entry, user_data=None):
+        self._proxyValidate.update_check_status()
+
+    def on_proxyPasswordEntry_changed(self, entry, user_data=None):
+        self._proxyValidate.update_check_status()
 
     def on_proxy_cancel_clicked(self, *args):
         self.window.destroy()
 
-    def on_proxy_add_clicked(self, *args):
-        # If the user unchecked the proxy entirely, that means they want it
-        # disabled.
-        if not self._proxyCheck.get_active():
-            self.proxyUrl = ""
-            self.window.destroy()
-            return
+    def on_proxy_ok_clicked(self, *args):
+        if self._proxyCheck.get_active():
+            url = self._proxyURLEntry.get_text()
 
-        url = self._proxyURLEntry.get_text()
-        if self._authCheck.get_active():
-            username = self._proxyUsernameEntry.get_text()
-            password = self._proxyPasswordEntry.get_text()
-        else:
-            username = None
-            password = None
+            if self._authCheck.get_active():
+                username = self._proxyUsernameEntry.get_text()
+                password = self._proxyPasswordEntry.get_text()
+            else:
+                username = None
+                password = None
 
-        try:
             proxy = ProxyString(url=url, username=username, password=password)
             self.proxyUrl = proxy.url
-        except ProxyStringError as e:
-            log.error("Failed to parse proxy for ProxyDialog Add - %s:%s@%s: %s", username, password, url, e)
-            # TODO - tell the user they entered an invalid proxy and let them retry
+        else:
             self.proxyUrl = ""
 
         self.window.destroy()
@@ -115,8 +173,14 @@ class ProxyDialog(GUIObject):
     def on_proxy_enable_toggled(self, button, *args):
         self._proxyInfoBox.set_sensitive(button.get_active())
 
+        if button.get_active():
+            self.set_status(self._proxyValidate)
+        else:
+            self._proxyOkButton.set_sensitive(True)
+
     def on_proxy_auth_toggled(self, button, *args):
         self._proxyAuthBox.set_sensitive(button.get_active())
+        self._proxyValidate.update_check_status()
 
     def refresh(self):
         GUIObject.refresh(self)
@@ -233,9 +297,9 @@ class IsoChooser(GUIObject):
 
     def __init__(self, data):
         GUIObject.__init__(self, data)
-        self._chooser = self.builder.get_object("isoChooser")
+        self._chooser = self.builder.get_object("isoChooserDialog")
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=arguments-differ
     def refresh(self, currentFile=""):
         GUIObject.refresh(self)
         self._chooser.connect("current-folder-changed", self.on_folder_changed)
@@ -255,7 +319,7 @@ class IsoChooser(GUIObject):
 
         # If any directory was chosen, return that.  Otherwise, return None.
         rc = self.window.run()
-        if rc:
+        if rc == 1:
             f = self._chooser.get_filename()
             if f:
                 retval = f.replace(constants.ISO_DIR, "")
@@ -278,18 +342,20 @@ class IsoChooser(GUIObject):
         if not d.startswith(constants.ISO_DIR):
             chooser.set_current_folder(constants.ISO_DIR)
 
-class SourceSpoke(NormalSpoke):
+class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler):
     builderObjects = ["isoChooser", "isoFilter", "partitionStore", "sourceWindow", "dirImage", "repoStore"]
     mainWidgetName = "sourceWindow"
     uiFile = "spokes/source.glade"
+    helpFile = "SourceSpoke.xml"
 
     category = SoftwareCategory
 
     icon = "media-optical-symbolic"
-    title = N_("_INSTALLATION SOURCE")
+    title = CN_("GUI|Spoke", "_INSTALLATION SOURCE")
 
     def __init__(self, *args, **kwargs):
         NormalSpoke.__init__(self, *args, **kwargs)
+        GUISpokeInputCheckHandler.__init__(self)
         self._currentIsoFile = None
         self._ready = False
         self._error = False
@@ -303,7 +369,8 @@ class SourceSpoke(NormalSpoke):
         if flags.askmethod:
             flags.askmethod = False
 
-        threadMgr.add(AnacondaThread(name=constants.THREAD_PAYLOAD_MD, target=self.getRepoMetadata))
+        payloadMgr.restartThread(self.storage, self.data, self.payload, self.instclass,
+                checkmount=False)
         self.clear_info()
 
     def _method_changed(self):
@@ -368,10 +435,10 @@ class SourceSpoke(NormalSpoke):
             # revisited.
             if self._ftp_active() and not url.startswith("ftp://"):
                 url = "ftp://" + url
-            elif self._protocolComboBox.get_active() == PROTOCOL_HTTP and not url.startswith("http://"):
+            elif self._protocolComboBox.get_active_id() == PROTOCOL_HTTP and not url.startswith("http://"):
                 url = "http://" + url
                 mirrorlist = self._mirrorlistCheckbox.get_active()
-            elif self._protocolComboBox.get_active() == PROTOCOL_HTTPS and not url.startswith("https://"):
+            elif self._protocolComboBox.get_active_id() == PROTOCOL_HTTPS and not url.startswith("https://"):
                 url = "https://" + url
                 mirrorlist = self._mirrorlistCheckbox.get_active()
 
@@ -391,10 +458,7 @@ class SourceSpoke(NormalSpoke):
         elif self._nfs_active():
             url = self._urlEntry.get_text().strip()
 
-            # If the user didn't fill in the URL entry, or it does not contain
-            # a ':' (so, no host/directory split), just return as if they
-            # selected nothing.
-            if url == "" or not ':' in url:
+            if url == "":
                 return False
 
             self.data.method.method = "nfs"
@@ -432,55 +496,6 @@ class SourceSpoke(NormalSpoke):
 
         return True
 
-    def getRepoMetadata(self):
-        hubQ.send_not_ready("SoftwareSelectionSpoke")
-        hubQ.send_not_ready(self.__class__.__name__)
-        hubQ.send_message(self.__class__.__name__, _(BASEREPO_SETUP_MESSAGE))
-        # this sleep is lame, but without it the message above doesn't seem
-        # to get processed by the hub in time, and is never shown.
-        # FIXME this should get removed when we figure out how to ensure
-        # that the message takes effect on the hub before we try to mount
-        # a bad NFS server.
-        time.sleep(1)
-        try:
-            self.payload.updateBaseRepo(fallback=False, checkmount=False)
-        except (OSError, PayloadError) as e:
-            log.error("PayloadError: %s", e)
-            self._error = True
-            hubQ.send_message(self.__class__.__name__, _("Failed to set up installation source"))
-            if not (hasattr(self.data.method, "proxy") and self.data.method.proxy):
-                gtk_call_once(self.set_warning, _("Failed to set up installation source; check the repo url"))
-            else:
-                gtk_call_once(self.set_warning, _("Failed to set up installation source; check the repo url and proxy settings"))
-        else:
-            self._error = False
-            hubQ.send_message(self.__class__.__name__, _(METADATA_DOWNLOAD_MESSAGE))
-            self.payload.gatherRepoMetadata()
-            self.payload.release()
-            if not self.payload.baseRepo:
-                hubQ.send_message(self.__class__.__name__, _(METADATA_ERROR_MESSAGE))
-                hubQ.send_ready(self.__class__.__name__, False)
-                self._error = True
-                gtk_call_once(self.set_warning, _("Failed to set up installation source; check the repo url"))
-            else:
-                try:
-                    # Grabbing the list of groups could potentially take a long time the
-                    # first time (yum does a lot of magic property stuff, some of which
-                    # involves side effects like network access) so go ahead and grab
-                    # them now. These are properties with side-effects, just accessing
-                    # them will trigger yum.
-                    # pylint: disable-msg=W0104
-                    self.payload.environments
-                    # pylint: disable-msg=W0104
-                    self.payload.groups
-                except MetadataError:
-                    hubQ.send_message("SoftwareSelectionSpoke",
-                                      _("No installation source available"))
-                else:
-                    hubQ.send_ready("SoftwareSelectionSpoke", False)
-        finally:
-            hubQ.send_ready(self.__class__.__name__, False)
-
     @property
     def changed(self):
         method_changed = self._method_changed()
@@ -489,7 +504,10 @@ class SourceSpoke(NormalSpoke):
 
     @property
     def completed(self):
-        if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo):
+        """ WARNING: This can be called before _initialize is done, make sure that it
+            doesn't access things that are not setup (eg. payload.*) until it is ready
+        """
+        if flags.automatedInstall and self.ready and not self.payload.baseRepo:
             return False
         else:
             return not self._error and self.ready and (self.data.method.method or self.payload.baseRepo)
@@ -501,7 +519,7 @@ class SourceSpoke(NormalSpoke):
     @property
     def ready(self):
         return (self._ready and
-                not threadMgr.get(constants.THREAD_PAYLOAD_MD) and
+                not threadMgr.get(constants.THREAD_PAYLOAD) and
                 not threadMgr.get(constants.THREAD_SOFTWARE_WATCHER) and
                 not threadMgr.get(constants.THREAD_CHECK_SOFTWARE))
 
@@ -545,10 +563,14 @@ class SourceSpoke(NormalSpoke):
         self._isoChooserButton = self.builder.get_object("isoChooserButton")
         self._origIsoChooserButton = self._isoChooserButton.get_label()
 
+        # Attach a validator to the URL entry. Start it as disabled, and it will be
+        # enabled/disabled as entry sensitivity is enabled/disabled.
+        self._urlCheck = self.add_check(self._urlEntry, self._checkURLEntry)
+        self._urlCheck.enabled = False
+
         self._mirrorlistCheckbox = self.builder.get_object("mirrorlistCheckbox")
 
         self._noUpdatesCheckbox = self.builder.get_object("noUpdatesCheckbox")
-        self._noUpdatesCheckbox.get_children()[0].set_line_wrap(True)
 
         self._verifyIsoButton = self.builder.get_object("verifyIsoButton")
 
@@ -563,6 +585,19 @@ class SourceSpoke(NormalSpoke):
         self._repoProxyUrlEntry = self.builder.get_object("repoProxyUrlEntry")
         self._repoProxyUsernameEntry = self.builder.get_object("repoProxyUsernameEntry")
         self._repoProxyPasswordEntry = self.builder.get_object("repoProxyPasswordEntry")
+        self._repoView = self.builder.get_object("repoTreeView")
+
+        # Create a check for duplicate repo ids
+        # Call InputCheckHandler directly since this check operates on rows of a TreeModel
+        # instead of GtkEntry inputs. Updating the check is handled by the signal handlers
+        # connected to repoStore.
+        self._duplicateRepoCheck = InputCheckHandler.add_check(self, self._repoStore, self._checkDuplicateRepos)
+
+        # Create dictionaries for the checks on fields in individual repos
+        # These checks will be added and removed as repos are added and removed from repoStore
+        self._repoNameChecks = {}
+        self._repoURLChecks = {}
+        self._repoProxyChecks = {}
 
         # updates option container
         self._updatesBox = self.builder.get_object("updatesBox")
@@ -577,9 +612,11 @@ class SourceSpoke(NormalSpoke):
 
         # I shouldn't have to do this outside GtkBuilder, but it really doesn't
         # want to let me pass in user data.
+        # See also: https://bugzilla.gnome.org/show_bug.cgi?id=727919
         self._autodetectButton.connect("toggled", self.on_source_toggled, self._autodetectBox)
         self._isoButton.connect("toggled", self.on_source_toggled, self._isoBox)
         self._networkButton.connect("toggled", self.on_source_toggled, self._networkBox)
+        self._networkButton.connect("toggled", self._updateURLEntryCheck)
 
         # Show or hide the updates option based on the installclass
         if self.instclass.installUpdates:
@@ -590,18 +627,50 @@ class SourceSpoke(NormalSpoke):
         self._repoNameWarningBox = self.builder.get_object("repoNameWarningBox")
         self._repoNameWarningLabel = self.builder.get_object("repoNameWarningLabel")
 
-        self._repoNamesWarningBox = self.builder.get_object("repoNamesWarningBox")
-        self._repoNamesWarningLabel = self.builder.get_object("repoNamesWarningLabel")
-
         threadMgr.add(AnacondaThread(name=constants.THREAD_SOURCE_WATCHER, target=self._initialize))
 
-    def _initialize(self):
+        # Register listeners for payload events
+        payloadMgr.addListener(payloadMgr.STATE_START, self._payload_refresh)
+        payloadMgr.addListener(payloadMgr.STATE_STORAGE, self._probing_storage)
+        payloadMgr.addListener(payloadMgr.STATE_GROUP_MD, self._downloading_package_md)
+        payloadMgr.addListener(payloadMgr.STATE_FINISHED, self._payload_finished)
+        payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error)
+
+    def _payload_refresh(self):
+        hubQ.send_not_ready("SoftwareSelectionSpoke")
+        hubQ.send_not_ready(self.__class__.__name__)
+        hubQ.send_message(self.__class__.__name__, _(BASEREPO_SETUP_MESSAGE))
+
+        # this sleep is lame, but without it the message above doesn't seem
+        # to get processed by the hub in time, and is never shown.
+        # FIXME this should get removed when we figure out how to ensure
+        # that the message takes effect on the hub before we try to mount
+        # a bad NFS server.
+        time.sleep(1)
+
+    def _probing_storage(self):
         hubQ.send_message(self.__class__.__name__, _("Probing storage..."))
 
-        threadMgr.wait(constants.THREAD_STORAGE)
+    def _downloading_package_md(self):
+        # Reset the error state from previous payloads
+        self._error = False
 
         hubQ.send_message(self.__class__.__name__, _(METADATA_DOWNLOAD_MESSAGE))
 
+    def _payload_finished(self):
+        hubQ.send_ready("SoftwareSelectionSpoke", False)
+        hubQ.send_ready(self.__class__.__name__, False)
+
+    def _payload_error(self):
+        self._error = True
+        hubQ.send_message(self.__class__.__name__, payloadMgr.error)
+        if not (hasattr(self.data.method, "proxy") and self.data.method.proxy):
+            gtk_call_once(self.set_warning, _("Failed to set up installation source; check the repo url"))
+        else:
+            gtk_call_once(self.set_warning, _("Failed to set up installation source; check the repo url and proxy settings"))
+        hubQ.send_ready(self.__class__.__name__, False)
+
+    def _initialize(self):
         threadMgr.wait(constants.THREAD_PAYLOAD)
 
         added = False
@@ -609,7 +678,13 @@ class SourceSpoke(NormalSpoke):
         # If there's no fallback mirror to use, we should just disable that option
         # in the UI.
         if not self.payload.mirrorEnabled:
-            self._protocolComboBox.remove(PROTOCOL_MIRROR)
+            model = self._protocolComboBox.get_model()
+            itr = model.get_iter_first()
+            while itr and model[itr][self._protocolComboBox.get_id_column()] != PROTOCOL_MIRROR:
+                itr = model.iter_next(itr)
+
+            if itr:
+                model.remove(itr)
 
         # If we've previously set up to use a CD/DVD method, the media has
         # already been mounted by payload.setup.  We can't try to mount it
@@ -621,12 +696,8 @@ class SourceSpoke(NormalSpoke):
             self._cdrom = opticalInstallMedia(self.storage.devicetree)
 
         if self._cdrom:
-            @gtk_action_wait
-            def gtk_action_1():
-                self._autodetectDeviceLabel.set_text(_("Device: %s") % self._cdrom.name)
-                self._autodetectLabel.set_text(_("Label: %s") % (getattr(self._cdrom.format, "label", "") or ""))
-
-            gtk_action_1()
+            fire_gtk_action(self._autodetectDeviceLabel.set_text, _("Device: %s") % self._cdrom.name)
+            fire_gtk_action(self._autodetectLabel.set_text, _("Label: %s") % (getattr(self._cdrom.format, "label", "") or ""))
             added = True
 
         if self.data.method.method == "harddrive":
@@ -646,6 +717,10 @@ class SourceSpoke(NormalSpoke):
         self._reset_repoStore()
 
         self._ready = True
+        # Wait to make sure the other threads are done before sending ready, otherwise
+        # the spoke may not be set sensitive by _handleCompleteness in the hub.
+        while not self.ready:
+            time.sleep(1)
         hubQ.send_ready(self.__class__.__name__, False)
 
     def refresh(self):
@@ -669,6 +744,12 @@ class SourceSpoke(NormalSpoke):
                          "format": dev.format.name or "",
                          "label" : dev.format.label or dev.format.uuid or ""
                        }
+
+            # With the label in here, the combo box can appear really long thus pushing the "pick an image"
+            # and the "verify" buttons off the screen.
+            if dev_info["label"] != "":
+                dev_info["label"] = "\n" + dev_info["label"]
+
             store.append([dev, "%(model)s %(path)s (%(size)s MB) %(format)s %(label)s" % dev_info])
             if self.data.method.method == "harddrive" and self.data.method.partition in [dev.path, dev.name]:
                 active = idx
@@ -687,8 +768,9 @@ class SourceSpoke(NormalSpoke):
 
         # We default to the mirror list, and then if the method tells us
         # something different later, we can change it.
-        self._protocolComboBox.set_active(PROTOCOL_MIRROR)
+        self._protocolComboBox.set_active_id(PROTOCOL_MIRROR)
         self._urlEntry.set_sensitive(False)
+        self._updateURLEntryCheck()
 
         # Set up the default state of UI elements.
         if self.data.method.method == "url":
@@ -696,28 +778,30 @@ class SourceSpoke(NormalSpoke):
 
             proto = self.data.method.url or self.data.method.mirrorlist
             if proto.startswith("http:"):
-                self._protocolComboBox.set_active(PROTOCOL_HTTP)
+                self._protocolComboBox.set_active_id(PROTOCOL_HTTP)
                 l = 7
             elif proto.startswith("https:"):
-                self._protocolComboBox.set_active(PROTOCOL_HTTPS)
+                self._protocolComboBox.set_active_id(PROTOCOL_HTTPS)
                 l = 8
             elif proto.startswith("ftp:"):
-                self._protocolComboBox.set_active(PROTOCOL_FTP)
+                self._protocolComboBox.set_active_id(PROTOCOL_FTP)
                 l = 6
             else:
-                self._protocolComboBox.set_active(PROTOCOL_HTTP)
+                self._protocolComboBox.set_active_id(PROTOCOL_HTTP)
                 l = 0
 
             self._urlEntry.set_sensitive(True)
             self._urlEntry.set_text(proto[l:])
+            self._updateURLEntryCheck()
             self._mirrorlistCheckbox.set_active(bool(self.data.method.mirrorlist))
             self._proxyUrl = self.data.method.proxy
         elif self.data.method.method == "nfs":
             self._networkButton.set_active(True)
-            self._protocolComboBox.set_active(PROTOCOL_NFS)
+            self._protocolComboBox.set_active_id(PROTOCOL_NFS)
 
             self._urlEntry.set_text("%s:%s" % (self.data.method.server, self.data.method.dir))
             self._urlEntry.set_sensitive(True)
+            self._updateURLEntryCheck()
             self.builder.get_object("nfsOptsEntry").set_text(self.data.method.opts or "")
         elif self.data.method.method == "harddrive":
             self._isoButton.set_active(True)
@@ -764,19 +848,19 @@ class SourceSpoke(NormalSpoke):
 
     @property
     def showable(self):
-        return not flags.livecdInstall and not self.data.method.method == "liveimg"
+        return isinstance(self.payload, PackagePayload)
 
     def _mirror_active(self):
-        return self._protocolComboBox.get_active() == PROTOCOL_MIRROR
+        return self._protocolComboBox.get_active_id() == PROTOCOL_MIRROR
 
     def _http_active(self):
-        return self._protocolComboBox.get_active() in [PROTOCOL_HTTP, PROTOCOL_HTTPS]
+        return self._protocolComboBox.get_active_id() in [PROTOCOL_HTTP, PROTOCOL_HTTPS]
 
     def _ftp_active(self):
-        return self._protocolComboBox.get_active() == PROTOCOL_FTP
+        return self._protocolComboBox.get_active_id() == PROTOCOL_FTP
 
     def _nfs_active(self):
-        return self._protocolComboBox.get_active() == PROTOCOL_NFS
+        return self._protocolComboBox.get_active_id() == PROTOCOL_NFS
 
     def _get_selected_partition(self):
         store = self.builder.get_object("partitionStore")
@@ -791,6 +875,106 @@ class SourceSpoke(NormalSpoke):
     def _sanitize_model(self, model):
         return model.replace("_", " ")
 
+    # Input checks
+
+    # This method is shared by the checks on urlEntry and repoUrlEntry
+    def _checkURL(self, inputcheck, combo):
+        url_string = self.get_input(inputcheck.input_obj).strip()
+
+        # If this is HTTP/HTTPS/FTP, use the URL_PARSE regex
+        combo_protocol = combo.get_active_id()
+        if combo_protocol in (PROTOCOL_HTTP, PROTOCOL_HTTPS, PROTOCOL_FTP):
+            if not url_string:
+                return _("URL is empty")
+
+            m = URL_PARSE.match(url_string)
+            if not m:
+                return _("Invalid URL")
+
+            # If there is a protocol in the URL, and the protocol matches the
+            # combo box, just remove it. This makes it more convenient to paste
+            # in URLs. It'll probably freak out people who are typing out http://
+            # in the box themselves, but why would you do that?  Don't do that.
+            # If the protocols don't match, complain.
+            url_protocol = m.group('protocol')
+            if url_protocol:
+                if (url_protocol == 'http://' and combo_protocol == PROTOCOL_HTTP) or \
+                        (url_protocol == 'https://' and combo_protocol == PROTOCOL_HTTPS) or \
+                        (url_protocol == 'ftp://' and combo_protocol == PROTOCOL_FTP):
+                    # Disable the check to block a recursive check call
+                    inputcheck.enabled = False
+                    inputcheck.input_obj.set_text(url_string[len(url_protocol):])
+                    inputcheck.enabled = True
+                else:
+                    return _("Protocol in URL does not match selected protocol")
+        elif combo_protocol == PROTOCOL_NFS:
+            if not url_string:
+                return _("NFS server is empty")
+
+            # Make sure the part before the colon looks like a hostname,
+            # and that the path is not empty
+            host, _colon, path = url_string.partition(':')
+
+            if not re.match('^' + HOSTNAME_PATTERN_WITHOUT_ANCHORS + '$', host):
+                return _("Invalid host name")
+
+            if not path:
+                return _("Remote directory is required")
+
+        return InputCheck.CHECK_OK
+
+    def _checkURLEntry(self, inputcheck):
+        return self._checkURL(inputcheck, self._protocolComboBox)
+
+    def _checkRepoURL(self, inputcheck):
+        return self._checkURL(inputcheck, self._repoProtocolComboBox)
+
+    # Update the check on urlEntry when the sensitity or selected protocol changes
+    def _updateURLEntryCheck(self, *args):
+        self._urlCheck.enabled = self._urlEntry.is_sensitive()
+        self._urlCheck.update_check_status()
+
+        # Force a status update to clear any disabled errors
+        self.set_status(self._urlCheck)
+
+    def _checkDuplicateRepos(self, inputcheck):
+        repo_names = [r[REPO_OBJ].name for r in inputcheck.input_obj]
+        if len(repo_names) != len(frozenset(repo_names)):
+            return _("Duplicate repository names.")
+        return InputCheck.CHECK_OK
+
+    def _checkRepoName(self, inputcheck):
+        repo_name = self.get_input(inputcheck.input_obj).strip()
+
+        if not repo_name:
+            return _("Empty repository name")
+
+        if not REPO_NAME_VALID.match(repo_name):
+            return _("Invalid repository name")
+
+        cnames = [constants.BASE_REPO_NAME] + \
+                 self.payload.DEFAULT_REPOS + \
+                 [r for r in self.payload.repos if r not in self.payload.addOns]
+        if repo_name in cnames:
+            return _("Repository name conflicts with internal repository name.")
+
+        return InputCheck.CHECK_OK
+
+    def _checkRepoProxy(self, inputcheck):
+        # If nfs is selected as the protocol, skip the proxy check
+        if self._repoProtocolComboBox.get_active_id() == PROTOCOL_NFS:
+            return InputCheck.CHECK_OK
+
+        # Empty proxies are OK, as long as the username and password are empty too
+        proxy_string = self.get_input(inputcheck.input_obj).strip()
+        username_set = self._repoProxyUsernameEntry.is_sensitive() and self._repoProxyUsernameEntry.get_text().strip()
+        password_set = self._repoProxyPasswordEntry.is_sensitive() and self._repoProxyPasswordEntry.get_text().strip()
+
+        if not (proxy_string or username_set or password_set):
+            return InputCheck.CHECK_OK
+
+        return _validateProxy(proxy_string, username_set, password_set)
+
     # Signal handlers.
     def on_source_toggled(self, button, relatedBox):
         # When a radio button is clicked, this handler gets called for both
@@ -801,37 +985,57 @@ class SourceSpoke(NormalSpoke):
         self._setup_no_updates()
 
     def on_back_clicked(self, button):
-        """If the user entered duplicate repo names, keep them on the screen.
+        """If any input validation checks failed, keep the user on the screen.
            Otherwise, do the usual thing."""
-        ui_repo_names = [r[REPO_OBJ].name for r in self._repoStore]
 
-        if len(ui_repo_names) != len(frozenset(ui_repo_names)):
+        failed_check = next(self.failed_checks, None)
+
+        # If the failed check is the duplicate repo check, focus the repo TreeView
+        if failed_check == self._duplicateRepoCheck:
+            self._repoView.grab_focus()
             return
-        else:
-            NormalSpoke.on_back_clicked(self, button)
+        # If the failed check is on one of the repo fields, select the repo in the
+        # TreeView and focus the field
+        elif failed_check in self._repoNameChecks.values():
+            self._repoSelection.select_path(failed_check.data.get_path())
+            self._repoNameEntry.grab_focus()
+            return
+        elif failed_check in self._repoURLChecks.values():
+            self._repoSelection.select_path(failed_check.data.get_path())
+            self._repoUrlEntry.grab_focus()
+            return
+        elif failed_check in self._repoProxyChecks.values():
+            self._repoSelection.select_path(failed_check.data.get_path())
+            self._repoProxyUrlEntry.grab_focus()
+            return
+        # Otherwise let GUISpokeInputCheckHandler figure out what to focus
+        elif not GUISpokeInputCheckHandler.on_back_clicked(self, button):
+            return
+
+        NormalSpoke.on_back_clicked(self, button)
 
     def on_chooser_clicked(self, button):
         dialog = IsoChooser(self.data)
 
-        with enlightbox(self.window, dialog.window):
-            # If the chooser has been run one before, we should make it default to
-            # the previously selected file.
-            if self._currentIsoFile:
-                dialog.refresh(currentFile=self._currentIsoFile)
-            else:
-                dialog.refresh()
+        # If the chooser has been run once before, we should make it default to
+        # the previously selected file.
+        if self._currentIsoFile:
+            dialog.refresh(currentFile=self._currentIsoFile)
+        else:
+            dialog.refresh()
 
+        with self.main_window.enlightbox(dialog.window):
             f = dialog.run(self._get_selected_partition())
 
-            if f:
-                self._currentIsoFile = f
-                button.set_label(os.path.basename(f))
-                button.set_use_underline(False)
-                self._verifyIsoButton.set_sensitive(True)
+        if f and f.endswith(".iso"):
+            self._currentIsoFile = f
+            button.set_label(os.path.basename(f))
+            button.set_use_underline(False)
+            self._verifyIsoButton.set_sensitive(True)
 
     def on_proxy_clicked(self, button):
         dialog = ProxyDialog(self.data, self._proxyUrl)
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             dialog.refresh()
             dialog.run()
 
@@ -847,7 +1051,7 @@ class SourceSpoke(NormalSpoke):
             return
 
         dialog = MediaCheckDialog(self.data)
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             unmount = not p.format.status
             mounts = get_mount_paths(p.path)
             # We have to check both ISO_DIR and the DRACUT_ISODIR because we
@@ -865,7 +1069,7 @@ class SourceSpoke(NormalSpoke):
             return
 
         dialog = MediaCheckDialog(self.data)
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             dialog.run("/dev/" + self._cdrom.name)
 
     def on_protocol_changed(self, combo):
@@ -880,6 +1084,11 @@ class SourceSpoke(NormalSpoke):
         self._mirrorlistCheckbox.set_visible(self._http_active())
         self._setup_no_updates()
 
+        # Any changes to the protocol combo box also need to update the check to see
+        # if the protocol now matches (e.g., user puts in a ftp:// URL with http selected
+        # in the combo box, then switches the combo box to ftp).
+        self._updateURLEntryCheck()
+
     def _update_payload_repos(self):
         """ Change the packaging repos to match the new edits
 
@@ -921,6 +1130,14 @@ class SourceSpoke(NormalSpoke):
 
             If the list has no element, clear the repo entry fields.
         """
+
+        # Remove the repo checks
+        for check in self._repoNameChecks.values() + self._repoURLChecks.values() + self._repoProxyChecks.values():
+            self.remove_check(check)
+        self._repoNameChecks = {}
+        self._repoURLChecks = {}
+        self._repoProxyChecks = {}
+
         self._repoStore.clear()
         repos = self.payload.addOns
         log.debug("Setting up repos: %s", repos)
@@ -984,8 +1201,6 @@ class SourceSpoke(NormalSpoke):
         """
         self._repoNameEntry.set_text(repo.name)
 
-        self._display_repo_name_message(repo, repo.name)
-
         self._repoMirrorlistCheckbox.handler_block_by_func(self.on_repoMirrorlistCheckbox_toggled)
         if repo.mirrorlist:
             url = repo.mirrorlist
@@ -996,9 +1211,9 @@ class SourceSpoke(NormalSpoke):
         self._repoMirrorlistCheckbox.handler_unblock_by_func(self.on_repoMirrorlistCheckbox_toggled)
 
         if url:
-            for idx, proto in REPO_PROTO:
+            for idx, proto in REPO_PROTO.iteritems():
                 if url.startswith(proto):
-                    self._repoProtocolComboBox.set_active(idx)
+                    self._repoProtocolComboBox.set_active_id(idx)
                     self._repoUrlEntry.set_text(url[len(proto):])
                     break
             else:
@@ -1023,72 +1238,6 @@ class SourceSpoke(NormalSpoke):
                 log.error("Failed to parse proxy for repo %s: %s", repo.name, e)
                 return
 
-    def _verify_repo_names(self):
-        """ Returns an appropriate error message if the list of repo names
-            contains duplicates.
-        """
-        repo_names = [r[REPO_OBJ].name for r in self._repoStore]
-        if len(repo_names) != len(frozenset(repo_names)):
-            return N_("Duplicate repository names.")
-        return None
-
-    def _display_repo_names_message(self):
-        """ Displays a warning if the list of repo names is not valid.
-            Returns the warning message displayed, if any.
-        """
-        warning_msg = self._verify_repo_names()
-        if warning_msg:
-            self._repoNamesWarningLabel.set_text(_(warning_msg))
-            really_show(self._repoNamesWarningBox)
-            self.set_warning(_("Duplicate repository names not allowed; choose a unique name for each repository."))
-            self.window.show_all()
-        else:
-            self._repoNamesWarningLabel.set_text("")
-            really_hide(self._repoNamesWarningBox)
-            self.clear_info()
-        return warning_msg
-
-    def _verify_repo_name(self, repo, name):
-        """ Returns an appropriate error message if the given name
-            is not valid for this repo.
-            Performs these checks:
-            *) Checks if the string is empty
-            *) Checks if the format is accepted by yum.
-            *) Checks if the repository name coincides with any of the
-               non-additional repositories.
-            :param repo: kickstart repository object
-            :type repo: RepoData
-            :param name: the designated name for the repo
-            :type name: string
-        """
-        if name == "":
-            return N_("Empty repository name.")
-
-        allowed_chars = string.ascii_letters + string.digits + '-_.:'
-        if [c for c in name if c not in allowed_chars]:
-            return N_("Invalid repository name.")
-
-        if name in [r for r in self.payload.repos if r not in self.payload.addOns] + [constants.BASE_REPO_NAME] + self.payload.default_repos:
-            return N_("Repository name conflicts with internal repository name.")
-        return None
-
-    def _display_repo_name_message(self, repo, name):
-        """ Displays a warning if the repo name is not valid.
-            Returns the warning message displayed, if any.
-            :param repo: kickstart repository object
-            :type repo: RepoData
-            :param name: the designated name for the repo
-            :type name: string
-        """
-        warning_msg = self._verify_repo_name(repo, name)
-        if warning_msg:
-            self._repoNameWarningLabel.set_text(_(warning_msg))
-            really_show(self._repoNameWarningBox)
-        else:
-            self._repoNameWarningLabel.set_text("")
-            really_hide(self._repoNameWarningBox)
-        return warning_msg
-
     def on_noUpdatesCheckbox_toggled(self, *args):
         """ Toggle the enable state of the updates repo
 
@@ -1113,8 +1262,6 @@ class SourceSpoke(NormalSpoke):
         itr = self._repoStore.append([True, repo.name, repo])
         self._repoSelection.select_iter(itr)
         self._repoEntryBox.set_sensitive(True)
-        self._display_repo_name_message(repo, repo.name)
-        self._display_repo_names_message()
 
     def on_removeRepo_clicked(self, button):
         """ Remove the selected repository
@@ -1122,11 +1269,20 @@ class SourceSpoke(NormalSpoke):
         itr = self._repoSelection.get_selected()[1]
         if not itr:
             return
+
+        # Remove the input validation checks for this repo
+        repo = self._repoStore[itr][REPO_OBJ]
+        self.remove_check(self._repoNameChecks[repo])
+        self.remove_check(self._repoURLChecks[repo])
+        self.remove_check(self._repoProxyChecks[repo])
+        del self._repoNameChecks[repo]
+        del self._repoURLChecks[repo]
+        del self._repoProxyChecks[repo]
+
         self._repoStore.remove(itr)
         if len(self._repoStore) == 0:
             self._clear_repo_info()
             self._repoEntryBox.set_sensitive(False)
-        self._display_repo_names_message()
 
     def on_resetRepos_clicked(self, button):
         """ Revert to the default list of repositories
@@ -1142,10 +1298,10 @@ class SourceSpoke(NormalSpoke):
         repo = self._repoStore[itr][REPO_OBJ]
         name = self._repoNameEntry.get_text().strip()
 
-        if not self._display_repo_name_message(repo, name):
-            self._repoStore.set_value(itr, REPO_NAME_COL, name)
-            repo.name = name
-        self._display_repo_names_message()
+        repo.name = name
+        self._repoStore.set_value(itr, REPO_NAME_COL, name)
+
+        self._repoNameChecks[repo].update_check_status()
 
     def on_repoUrl_changed(self, *args):
         """ proxy url or protocol changed
@@ -1154,14 +1310,16 @@ class SourceSpoke(NormalSpoke):
         if not itr:
             return
         repo = self._repoStore[itr][REPO_OBJ]
-        idx = self._repoProtocolComboBox.get_active()
-        proto = REPO_PROTO[idx][1]
+        idx = self._repoProtocolComboBox.get_active_id()
+        proto = REPO_PROTO[idx]
         url = self._repoUrlEntry.get_text().strip()
         if self._repoMirrorlistCheckbox.get_active():
             repo.mirorlist = proto + url
         else:
             repo.baseurl = proto + url
 
+        self._repoURLChecks[repo].update_check_status()
+
     def on_repoMirrorlistCheckbox_toggled(self, *args):
         """ mirror state changed
         """
@@ -1191,8 +1349,50 @@ class SourceSpoke(NormalSpoke):
         username = self._repoProxyUsernameEntry.get_text().strip() or None
         password = self._repoProxyPasswordEntry.get_text().strip() or None
 
+        self._repoProxyChecks[repo].update_check_status()
+
         try:
             proxy = ProxyString(url=url, username=username, password=password)
             repo.proxy = proxy.url
         except ProxyStringError as e:
             log.error("Failed to parse proxy - %s:%s@%s: %s", username, password, url, e)
+
+    def on_repoStore_row_changed(self, model, path, itr, user_data=None):
+        self._duplicateRepoCheck.update_check_status()
+
+    def on_repoStore_row_deleted(self, model, path, user_data=None):
+        self._duplicateRepoCheck.update_check_status()
+
+    def on_repoStore_row_inserted(self, model, path, itr, user_data=None):
+        self._duplicateRepoCheck.update_check_status()
+
+        repo = model[itr][REPO_OBJ]
+
+        # Add checks for the repo fields
+        # Use InputCheckHandler.add_check instead of GUISpokeInputCheckHandler.add_check since
+        # the input fields are used by every repo, so the changed signal handler is shared by
+        # more than one check and needs to update only the active one.
+
+        # It would be nice if we could store itr as the means of accessing this row later,
+        # and GtkListStore sets GTK_TREE_MODEL_ITERS_PERSIST which is supposed to let us
+        # do something like that, but as part of a grand practical joke the iter passed in
+        # to this method is different from the iter used everywhere else, and is useless
+        # once this method returns. Instead, create a TreeRowReference and work backwards
+        # from that using paths any time we need to reference the store.
+        self._repoNameChecks[repo] = InputCheckHandler.add_check(self, self._repoNameEntry, self._checkRepoName, Gtk.TreeRowReference.new(model, path))
+        self._repoURLChecks[repo] = InputCheckHandler.add_check(self, self._repoUrlEntry, self._checkRepoURL, Gtk.TreeRowReference.new(model, path))
+        self._repoProxyChecks[repo] = InputCheckHandler.add_check(self, self._repoProxyUrlEntry, self._checkRepoProxy, Gtk.TreeRowReference.new(model, path))
+
+    def on_repoProtocolComboBox_changed(self, combobox, user_data=None):
+        # Set the mirrorlist and proxy fields sensitivity depending on whether NFS was selected
+        sensitive = not(self._repoProtocolComboBox.get_active_id() == PROTOCOL_NFS)
+        fancy_set_sensitive(self._repoMirrorlistCheckbox, sensitive)
+        fancy_set_sensitive(self._repoProxyUrlEntry, sensitive)
+        fancy_set_sensitive(self._repoProxyUsernameEntry, sensitive)
+        fancy_set_sensitive(self._repoProxyPasswordEntry, sensitive)
+
+        # Re-run the proxy check
+        itr = self._repoSelection.get_selected()[1]
+        if itr:
+            repo = self._repoStore[itr][REPO_OBJ]
+            self._repoProxyChecks[repo].update_check_status()
diff --git a/anaconda/pyanaconda/ui/gui/spokes/storage.glade b/anaconda/pyanaconda/ui/gui/spokes/storage.glade
index a408f44..6074750 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/storage.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/storage.glade
@@ -1,256 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
-  <object class="GtkImage" id="addSpecializedImage">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">drive-harddisk</property>
-    <property name="icon-size">6</property>
-  </object>
-  <object class="GtkDialog" id="options1_dialog">
-    <property name="width_request">500</property>
-    <property name="height_request">200</property>
+  <requires lib="gtk+" version="3.10"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
+  <object class="GtkDialog" id="need_space_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">600</property>
+    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
-    <property name="mnemonics_visible">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="options1_cancel_button">
-                <property name="label" translatable="yes">Cancel &amp; _add more disks</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">start</property>
-                <property name="border_width">6</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="options_continue_button1">
-                <property name="label" translatable="yes">_Continue</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="border_width">6</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="options1_title_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">INSTALLATION OPTIONS</property>
-                <attributes>
-                  <attribute name="font-desc" value="Cantarell Bold 10"/>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="options1_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label">Here we'll describe what your options are.</property>
-                <property name="wrap">True</property>
-                <attributes>
-                  <attribute name="font-desc" value="Cantarell 11"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="options1_autopart_radio">
-                <property name="label">Here's the autopart label.</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="options1_reclaim_radio">
-                <property name="label">Here's the reclaim label.</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">options1_autopart_radio</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="options1_custom_radio">
-                <property name="label">Here's the custom label.</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">options1_autopart_radio</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">12</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Partition scheme:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="options1_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="active">3</property>
-                    <items>
-                      <item translatable="yes">Standard Partition</item>
-                      <item translatable="yes">BTRFS</item>
-                      <item translatable="yes">LVM</item>
-                      <item translatable="yes">LVM Thin Provisioning</item>
-                    </items>
-                    <signal name="changed" handler="on_type_changed" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="encryption1_checkbutton">
-                <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">options1_cancel_button</action-widget>
-      <action-widget response="1">options_continue_button1</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="options2_dialog">
-    <property name="width_request">600</property>
-    <property name="height_request">400</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <property name="mnemonics_visible">False</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox5">
         <property name="can_focus">False</property>
@@ -261,8 +23,8 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="options2_cancel_button">
-                <property name="label" translatable="yes">Cancel &amp; _add more disks</property>
+              <object class="GtkButton" id="need_space_cancel_button">
+                <property name="label" translatable="yes" context="GUI|Storage|Need Space Dialog">Cancel &amp; _add more disks</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -277,24 +39,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="options2_custom_button">
-                <property name="label" translatable="yes">_Custom partitioning</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="border_width">6</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="options2_reclaim_button">
-                <property name="label" translatable="yes">_Reclaim space</property>
+              <object class="GtkButton" id="need_space_reclaim_button">
+                <property name="label" translatable="yes" context="GUI|Storage|Need Space Dialog">_Reclaim space</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -324,7 +70,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkLabel" id="options2_title_label">
+              <object class="GtkLabel" id="need_space_title_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_bottom">6</property>
@@ -342,7 +88,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="options2_label1">
+              <object class="GtkLabel" id="need_space_desc_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
@@ -368,7 +114,7 @@
                 <property name="column_spacing">6</property>
                 <property name="row_homogeneous">True</property>
                 <child>
-                  <object class="GtkLabel" id="options2_disk_free_label">
+                  <object class="GtkLabel" id="need_space_disk_free_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
@@ -381,12 +127,10 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="options2_disk_free_desc_label">
+                  <object class="GtkLabel" id="need_space_disk_free_desc_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
@@ -399,12 +143,10 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="options2_fs_free_label">
+                  <object class="GtkLabel" id="need_space_fs_free_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
@@ -417,12 +159,10 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="options2_fs_free_desc_label">
+                  <object class="GtkLabel" id="need_space_fs_free_desc_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
@@ -435,8 +175,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -447,7 +185,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="options2_label2">
+              <object class="GtkLabel" id="need_space_options_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
@@ -463,69 +201,6 @@
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkBox" id="box2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">12</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Partition scheme:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="options2_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="active">3</property>
-                    <items>
-                      <item translatable="yes">Standard Partition</item>
-                      <item translatable="yes">BTRFS</item>
-                      <item translatable="yes">LVM</item>
-                      <item translatable="yes">LVM Thin Provisioning</item>
-                    </items>
-                    <signal name="changed" handler="on_type_changed" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="encryption2_checkbutton">
-                <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -536,22 +211,25 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">options2_cancel_button</action-widget>
-      <action-widget response="5">options2_custom_button</action-widget>
-      <action-widget response="3">options2_reclaim_button</action-widget>
+      <action-widget response="0">need_space_cancel_button</action-widget>
+      <action-widget response="3">need_space_reclaim_button</action-widget>
     </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="need_space_dialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Need Space</property>
+      </object>
+    </child>
   </object>
-  <object class="GtkDialog" id="options3_dialog">
-    <property name="width_request">400</property>
-    <property name="height_request">300</property>
+  <object class="GtkDialog" id="no_space_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">400</property>
+    <property name="default_height">300</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
-    <property name="mnemonics_visible">False</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox7">
         <property name="can_focus">False</property>
@@ -562,8 +240,8 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="options3_quit_button">
-                <property name="label" translatable="yes">_Quit installer</property>
+              <object class="GtkButton" id="no_space_quit_button">
+                <property name="label" translatable="yes" context="GUI|Storage|No Space Dialog">_Quit installer</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -578,8 +256,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="options3_cancel_button">
-                <property name="label" translatable="yes">_Cancel</property>
+              <object class="GtkButton" id="no_space_cancel_button">
+                <property name="label" translatable="yes" context="GUI|Storage|No Space Dialog">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -609,7 +287,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkLabel" id="options3_title_label">
+              <object class="GtkLabel" id="no_space_title_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_bottom">6</property>
@@ -626,7 +304,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="options3_label1">
+              <object class="GtkLabel" id="no_space_desc_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
@@ -652,7 +330,7 @@
                 <property name="column_spacing">6</property>
                 <property name="row_homogeneous">True</property>
                 <child>
-                  <object class="GtkLabel" id="options3_disk_free_label">
+                  <object class="GtkLabel" id="no_space_disk_free_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
@@ -664,12 +342,10 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="options3_disk_free_desc_label1">
+                  <object class="GtkLabel" id="no_space_disk_free_desc_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
@@ -682,12 +358,10 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="options3_fs_free_label">
+                  <object class="GtkLabel" id="no_space_fs_free_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
@@ -700,12 +374,10 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="options3_fs_free_desc_label">
+                  <object class="GtkLabel" id="no_space_fs_free_desc_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
@@ -718,8 +390,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -730,7 +400,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="options3_label2">
+              <object class="GtkLabel" id="no_space_options_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
@@ -756,9 +426,14 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="4">options3_quit_button</action-widget>
-      <action-widget response="0">options3_cancel_button</action-widget>
+      <action-widget response="4">no_space_quit_button</action-widget>
+      <action-widget response="0">no_space_cancel_button</action-widget>
     </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="no_space_dialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">No Space</property>
+      </object>
+    </child>
   </object>
   <object class="GtkListStore" id="specialized_disk_store">
     <columns>
@@ -767,13 +442,10 @@
     </columns>
   </object>
   <object class="AnacondaSpokeWindow" id="storageWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
-    <property name="mnemonics_visible">False</property>
     <property name="window_name" translatable="yes">INSTALLATION DESTINATION</property>
-    <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
+    <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
         <property name="can_focus">False</property>
@@ -803,8 +475,6 @@
             <property name="vexpand">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="xscale">1</property>
-            <property name="yscale">1</property>
             <child internal-child="action_area">
               <object class="GtkBox" id="storageWindow-action_area1">
                 <property name="can_focus">False</property>
@@ -813,30 +483,11 @@
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">18</property>
-                    <property name="margin_top">6</property>
-                    <property name="margin_bottom">6</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Select the device(s) you'd like to install to.  They will be left untouched until you click on the main menu's "Begin Installation" button.</property>
-                    <property name="wrap">True</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 12"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="vexpand">True</property>
                     <property name="hscrollbar_policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
@@ -847,14 +498,50 @@
                           <object class="GtkBox" id="box3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">24</property>
-                            <property name="margin_right">24</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label8">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">6</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Device Selection</property>
+                                <attributes>
+                                  <attribute name="font-desc" value="Cantarell 12"/>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label7">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">18</property>
+                                <property name="margin_right">18</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Select the device(s) you'd like to install to.  They will be left untouched until you click on the main menu's "Begin Installation" button.</property>
+                                <property name="wrap">True</property>
+                                <attributes>
+                                  <attribute name="font-desc" value="Cantarell 12"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkLabel" id="localLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="margin_left">18</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Local Standard Disks</property>
                                 <property name="track_visited_links">False</property>
@@ -866,13 +553,15 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkScrolledWindow" id="localScrolledWindow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="margin_left">18</property>
+                                <property name="margin_right">18</property>
                                 <property name="hexpand">True</property>
                                 <property name="vscrollbar_policy">never</property>
                                 <property name="shadow_type">in</property>
@@ -902,30 +591,40 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label6">
+                              <object class="GtkRevealer" id="local_untouched_label_revealer">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
-                                <attributes>
-                                  <attribute name="font-desc" value="Cantarell Italic 10"/>
-                                </attributes>
+                                <property name="transition_type">crossfade</property>
+                                <property name="reveal_child">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="local_untouched_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="no_show_all">True</property>
+                                    <property name="margin_right">18</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
+                                    <attributes>
+                                      <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                    </attributes>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="specializedLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_right">24</property>
+                                <property name="margin_left">18</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Specialized &amp; Network Disks</property>
                                 <property name="track_visited_links">False</property>
@@ -937,13 +636,15 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">5</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkScrolledWindow" id="specializedScrolledWindow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="margin_left">18</property>
+                                <property name="margin_right">18</property>
                                 <property name="hexpand">True</property>
                                 <property name="vscrollbar_policy">never</property>
                                 <property name="shadow_type">in</property>
@@ -966,15 +667,55 @@
                                         <signal name="key-release-event" handler="on_disks_key_released" swapped="no"/>
                                         <child>
                                           <object class="GtkButton" id="addSpecializedButton">
-                                            <property name="label" translatable="yes">_Add a disk...</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="valign">center</property>
-                                            <property name="image">addSpecializedImage</property>
                                             <property name="use_underline">True</property>
                                             <property name="image_position">top</property>
+                                            <property name="always_show_image">True</property>
                                             <signal name="clicked" handler="on_specialized_clicked" swapped="no"/>
+                                            <child>
+                                              <object class="GtkBox" id="box7">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="orientation">vertical</property>
+                                                <child>
+                                                  <object class="GtkImage" id="image1">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="icon_name">drive-harddisk</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label2">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="label" translatable="yes" context="GUI|Storage">_Add a disk...</property>
+                                                    <property name="use_underline">True</property>
+                                                    <attributes>
+                                                      <attribute name="weight" value="bold"/>
+                                                      <attribute name="scale" value="1.2"/>
+                                                    </attributes>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child internal-child="accessible">
+                                              <object class="AtkObject" id="addSpecializedButton-atkobject">
+                                                <property name="AtkObject::accessible-name" translatable="yes">Add Specialized Disk</property>
+                                              </object>
+                                            </child>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -990,23 +731,205 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label1">
+                              <object class="GtkRevealer" id="special_untouched_label_revealer">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
+                                <property name="transition_type">crossfade</property>
+                                <property name="reveal_child">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="special_untouched_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="no_show_all">True</property>
+                                    <property name="margin_right">18</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
+                                    <attributes>
+                                      <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                    </attributes>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">7</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="other_options_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">6</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Other Storage Options</property>
                                 <attributes>
-                                  <attribute name="font-desc" value="Cantarell Italic 10"/>
+                                  <attribute name="font-desc" value="Cantarell 12"/>
+                                  <attribute name="weight" value="bold"/>
                                 </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">5</property>
+                                <property name="position">8</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="other_options_grid">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">18</property>
+                                <property name="margin_right">18</property>
+                                <property name="vexpand">False</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">3</property>
+                                <child>
+                                  <object class="GtkLabel" id="label10">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Partitioning</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="width">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label11">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_top">6</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Encryption</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="width">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="autopartRadioButton">
+                                    <property name="label" translatable="yes">A_utomatically configure partitioning.</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="customRadioButton">
+                                    <property name="label" translatable="yes">_I will configure partitioning.</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">autopartRadioButton</property>
+                                    <signal name="toggled" handler="on_custom_toggled" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="box1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="encryptionCheckbox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label13">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">_Encrypt my data.</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">You'll set a passphrase next.</property>
+                                        <attributes>
+                                          <attribute name="style" value="italic"/>
+                                          <attribute name="foreground" value="#88888a8a8585"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="width">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="reclaimCheckbox">
+                                    <property name="label" translatable="yes">I would like to _make additional space available.</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="width">2</property>
+                                  </packing>
+                                </child>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="other_options_grid-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Storage Options</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">9</property>
                               </packing>
                             </child>
                           </object>
@@ -1017,45 +940,74 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="summary_button">
-                    <property name="label" translatable="yes">_Full disk summary and bootloader...</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">18</property>
-                    <property name="relief">none</property>
-                    <property name="use_underline">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="xalign">0</property>
-                    <signal name="clicked" handler="on_summary_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="summary_label">
+                  <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">18</property>
-                    <property name="label" translatable="yes">summary</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Cantarell 10"/>
-                    </attributes>
+                    <child>
+                      <object class="GtkLabel" id="summary_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="margin_right">18</property>
+                        <property name="hexpand">True</property>
+                        <property name="label" translatable="yes">summary</property>
+                        <attributes>
+                          <attribute name="font-desc" value="Cantarell 10"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRevealer" id="summary_button_revealer">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="transition_type">crossfade</property>
+                        <property name="reveal_child">True</property>
+                        <child>
+                          <object class="GtkButton" id="summary_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="no_show_all">True</property>
+                            <property name="halign">start</property>
+                            <property name="hexpand">True</property>
+                            <property name="relief">none</property>
+                            <property name="use_underline">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="xalign">0</property>
+                            <signal name="clicked" handler="on_summary_clicked" swapped="no"/>
+                            <child>
+                              <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="use_underline">True</property>
+                                <attributes>
+                                  <attribute name="underline" value="True"/>
+                                  <attribute name="foreground" value="#00000000ffff"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">4</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
               </object>
@@ -1069,5 +1021,10 @@
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="storageWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">INSTALLATION DESTINATION</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/storage.py b/anaconda/pyanaconda/ui/gui/spokes/storage.py
index aa2a7fc..fc65a0f 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/storage.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/storage.py
@@ -1,6 +1,6 @@
 # Storage configuration spoke classes
 #
-# Copyright (C) 2011, 2012  Red Hat, Inc.
+# Copyright (C) 2011-2014  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -17,6 +17,7 @@
 # Red Hat, Inc.
 #
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
 #
 
 """
@@ -41,28 +42,32 @@
 from gi.repository import Gdk, GLib, AnacondaWidgets
 
 from pyanaconda.ui.communication import hubQ
-from pyanaconda.ui.lib.disks import getDisks, isLocalDisk, size_str
+from pyanaconda.ui.lib.disks import getDisks, isLocalDisk, applyDiskSelection
 from pyanaconda.ui.gui import GUIObject
 from pyanaconda.ui.gui.spokes import NormalSpoke
 from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
 from pyanaconda.ui.gui.spokes.lib.passphrase import PassphraseDialog
 from pyanaconda.ui.gui.spokes.lib.detailederror import DetailedErrorDialog
 from pyanaconda.ui.gui.spokes.lib.resize import ResizeDialog
-from pyanaconda.ui.gui.categories.system import SystemCategory
-from pyanaconda.ui.gui.utils import enlightbox
+from pyanaconda.ui.gui.spokes.lib.dasdfmt import DasdFormatDialog
+from pyanaconda.ui.categories.system import SystemCategory
+from pyanaconda.ui.gui.utils import escape_markup, gtk_action_nowait, ignoreEscape
+from pyanaconda.ui.helpers import StorageChecker
 
-from pyanaconda.kickstart import doKickstartStorage, getAvailableDiskSpace
-from blivet import empty_device
+from pyanaconda.kickstart import doKickstartStorage, refreshAutoSwapSize, resetCustomStorageData
+from blivet import arch
 from blivet.size import Size
 from blivet.devices import MultipathDevice
-from blivet.errors import StorageError
+from blivet.errors import StorageError, DasdFormatError
 from blivet.platform import platform
 from blivet.devicelibs import swap as swap_lib
+from blivet.devicelibs.dasd import make_unformatted_dasd_list, format_dasd
 from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda.product import productName
 from pyanaconda.flags import flags
-from pyanaconda.i18n import _, N_, P_
+from pyanaconda.i18n import _, C_, CN_, P_
 from pyanaconda import constants
+from pyanaconda import isys
 from pyanaconda.bootloader import BootLoaderError
 
 from pykickstart.constants import CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM
@@ -75,116 +80,52 @@ log = logging.getLogger("anaconda")
 
 __all__ = ["StorageSpoke"]
 
-class InstallOptions1Dialog(GUIObject):
-    builderObjects = ["options1_dialog"]
-    mainWidgetName = "options1_dialog"
+# Response ID codes for all the various buttons on all the dialogs.
+RESPONSE_CANCEL = 0
+RESPONSE_MODIFY_SW = 2
+RESPONSE_RECLAIM = 3
+RESPONSE_QUIT = 4
+
+class InstallOptionsDialogBase(GUIObject):
     uiFile = "spokes/storage.glade"
 
-    # Response ID codes for all the various buttons on all the dialogs.
-    RESPONSE_CANCEL = 0
-    RESPONSE_CONTINUE = 1
-    RESPONSE_MODIFY_SW = 2
-    RESPONSE_RECLAIM = 3
-    RESPONSE_QUIT = 4
-    RESPONSE_CUSTOM = 5
-
-    # Which radiobutton is selected on the options1 dialog?
-    RESPONSE_CONTINUE_NONE = -1
-    RESPONSE_CONTINUE_AUTOPART = 0
-    RESPONSE_CONTINUE_RECLAIM = 1
-    RESPONSE_CONTINUE_CUSTOM = 2
-
     def __init__(self, *args, **kwargs):
         self.payload = kwargs.pop("payload", None)
-        self.showReclaim = kwargs.pop("showReclaim", None)
         GUIObject.__init__(self, *args, **kwargs)
 
-        self.autoPartType = None
-        self.encrypted = False
-
         self._grabObjects()
 
     def _grabObjects(self):
-        self.autoPartTypeCombo = self.builder.get_object("options1_combo")
-        self.encryptCheckbutton = self.builder.get_object("encryption1_checkbutton")
+        pass
 
     def run(self):
         rc = self.window.run()
         self.window.destroy()
         return rc
 
-    # pylint: disable-msg=W0221
-    def refresh(self, required_space, auto_swap, disk_free, fs_free, autoPartType, encrypted):
-        self.autoPartType = autoPartType
-        self.autoPartTypeCombo.set_active(self.autoPartType)
-
-        self.encrypted = encrypted
-        self.encryptCheckbutton.set_active(self.encrypted)
-
-        options_label = self.builder.get_object("options1_label")
-
-        options_text = _("You have <b>%(freeSpace)s</b> of free space, which is "
-                         "enough to install %(productName)s.  What would you "
-                         "like to do?") % {"freeSpace": disk_free, "productName": productName}
-        options_label.set_markup(options_text)
-
-        label = self.builder.get_object("options1_autopart_radio").get_children()[0]
-        label.set_markup(_("<span font-desc=\"Cantarell 11\">A_utomatically "
-                           "configure my %(productName)s installation to the "
-                           "disk(s) I selected and return me to the main "
-                           "menu.</span>") % {"productName": productName})
-        label.set_line_wrap(True)
-        label.set_use_underline(True)
-
-        radio = self.builder.get_object("options1_reclaim_radio")
-        if self.showReclaim:
-            label = radio.get_children()[0]
-            label.set_markup(_("<span font-desc=\"Cantarell 11\">I want more space. "
-                               "_Guide me through shrinking and/or removing partitions "
-                               "so I can have more space for %(productName)s.</span>") % {"productName": productName})
-            label.set_line_wrap(True)
-            label.set_use_underline(True)
-        else:
-            radio.hide()
-
-        label = self.builder.get_object("options1_custom_radio").get_children()[0]
-        label.set_markup(_("<span font-desc=\"Cantarell 11\">I want to review/_modify "
-                           "my disk partitions before continuing.</span>"))
-        label.set_line_wrap(True)
-        label.set_use_underline(True)
-
-    @property
-    def continue_response(self):
-        if self.builder.get_object("options1_autopart_radio").get_active():
-            return self.RESPONSE_CONTINUE_AUTOPART
-        elif self.builder.get_object("options1_reclaim_radio").get_active():
-            return self.RESPONSE_CONTINUE_RECLAIM
-        elif self.builder.get_object("options1_custom_radio").get_active():
-            return self.RESPONSE_CONTINUE_CUSTOM
-        else:
-            return self.RESPONSE_CONTINUE_NONE
-
     def _modify_sw_link_clicked(self, label, uri):
         if self._software_is_ready():
-            self.window.response(self.RESPONSE_MODIFY_SW)
+            self.window.response(RESPONSE_MODIFY_SW)
 
         return True
 
     def _get_sw_needs_text(self, required_space, auto_swap):
-        sw_text = (_("Your current <b>%(product)s</b> software "
-                     "selection requires <b>%(total)s</b> of available "
+        tooltip = _("Please wait... software metadata still loading.")
+        sw_text = (_("Your current <a href=\"\" title=\"%(tooltip)s\"><b>%(product)s</b> software "
+                     "selection</a> requires <b>%(total)s</b> of available "
                      "space, including <b>%(software)s</b> for software and "
                      "<b>%(swap)s</b> for swap space.")
-                   % {"product": productName,
-                      "total": required_space + auto_swap,
-                      "software": required_space, "swap": auto_swap})
+                   % {"tooltip": escape_markup(tooltip),
+                      "product": escape_markup(productName),
+                      "total": escape_markup(str(required_space + auto_swap)),
+                      "software": escape_markup(str(required_space)),
+                      "swap": escape_markup(str(auto_swap))})
         return sw_text
 
     # Methods to handle sensitivity of the modify button.
     def _software_is_ready(self):
         # FIXME:  Would be nicer to just ask the spoke if it's ready.
         return (not threadMgr.get(constants.THREAD_PAYLOAD) and
-                not threadMgr.get(constants.THREAD_PAYLOAD_MD) and
                 not threadMgr.get(constants.THREAD_SOFTWARE_WATCHER) and
                 not threadMgr.get(constants.THREAD_CHECK_SOFTWARE) and
                 self.payload.baseRepo is not None)
@@ -192,57 +133,39 @@ class InstallOptions1Dialog(GUIObject):
     def _check_for_storage_thread(self, button):
         if self._software_is_ready():
             button.set_has_tooltip(False)
-            button.show_all()
 
             # False means this function should never be called again.
             return False
         else:
             return True
 
-    def _add_modify_watcher(self, widgetName):
+    def _add_modify_watcher(self, widget):
         # If the payload fetching thread is still running, the user can't go to
         # modify the software selection screen.  Thus, we have to set the button
         # insensitive and wait until software selection is ready to go.
-        modify_widget = self.builder.get_object(widgetName)
         if not self._software_is_ready():
-            GLib.timeout_add_seconds(1, self._check_for_storage_thread, modify_widget)
+            GLib.timeout_add_seconds(1, self._check_for_storage_thread, widget)
 
-    # signal handlers
-    def on_type_changed(self, combo):
-        self.autoPartType = combo.get_active()
-
-    def on_encrypt_toggled(self, checkbox):
-        self.encrypted = checkbox.get_active()
-
-class InstallOptions2Dialog(InstallOptions1Dialog):
-    builderObjects = ["options2_dialog"]
-    mainWidgetName = "options2_dialog"
+class NeedSpaceDialog(InstallOptionsDialogBase):
+    builderObjects = ["need_space_dialog"]
+    mainWidgetName = "need_space_dialog"
 
     def _grabObjects(self):
-        self.autoPartTypeCombo = self.builder.get_object("options2_combo")
-        self.encryptCheckbutton = self.builder.get_object("encryption2_checkbutton")
-        self.disk_free_label = self.builder.get_object("options2_disk_free_label")
-        self.fs_free_label = self.builder.get_object("options2_fs_free_label")
+        self.disk_free_label = self.builder.get_object("need_space_disk_free_label")
+        self.fs_free_label = self.builder.get_object("need_space_fs_free_label")
 
     def _set_free_space_labels(self, disk_free, fs_free):
-        disk_free_text = size_str(disk_free)
-        self.disk_free_label.set_text(disk_free_text)
-
-        fs_free_text = size_str(fs_free)
-        self.fs_free_label.set_text(fs_free_text)
-
-    def refresh(self, required_space, auto_swap, disk_free, fs_free, autoPartType, encrypted):
-        self.autoPartType = autoPartType
-        self.autoPartTypeCombo.set_active(self.autoPartType)
-
-        self.encrypted = encrypted
-        self.encryptCheckbutton.set_active(self.encrypted)
+        self.disk_free_label.set_text(str(disk_free))
+        self.fs_free_label.set_text(str(fs_free))
 
+    # pylint: disable=arguments-differ
+    def refresh(self, required_space, auto_swap, disk_free, fs_free):
         sw_text = self._get_sw_needs_text(required_space, auto_swap)
         label_text = _("%s The disks you've selected have the following "
                        "amounts of free space:") % sw_text
-        label = self.builder.get_object("options2_label1")
+        label = self.builder.get_object("need_space_desc_label")
         label.set_markup(label_text)
+        label.connect("activate-link", self._modify_sw_link_clicked)
 
         self._set_free_space_labels(disk_free, fs_free)
 
@@ -250,39 +173,33 @@ class InstallOptions2Dialog(InstallOptions1Dialog):
                        "%s</b>.  You can shrink or remove existing partitions "
                        "via our guided reclaim space tool, or you can adjust your "
                        "partitions on your own in the custom partitioning "
-                       "interface.") % productName
-        self.builder.get_object("options2_label2").set_markup(label_text)
+                       "interface.") % escape_markup(productName)
+        self.builder.get_object("need_space_options_label").set_markup(label_text)
 
-        self._add_modify_watcher("options2_label1")
+        self._add_modify_watcher(label)
 
-    @property
-    def continue_response(self):
-        return self.RESPONSE_CONTINUE_NONE
-
-class InstallOptions3Dialog(InstallOptions1Dialog):
-    builderObjects = ["options3_dialog"]
-    mainWidgetName = "options3_dialog"
+class NoSpaceDialog(InstallOptionsDialogBase):
+    builderObjects = ["no_space_dialog"]
+    mainWidgetName = "no_space_dialog"
 
     def _grabObjects(self):
-        self.disk_free_label = self.builder.get_object("options3_disk_free_label")
-        self.fs_free_label = self.builder.get_object("options3_fs_free_label")
+        self.disk_free_label = self.builder.get_object("no_space_disk_free_label")
+        self.fs_free_label = self.builder.get_object("no_space_fs_free_label")
 
     def _set_free_space_labels(self, disk_free, fs_free):
-        disk_free_text = size_str(disk_free)
-        self.disk_free_label.set_text(disk_free_text)
+        self.disk_free_label.set_text(str(disk_free))
+        self.fs_free_label.set_text(str(fs_free))
 
-        fs_free_text = size_str(fs_free)
-        self.fs_free_label.set_text(fs_free_text)
-
-    def refresh(self, required_space, auto_swap, disk_free, fs_free, autoPartType, encrypted):
+    # pylint: disable=arguments-differ
+    def refresh(self, required_space, auto_swap, disk_free, fs_free):
         sw_text = self._get_sw_needs_text(required_space, auto_swap)
         label_text = (_("%(sw_text)s You don't have enough space available to install "
                         "<b>%(product)s</b>, even if you used all of the free space "
                         "available on the selected disks.")
-                      % {"sw_text": sw_text, "product": productName})
-        label = self.builder.get_object("options3_label1")
+                      % {"sw_text": escape_markup(sw_text),
+                         "product": escape_markup(productName)})
+        label = self.builder.get_object("no_space_desc_label")
         label.set_markup(label_text)
-        label.set_tooltip_text(_("Please wait... software metadata still loading."))
         label.connect("activate-link", self._modify_sw_link_clicked)
 
         self._set_free_space_labels(disk_free, fs_free)
@@ -293,55 +210,25 @@ class InstallOptions3Dialog(InstallOptions1Dialog):
                        "disks for additional space, "
                        "modify your software selection to install a smaller "
                        "version of <b>%(productName)s</b>, or quit the installer.") % \
-                               {"productName": productName}
-        self.builder.get_object("options3_label2").set_markup(label_text)
+                               {"productName": escape_markup(productName)}
+        self.builder.get_object("no_space_options_label").set_markup(label_text)
 
-        self._add_modify_watcher("options3_label1")
-
-    @property
-    def continue_response(self):
-        return self.RESPONSE_CONTINUE_NONE
-
-class StorageChecker(object):
-    errors = []
-    warnings = []
-    _mainSpokeClass = "StorageSpoke"
-
-    def __init__(self):
-        # This is provided by the StorageSpoke class, which is a subclass of
-        # this one.  Backwards, I know.
-        self.storage  = None
-
-    def run(self):
-        threadMgr.add(AnacondaThread(name=constants.THREAD_CHECK_STORAGE,
-                                     target=self.checkStorage))
-
-    def checkStorage(self):
-        threadMgr.wait(constants.THREAD_EXECUTE_STORAGE)
-
-        hubQ.send_not_ready(self._mainSpokeClass)
-        hubQ.send_message(self._mainSpokeClass, _("Checking storage configuration..."))
-        (StorageChecker.errors,
-         StorageChecker.warnings) = self.storage.sanityCheck()
-        hubQ.send_ready(self._mainSpokeClass, True)
-        for e in StorageChecker.errors:
-            log.error(e)
-        for w in StorageChecker.warnings:
-            log.warn(w)
+        self._add_modify_watcher(label)
 
 class StorageSpoke(NormalSpoke, StorageChecker):
     builderObjects = ["storageWindow", "addSpecializedImage"]
     mainWidgetName = "storageWindow"
     uiFile = "spokes/storage.glade"
+    helpFile = "StorageSpoke.xml"
 
     category = SystemCategory
 
     # other candidates: computer-symbolic, folder-symbolic
     icon = "drive-harddisk-symbolic"
-    title = N_("INSTALLATION _DESTINATION")
+    title = CN_("GUI|Spoke", "INSTALLATION _DESTINATION")
 
     def __init__(self, *args, **kwargs):
-        StorageChecker.__init__(self)
+        StorageChecker.__init__(self, min_ram=isys.MIN_GUI_RAM)
         NormalSpoke.__init__(self, *args, **kwargs)
         self.applyOnSkip = True
 
@@ -364,22 +251,25 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         self.autoPartType = None
         self.clearPartType = CLEARPART_TYPE_NONE
 
+        if self.data.zerombr.zerombr and arch.isS390():
+            # run dasdfmt on any unformatted DASDs automatically
+            threadMgr.add(AnacondaThread(name=constants.THREAD_DASDFMT,
+                            target=self.run_dasdfmt))
+
         self._previous_autopart = False
 
         self._last_clicked_overview = None
         self._cur_clicked_overview = None
 
-    def _applyDiskSelection(self, use_names):
-        onlyuse = use_names[:]
-        for disk in (d for d in self.storage.disks if d.name in onlyuse):
-            onlyuse.extend(d.name for d in disk.ancestors
-                           if d.name not in onlyuse)
+        self._grabObjects()
 
-        self.data.ignoredisk.onlyuse = onlyuse
-        self.data.clearpart.drives = use_names[:]
+    def _grabObjects(self):
+        self._customPart = self.builder.get_object("customRadioButton")
+        self._encrypted = self.builder.get_object("encryptionCheckbox")
+        self._reclaim = self.builder.get_object("reclaimCheckbox")
 
     def apply(self):
-        self._applyDiskSelection(self.selected_disks)
+        applyDiskSelection(self.storage, self.data, self.selected_disks)
         self.data.autopart.autopart = self.autopart
         self.data.autopart.type = self.autoPartType
         self.data.autopart.encrypted = self.encrypted
@@ -405,13 +295,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         # user may have set up before now.
         self.storage.config.clearNonExistent = self.data.autopart.autopart
 
-        # refresh the autopart swap size suggestion with currently selected disks
-        for request in self.storage.autoPartitionRequests:
-            if request.fstype == "swap":
-                disk_space = getAvailableDiskSpace(self.storage)
-                request.size = swap_lib.swapSuggestion(disk_space=disk_space)
-                break
-
+    @gtk_action_nowait
     def execute(self):
         # Spawn storage execution as a separate thread so there's no big delay
         # going back from this spoke to the hub while StorageChecker.run runs.
@@ -422,6 +306,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
     def _doExecute(self):
         self._ready = False
         hubQ.send_not_ready(self.__class__.__name__)
+        # on the off-chance dasdfmt is running, we can't proceed further
+        threadMgr.wait(constants.THREAD_DASDFMT)
         hubQ.send_message(self.__class__.__name__, _("Saving storage configuration..."))
         try:
             doKickstartStorage(self.storage, self.data, self.instclass)
@@ -436,7 +322,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.storage.reset()
             self.disks = getDisks(self.storage.devicetree)
             # now set ksdata back to the user's specified config
-            self._applyDiskSelection(self.selected_disks)
+            applyDiskSelection(self.storage, self.data, self.selected_disks)
         except BootLoaderError as e:
             log.error("BootLoader setup failed: %s", e)
             StorageChecker.errors = str(e).split("\n")
@@ -444,11 +330,9 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.data.bootloader.bootDrive = ""
         else:
             if self.autopart:
-                # this was already run as part of doAutoPartition. dumb.
-                StorageChecker.errors = []
-                StorageChecker.warnings = []
                 self.run()
         finally:
+            resetCustomStorageData(self.data)
             self._ready = True
             hubQ.send_ready(self.__class__.__name__, True)
 
@@ -477,6 +361,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
 
         if flags.automatedInstall and not self.storage.rootDevice:
             return msg
+        elif threadMgr.get(constants.THREAD_DASDFMT):
+            msg = _("Formatting DASDs")
         elif self.data.ignoredisk.onlyuse:
             msg = P_(("%d disk selected"),
                      ("%d disks selected"),
@@ -605,31 +491,19 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             name = overview.get_property("name")
             overview.set_chosen(name in self.selected_disks)
 
+        self._customPart.set_active(not self.autopart)
+
         self._update_summary()
 
         if self.errors:
             self.set_warning(_("Error checking storage configuration.  Click for details."))
         elif self.warnings:
             self.set_warning(_("Warning checking storage configuration.  Click for details."))
+        self.window.show_all()
 
     def initialize(self):
         NormalSpoke.initialize(self)
 
-        # Wouldn't it be nice if glade knew how to do this?
-        label = self.builder.get_object("summary_button").get_children()[0]
-        markup = "<span foreground='blue'><u>%s</u></span>" % label.get_text()
-        label.set_use_markup(True)
-        label.set_markup(markup)
-
-        specializedButton = self.builder.get_object("addSpecializedButton")
-
-        # It's uh... uh... it's down there somewhere, let me take another look.
-        label = specializedButton.get_children()[0].get_children()[0].get_children()[1]
-        markup = "<span size='large'><b>%s</b></span>" % label.get_text()
-        label.set_use_markup(True)
-        label.set_markup(markup)
-        specializedButton.show_all()
-
         self.local_disks_box = self.builder.get_object("local_disks_box")
         self.specialized_disks_box = self.builder.get_object("specialized_disks_box")
 
@@ -642,7 +516,6 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         else:
             kind = "drive-harddisk"
 
-        size = size_str(disk.size)
         if disk.serial:
             popup_info = "%s" % disk.serial
         else:
@@ -652,7 +525,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         # That makes the DO way too wide.
         if isinstance(disk, MultipathDevice):
             desc = disk.wwid.split(":")
-            description = ":".join(desc[0:3]) + "..." + ":".join(desc[-5:-1])
+            description = ":".join(desc[0:3]) + "..." + ":".join(desc[-4:])
         else:
             description = disk.description
 
@@ -660,8 +533,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
 
         overview = AnacondaWidgets.DiskOverview(description,
                                                 kind,
-                                                size,
-                                                _("%s free") % size_str(free),
+                                                str(disk.size),
+                                                _("%s free") % free,
                                                 disk.name,
                                                 popup=popup_info)
         box.pack_start(overview, False, False, 0)
@@ -686,7 +559,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
 
         # if there's only one disk, select it by default
         if len(self.disks) == 1 and not self.selected_disks:
-            self._applyDiskSelection([self.disks[0].name])
+            applyDiskSelection(self.storage, self.data, [self.disks[0].name])
 
         self._ready = True
         hubQ.send_ready(self.__class__.__name__, False)
@@ -694,8 +567,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
     def _update_summary(self):
         """ Update the summary based on the UI. """
         count = 0
-        capacity = 0
-        free = Size(bytes=0)
+        capacity = Size(0)
+        free = Size(0)
 
         # pass in our disk list so hidden disks' free space is available
         free_space = self.storage.getFreeSpace(disks=self.disks)
@@ -706,21 +579,28 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             free += free_space[disk.name][0]
             count += 1
 
+        anySelected = count > 0
+
         summary = (P_("%(count)d disk selected; %(capacity)s capacity; %(free)s free",
                       "%(count)d disks selected; %(capacity)s capacity; %(free)s free",
                       count) % {"count" : count,
-                                "capacity" : str(Size(en_spec="%f MB" % capacity)),
+                                "capacity" : capacity,
                                 "free" : free})
         summary_label = self.builder.get_object("summary_label")
         summary_label.set_text(summary)
-        summary_label.set_sensitive(count > 0)
+        summary_label.set_sensitive(anySelected)
 
-        summary_button = self.builder.get_object("summary_button")
-        summary_button.set_visible(count > 0)
+        # only show the "we won't touch your other disks" labels and summary button when
+        # some disks are selected
+        self.builder.get_object("summary_button_revealer").set_reveal_child(anySelected)
+        self.builder.get_object("local_untouched_label_revealer").set_reveal_child(anySelected)
+        self.builder.get_object("special_untouched_label_revealer").set_reveal_child(anySelected)
+        self.builder.get_object("other_options_label").set_sensitive(anySelected)
+        self.builder.get_object("other_options_grid").set_sensitive(anySelected)
 
         if len(self.disks) == 0:
             self.set_warning(_("No disks detected.  Please shut down the computer, connect at least one disk, and restart to complete installation."))
-        elif count == 0:
+        elif not anySelected:
             self.set_warning(_("No disks selected; please select at least one disk to install to."))
         else:
             self.clear_info()
@@ -737,6 +617,34 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             if not selected and name in self.selected_disks:
                 self.selected_disks.remove(name)
 
+    def run_dasdfmt(self):
+        """
+        Though the same function exists in pyanaconda.ui.gui.spokes.lib.dasdfmt,
+        this instance doesn't include any of the UI pieces and should only
+        really be getting called on ks installations with "zerombr".
+        """
+        # wait for the initial storage thread to complete before taking any new
+        # actions on storage devices
+        threadMgr.wait(constants.THREAD_STORAGE)
+
+        to_format = make_unformatted_dasd_list(d.name for d in getDisks(self.storage.devicetree))
+        if not to_format:
+            # nothing to do here; bail
+            return
+
+        hubQ.send_message(self.__class__.__name__, _("Formatting DASDs"))
+        for disk in to_format:
+            try:
+                format_dasd(disk)
+            except DasdFormatError as err:
+                # Log errors if formatting fails, but don't halt the installer
+                log.error(str(err))
+                continue
+
+        # I really hate doing this, but the way is the way; probably the most
+        # correct way to kajigger the storage spoke into becoming ready
+        self.execute()
+
     # signal handlers
     def on_summary_clicked(self, button):
         # show the selected disks dialog
@@ -767,7 +675,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.clear_info()
 
     def run_lightbox_dialog(self, dialog):
-        with enlightbox(self.window, dialog.window):
+        with self.main_window.enlightbox(dialog.window):
             rc = dialog.run()
 
         return rc
@@ -780,10 +688,16 @@ class StorageSpoke(NormalSpoke, StorageChecker):
 
         dialog = PassphraseDialog(self.data)
         rc = self.run_lightbox_dialog(dialog)
-        if rc == 0:
+        if rc != 1:
             return False
 
         self.passphrase = dialog.passphrase
+
+        for device in self.storage.devices:
+            if device.format.type == "luks" and not device.format.exists:
+                if not device.format.hasKey:
+                    device.format.passphrase = self.passphrase
+
         return True
 
     def on_back_clicked(self, button):
@@ -812,13 +726,37 @@ class StorageSpoke(NormalSpoke, StorageChecker):
 
         # show the installation options dialog
         disks = [d for d in self.disks if d.name in self.selected_disks]
-        disks_size = sum(Size(en_spec="%f MB" % d.size) for d in disks)
+        disks_size = sum((d.size for d in disks), Size(0))
 
         # No disks selected?  The user wants to back out of the storage spoke.
         if not disks:
             NormalSpoke.on_back_clicked(self, button)
             return
 
+        if arch.isS390():
+            # check for unformatted DASDs and launch dasdfmt if any discovered
+            dasds = make_unformatted_dasd_list(self.selected_disks)
+            if len(dasds) > 0:
+                # We want to apply current selection before running dasdfmt to
+                # prevent this information from being lost afterward
+                applyDiskSelection(self.storage, self.data, self.selected_disks)
+                dialog = DasdFormatDialog(self.data, self.storage, dasds)
+                ignoreEscape(dialog.window)
+                rc = self.run_lightbox_dialog(dialog)
+                if rc == 1:
+                    # User hit OK on the dialog
+                    self.refresh()
+                elif rc == 2:
+                    # User clicked uri to return to hub.
+                    NormalSpoke.on_back_clicked(self, button)
+                    return
+                elif rc != 2:
+                    # User either hit cancel on the dialog or closed it via escape,
+                    # there was no formatting done.
+                    # NOTE: rc == 2 means the user clicked on the link that takes t
+                    # back to the hub.
+                    return
+
         # Figure out if the existing disk labels will work on this platform
         # you need to have at least one of the platform's labels in order for
         # any of the free space to be useful.
@@ -837,56 +775,68 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             fs_free = sum(f[1] for f in free_space.itervalues())
 
         required_space = self.payload.spaceRequired
-        auto_swap = Size(bytes=0)
-        for autoreq in self.storage.autoPartitionRequests:
-            if autoreq.fstype == "swap":
-                auto_swap += Size(en_spec="%d MB" % autoreq.size)
+        auto_swap = sum((r.size for r in self.storage.autoPartitionRequests
+                                if r.fstype == "swap"), Size(0))
+        if self.autopart and auto_swap == Size(0):
+            # autopartitioning requested, but not applied yet (=> no auto swap
+            # requests), ask user for enough space to fit in the suggested swap
+            auto_swap = swap_lib.swapSuggestion()
 
         log.debug("disk free: %s  fs free: %s  sw needs: %s  auto swap: %s",
                   disk_free, fs_free, required_space, auto_swap)
+
         if disk_free >= required_space + auto_swap:
-            showReclaim = not all(map(lambda dev: empty_device(dev, self.storage.devicetree),
-                                      self.disks))
-            dialog = InstallOptions1Dialog(self.data, showReclaim=showReclaim)
+            dialog = None
         elif disks_size >= required_space:
-            dialog = InstallOptions2Dialog(self.data, payload=self.payload)
+            if self._customPart.get_active() or self._reclaim.get_active():
+                dialog = None
+            else:
+                dialog = NeedSpaceDialog(self.data, payload=self.payload)
+                dialog.refresh(required_space, auto_swap, disk_free, fs_free)
+                rc = self.run_lightbox_dialog(dialog)
         else:
-            dialog = InstallOptions3Dialog(self.data, payload=self.payload)
+            dialog = NoSpaceDialog(self.data, payload=self.payload)
+            dialog.refresh(required_space, auto_swap, disk_free, fs_free)
+            rc = self.run_lightbox_dialog(dialog)
 
-        dialog.refresh(required_space, auto_swap, disk_free, fs_free, self.autoPartType,
-                       self.encrypted)
-        rc = self.run_lightbox_dialog(dialog)
-        if rc == dialog.RESPONSE_CONTINUE:
-            self.autoPartType = dialog.autoPartType
-            self.encrypted = dialog.encrypted
+        if not dialog:
+            # Plenty of room - there's no need to pop up a dialog, so just send
+            # the user to wherever they asked to go.  That's either the custom
+            # spoke or the hub.
+            #    - OR -
+            # Not enough room, but the user checked the reclaim button.
 
-            if not self._check_encrypted():
-                return
+            self.encrypted = self._encrypted.get_active()
 
-            if dialog.continue_response == dialog.RESPONSE_CONTINUE_AUTOPART:
-                self.autopart = True
-            elif dialog.continue_response == dialog.RESPONSE_CONTINUE_RECLAIM:
-                self.apply()
-                if not self._show_resize_dialog(disks):
-                    # User pressed cancel on the reclaim dialog, so don't leave
-                    # the storage spoke.
-                    return
-
-                # if the user did not press cancel that means they want to
-                # proceed with autopart
-                self.autopart = True
-            elif dialog.continue_response == dialog.RESPONSE_CONTINUE_CUSTOM:
+            if self._customPart.get_active():
                 self.autopart = False
                 self.skipTo = "CustomPartitioningSpoke"
-        elif rc == dialog.RESPONSE_CANCEL:
-            # stay on this spoke
+            else:
+                self.autopart = True
+
+                # We might first need to ask about an encryption passphrase.
+                if not self._check_encrypted():
+                    return
+
+                # Oh and then we might also want to go to the reclaim dialog.
+                if self._reclaim.get_active():
+                    self.apply()
+                    if not self._show_resize_dialog(disks):
+                        # User pressed cancel on the reclaim dialog, so don't leave
+                        # the storage spoke.
+                        return
+        elif rc == RESPONSE_CANCEL:
+            # A cancel button was clicked on one of the dialogs.  Stay on this
+            # spoke.  Generally, this is because the user wants to add more disks.
             return
-        elif rc == dialog.RESPONSE_MODIFY_SW:
-            # go to software spoke
+        elif rc == RESPONSE_MODIFY_SW:
+            # The "Fedora software selection" link was clicked on one of the
+            # dialogs.  Send the user to the software spoke.
             self.skipTo = "SoftwareSelectionSpoke"
-        elif rc == dialog.RESPONSE_RECLAIM:
-            self.autoPartType = dialog.autoPartType
-            self.encrypted = dialog.encrypted
+        elif rc == RESPONSE_RECLAIM:
+            # Not enough space, but the user can make enough if they do some
+            # work and free up space.
+            self.encrypted = self._encrypted.get_active()
 
             if not self._check_encrypted():
                 return
@@ -897,18 +847,24 @@ class StorageSpoke(NormalSpoke, StorageChecker):
                 # the storage spoke.
                 return
 
-            # if the user did not press cancel that means they want to
-            # proceed with autopart
-            self.autopart = True
-        elif rc == dialog.RESPONSE_QUIT:
+            # And then go to the custom partitioning spoke if they chose to
+            # do so.
+            if self._customPart.get_active():
+                self.autopart = False
+                self.skipTo = "CustomPartitioningSpoke"
+            else:
+                self.autopart = True
+        elif rc == RESPONSE_QUIT:
+            # Not enough space, and the user can't do anything about it so
+            # they chose to quit.
             raise SystemExit("user-selected exit")
-        elif rc == dialog.RESPONSE_CUSTOM:
-            self.autopart = False
-            self.autoPartType = dialog.autoPartType
-            self.encrypted = dialog.encrypted
-
-            self.skipTo = "CustomPartitioningSpoke"
+        else:
+            # I don't know how we'd get here, but might as well have a
+            # catch-all.  Just stay on this spoke.
+            return
 
+        if self.autopart:
+            refreshAutoSwapSize(self.storage)
         self.applyOnSkip = True
         NormalSpoke.on_back_clicked(self, button)
 
@@ -919,6 +875,16 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         rc = self.run_lightbox_dialog(resizeDialog)
         return rc
 
+    def on_custom_toggled(self, button):
+        # The custom button won't be active until after this handler is run,
+        # so we have to negate everything here.
+        self._reclaim.set_sensitive(not button.get_active())
+
+        if self._reclaim.get_sensitive():
+            self._reclaim.set_has_tooltip(False)
+        else:
+            self._reclaim.set_tooltip_text(_("You'll be able to make space available during custom partitioning."))
+
     def on_specialized_clicked(self, button):
         # Don't want to run apply or execute in this case, since we have to
         # collect some more disks first.  The user will be back to this spoke.
@@ -926,7 +892,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
 
         # However, we do want to apply current selections so the disk cart off
         # the filter spoke will display the correct information.
-        self._applyDiskSelection(self.selected_disks)
+        applyDiskSelection(self.storage, self.data, self.selected_disks)
 
         self.skipTo = "FilterSpoke"
         NormalSpoke.on_back_clicked(self, button)
@@ -937,8 +903,11 @@ class StorageSpoke(NormalSpoke, StorageChecker):
                       "configuration.  You can modify your storage layout or quit the "
                       "installer.")
 
-            dialog = DetailedErrorDialog(self.data, buttons=[_("_Quit"), _("_Modify Storage Layout")], label=label)
-            with enlightbox(self.window, dialog.window):
+            dialog = DetailedErrorDialog(self.data, buttons=[
+                    C_("GUI|Storage|Error Dialog", "_Quit"),
+                    C_("GUI|Storage|Error Dialog", "_Modify Storage Layout")],
+                label=label)
+            with self.main_window.enlightbox(dialog.window):
                 errors = "\n".join(self.errors)
                 dialog.refresh(errors)
                 rc = dialog.run()
@@ -954,7 +923,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
                       "changes to your storage layout.")
 
             dialog = DetailedErrorDialog(self.data, buttons=[_("_OK")], label=label)
-            with enlightbox(self.window, dialog.window):
+            with self.main_window.enlightbox(dialog.window):
                 warnings = "\n".join(self.warnings)
                 dialog.refresh(warnings)
                 rc = dialog.run()
diff --git a/anaconda/pyanaconda/ui/gui/spokes/user.glade b/anaconda/pyanaconda/ui/gui/spokes/user.glade
index d2f701f..cecbdd1 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/user.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/user.glade
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
+  <requires lib="gtk+" version="3.6"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="AnacondaSpokeWindow" id="userCreationWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="startup_id">filler</property>
     <property name="window_name" translatable="yes">CREATE USER</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
@@ -17,7 +16,6 @@
         <property name="spacing">6</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
-            <property name="app_paintable">True</property>
             <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
@@ -39,8 +37,8 @@
             <property name="can_focus">False</property>
             <property name="margin_top">12</property>
             <property name="yalign">0</property>
-            <property name="xscale">0.75</property>
-            <property name="yscale">0.75</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0.5</property>
             <property name="bottom_padding">48</property>
             <property name="left_padding">24</property>
             <property name="right_padding">24</property>
@@ -61,7 +59,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes">_Full name</property>
+                        <property name="label" translatable="yes" context="GUI|User">_Full name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">t_fullname</property>
                         <attributes>
@@ -71,8 +69,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -81,7 +77,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes">_Username</property>
+                        <property name="label" translatable="yes" context="GUI|User">_Username</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">t_username</property>
                         <attributes>
@@ -91,8 +87,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -100,15 +94,17 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="caps_lock_warning">False</property>
                         <signal name="changed" handler="full_name_changed" swapped="no"/>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="t_fullname-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Full Name</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -116,14 +112,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <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>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -132,7 +130,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes">_Password</property>
+                        <property name="label" translatable="yes" context="GUI|User">_Password</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">t_password</property>
                         <attributes>
@@ -142,8 +140,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -152,7 +148,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes">_Confirm password</property>
+                        <property name="label" translatable="yes" context="GUI|User">_Confirm password</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">t_verifypassword</property>
                         <attributes>
@@ -162,8 +158,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">7</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -173,12 +167,15 @@
                         <property name="visibility">False</property>
                         <property name="invisible_char">●</property>
                         <signal name="changed" handler="password_changed" swapped="no"/>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="t_password-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Password</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -187,12 +184,15 @@
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
                         <property name="invisible_char">●</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="t_verifypassword-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Confirm Password</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">7</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -206,13 +206,11 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="c_usepassword">
-                        <property name="label" translatable="yes">Require a password to use this account</property>
+                        <property name="label" translatable="yes" context="GUI|User">Require a password to use this account</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -224,8 +222,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">4</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -268,13 +264,11 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">6</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="c_admin">
-                        <property name="label" translatable="yes">Make this user administrator</property>
+                        <property name="label" translatable="yes" context="GUI|User">Make this user administrator</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -284,8 +278,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -294,7 +286,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="b_advanced">
-                            <property name="label" translatable="yes">_Advanced...</property>
+                            <property name="label" translatable="yes" context="GUI|User">_Advanced...</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -305,16 +297,12 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">8</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -353,5 +341,10 @@
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="userCreationWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">CREATE USER</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/user.py b/anaconda/pyanaconda/ui/gui/spokes/user.py
index 9370876..98e830b 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/user.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/user.py
@@ -1,6 +1,6 @@
 # User creation spoke
 #
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -17,56 +17,73 @@
 # Red Hat, Inc.
 #
 # Red Hat Author(s): Martin Sivak <msivak@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
 #
 
-from pyanaconda.i18n import _, N_
+import re
+
+from pyanaconda.flags import flags
+from pyanaconda.i18n import _, CN_
 from pyanaconda.users import cryptPassword, validatePassword, guess_username
 
 from pyanaconda.ui.gui.spokes import NormalSpoke
-from pyanaconda.ui.gui import GUIObject, GUIDialog, check_re, GUICheck
-from pyanaconda.ui.gui.categories.user_settings import UserSettingsCategory
+from pyanaconda.ui.gui import GUIObject
+from pyanaconda.ui.categories.user_settings import UserSettingsCategory
 from pyanaconda.ui.common import FirstbootSpokeMixIn
-from pyanaconda.ui.gui.utils import enlightbox
+from pyanaconda.ui.helpers import InputCheck
+from pyanaconda.ui.gui.helpers import GUISpokeInputCheckHandler, GUIDialogInputCheckHandler
 
 from pykickstart.constants import FIRSTBOOT_RECONFIG
 from pyanaconda.constants import ANACONDA_ENVIRON, FIRSTBOOT_ENVIRON,\
         PASSWORD_EMPTY_ERROR, PASSWORD_CONFIRM_ERROR_GUI, PASSWORD_STRENGTH_DESC,\
         PASSWORD_WEAK, PASSWORD_WEAK_WITH_ERROR, PASSWORD_WEAK_CONFIRM,\
-        PASSWORD_WEAK_CONFIRM_WITH_ERROR
+        PASSWORD_WEAK_CONFIRM_WITH_ERROR, PW_ASCII_CHARS, PASSWORD_ASCII
 from pyanaconda.regexes import GECOS_VALID, USERNAME_VALID, GROUPNAME_VALID, GROUPLIST_FANCY_PARSE
 
 __all__ = ["UserSpoke", "AdvancedUserDialog"]
 
-def _checkUsername(editable, data):
-    """Validate a username. Allow empty usernames."""
-    if not (editable.get_text()):
-        return GUICheck.CHECK_OK
-    else:
-        return check_re(editable, data)
-
-def _validateGroups(editable, data):
-    groups_list = editable.get_text().split(",")
-
-    # Check each group name in the list
-    for group in groups_list:
-        group_name = GROUPLIST_FANCY_PARSE.match(group).group('name')
-        if not GROUPNAME_VALID.match(group_name):
-            return _("Invalid group name: %s") % group_name
-
-    return GUICheck.CHECK_OK
-
-class AdvancedUserDialog(GUIDialog):
+class AdvancedUserDialog(GUIObject, GUIDialogInputCheckHandler):
     builderObjects = ["advancedUserDialog", "uid", "gid"]
     mainWidgetName = "advancedUserDialog"
     uiFile = "spokes/advanced_user.glade"
 
+    def set_status(self, inputcheck):
+        # Use the superclass set_status to set the error message
+        GUIDialogInputCheckHandler.set_status(self, inputcheck)
+
+        # Make the save button insensitive if the check fails
+        if inputcheck.check_status == InputCheck.CHECK_OK:
+            self._saveButton.set_sensitive(True)
+        else:
+            self._saveButton.set_sensitive(False)
+
+    def _validateGroups(self, inputcheck):
+        groups_string = self.get_input(inputcheck.input_obj)
+
+        # Pass if the string is empty
+        if not groups_string:
+            return InputCheck.CHECK_OK
+
+        # Check each group name in the list
+        for group in groups_string.split(","):
+            group_name = GROUPLIST_FANCY_PARSE.match(group).group('name')
+            if not GROUPNAME_VALID.match(group_name):
+                return _("Invalid group name: %s") % group_name
+
+        return InputCheck.CHECK_OK
+
     def __init__(self, user, groupDict, data):
-        GUIDialog.__init__(self, data)
+        GUIObject.__init__(self, data)
+        GUIDialogInputCheckHandler.__init__(self)
         self._user = user
         self._groupDict = groupDict
 
+        # Track whether the user has requested a home directory other
+        # than the default.
+        self._origHome = None
+        self._homeSet = False
+
     def _grabObjects(self):
-        self._cHome = self.builder.get_object("c_home")
         self._cUid = self.builder.get_object("c_uid")
         self._cGid = self.builder.get_object("c_gid")
         self._tHome = self.builder.get_object("t_home")
@@ -76,7 +93,6 @@ class AdvancedUserDialog(GUIDialog):
         self._spinGid = self.builder.get_object("spin_gid")
         self._uid = self.builder.get_object("uid")
         self._gid = self.builder.get_object("gid")
-        self._groupsError = self.builder.get_object("groups_error")
         self._saveButton = self.builder.get_object("save_button")
 
     def initialize(self):
@@ -85,27 +101,16 @@ class AdvancedUserDialog(GUIDialog):
         self._grabObjects()
 
         # Validate the group input box
-        self.add_check_with_error_label(editable=self._tGroups, 
-                error_label=self._groupsError, 
-                run_check=_validateGroups)
-
-    def update_check(self, check, check_status):
-        # If there are any errors, disable the save button
-        self._saveButton.set_sensitive(not next(self.failed_checks, None))
-
-        return GUIDialog.update_check(self, check, check_status)
+        self.add_check(self._tGroups, self._validateGroups)
 
     def _apply_checkboxes(self, _editable = None, data = None):
         """Update the state of this screen according to the
         checkbox states on the screen. It is called from
         the toggled Gtk event.
         """
-        c_home = self._cHome.get_active()
         c_uid = self._cUid.get_active()
         c_gid = self._cGid.get_active()
 
-        self._tHome.set_sensitive(c_home)
-        self._lHome.set_sensitive(c_home)
         self._spinUid.set_sensitive(c_uid)
         self._spinGid.set_sensitive(c_gid)
 
@@ -128,13 +133,13 @@ class AdvancedUserDialog(GUIDialog):
 
     def refresh(self):
         if self._user.homedir:
-            self._tHome.set_text(self._user.homedir)
+            homedir = self._user.homedir
         elif self._user.name:
             homedir = "/home/" + self._user.name
-            self._tHome.set_text(homedir)
-            self._user.homedir = homedir
 
-        self._cHome.set_active(bool(self._user.homedir))
+        self._tHome.set_text(homedir)
+        self._origHome = homedir
+
         self._cUid.set_active(bool(self._user.uid))
         self._cGid.set_active(bool(self._user.gid))
         self._apply_checkboxes()
@@ -162,10 +167,13 @@ class AdvancedUserDialog(GUIDialog):
 
         #OK clicked
         if rc == 1:
-            if self._cHome.get_active():
-                self._user.homedir = self._tHome.get_text()
-            else:
-                self._user.homedir = None
+            # If the user changed the home directory input, either this time or
+            # during any earlier run of the dialog, set homedir to the value
+            # in the input box.
+            homedir = self._tHome.get_text()
+            if self._homeSet or self._origHome != homedir:
+                self._homeSet = True
+                self._user.homedir = homedir
 
             if self._cUid.get_active():
                 self._user.uid = int(self._uid.get_value())
@@ -190,16 +198,18 @@ class AdvancedUserDialog(GUIDialog):
 
         return rc
 
-class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
+class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
     builderObjects = ["userCreationWindow"]
 
     mainWidgetName = "userCreationWindow"
+    focusWidgetName = "t_fullname"
     uiFile = "spokes/user.glade"
+    helpFile = "UserSpoke.xml"
 
     category = UserSettingsCategory
 
     icon = "avatar-default-symbolic"
-    title = N_("_USER CREATION")
+    title = CN_("GUI|Spoke", "_USER CREATION")
 
     @classmethod
     def should_run(cls, environment, data):
@@ -223,6 +233,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
     def __init__(self, *args):
         NormalSpoke.__init__(self, *args)
+        GUISpokeInputCheckHandler.__init__(self)
         self._oldweak = None
 
     def initialize(self):
@@ -244,8 +255,9 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self.usepassword = self.builder.get_object("c_usepassword")
         self.b_advanced = self.builder.get_object("b_advanced")
 
-        # Counter for the click Done twice check
-        self._waivePasswordClicks = 0
+        # Counters for checks that ask the user to click Done to confirm
+        self._waiveStrengthClicks = 0
+        self._waiveASCIIClicks = 0
 
         self.guesser = {
             self.username: True
@@ -280,9 +292,10 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
         # - if a password is required, is one specified?
         # - if a password is specified and there is data in the confirm box, do they match?
         # - if a password is specified and the confirm box is empty or match, how strong is it?
+        # - if a strong password is specified, does it contain non-ASCII data?
         # - if a password is required, is there any data in the confirm box?
         self.add_check(self.pw, self._checkPasswordEmpty)
-        
+
         # The password confirmation needs to be checked whenever either of the password
         # fields change. Separate checks are created on each field so that edits on
         # either will trigger a check and so that the last edited field will get the focus
@@ -292,15 +305,16 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
         self._confirm_check = self.add_check(self.confirm, self._checkPasswordConfirm)
         self._password_check = self.add_check(self.pw, self._checkPasswordConfirm)
 
-        # Keep a reference to this check, since it has to be manually run for the
+        # Keep a reference to these checks, since they have to be manually run for the
         # click Done twice check.
         self._pwStrengthCheck = self.add_check(self.pw, self._checkPasswordStrength)
+        self._pwASCIICheck = self.add_check(self.pw, self._checkPasswordASCII)
 
         self.add_check(self.confirm, self._checkPasswordEmpty)
 
         # Allow empty usernames so the spoke can be exited without creating a user
-        self.add_check(self.username, _checkUsername,
-                {'regex': USERNAME_VALID, 'message': _("Invalid username")})
+        self.add_re_check(self.username, re.compile(USERNAME_VALID.pattern + r'|^$'),
+                _("Invalid username"))
 
         self.add_re_check(self.fullname, GECOS_VALID, _("Full name cannot contain colon characters"))
 
@@ -311,7 +325,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def refresh(self):
         # Enable the input checks in case they were disabled on the last exit
         for check in self.checks:
-            check.enable()
+            check.enabled = True
 
         self.username.set_text(self._user.name)
         self.fullname.set_text(self._user.gecos)
@@ -341,8 +355,10 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
     @property
     def mandatory(self):
-        # mandatory only if root account is disabled
-        return (not self.data.rootpw.password) or self.data.rootpw.lock
+        """ Only mandatory if the root pw hasn't been set in the UI
+            eg. not mandatory if the root account was locked in a kickstart
+        """
+        return not self.data.rootpw.password and not self.data.rootpw.lock
 
     def apply(self):
         # set the password only if the user enters anything to the text entry
@@ -394,6 +410,11 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
         elif self._user in self.data.user.userList:
             self.data.user.userList.remove(self._user)
 
+    @property
+    def sensitive(self):
+        return not (self.completed and flags.automatedInstall
+                    and self.data.user.seen)
+
     @property
     def completed(self):
         return len(self.data.user.userList) > 0
@@ -405,8 +426,9 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
         pwtext = self.pw.get_text()
         username = self.username.get_text()
 
-        # Reset the counter used for the "press Done twice" logic
-        self._waivePasswordClicks = 0
+        # Reset the counters used for the "press Done twice" logic
+        self._waiveStrengthClicks = 0
+        self._waiveASCIIClicks = 0
 
         self._pwq_valid, strength, self._pwq_error = validatePassword(pwtext, username)
 
@@ -470,81 +492,78 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
             self.username.set_text(username)
             self.guesser[self.username] = True
 
-    def _checkPasswordEmpty(self, editable, data):
+    def _checkPasswordEmpty(self, inputcheck):
         """Check whether a password has been specified at all.
-        
+
            This check is used for both the password and the confirmation.
         """
 
         # If the password was set by kickstart, skip the strength check
         if self._user.password_kickstarted:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
 
         # Skip the check if no password is required
         if (not self.usepassword.get_active()) or self._user.password_kickstarted:
-            return GUICheck.CHECK_OK
-        elif not editable.get_text():
-            if editable == self.pw:
+            return InputCheck.CHECK_OK
+        elif not self.get_input(inputcheck.input_obj):
+            if inputcheck.input_obj == self.pw:
                 return _(PASSWORD_EMPTY_ERROR)
             else:
                 return _(PASSWORD_CONFIRM_ERROR_GUI)
         else:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
 
-    def _checkPasswordConfirm(self, editable=None, reset_status=None):
+    def _checkPasswordConfirm(self, inputcheck):
         """If the user has entered confirmation data, check whether it matches the password."""
 
-        # This check is triggered by changes to either the password field or the
-        # confirmation field. If this method is being run from a successful check
-        # to reset the status, just return success
-        if reset_status:
-            return GUICheck.CHECK_OK
-        
         # Skip the check if no password is required
         if (not self.usepassword.get_active()) or self._user.password_kickstarted:
-            result = GUICheck.CHECK_OK
+            result = InputCheck.CHECK_OK
         elif self.confirm.get_text() and (self.pw.get_text() != self.confirm.get_text()):
             result = _(PASSWORD_CONFIRM_ERROR_GUI)
         else:
-            result = GUICheck.CHECK_OK
+            result = InputCheck.CHECK_OK
 
         # If the check succeeded, reset the status of the other check object
-        if result == GUICheck.CHECK_OK:
-            if editable == self.confirm:
-                self._password_check.update_check_status(check_data=True)
+        # Disable the current check to prevent a cycle
+        inputcheck.enabled = False
+        if result == InputCheck.CHECK_OK:
+            if inputcheck == self._confirm_check:
+                self._password_check.update_check_status()
             else:
-                self._confirm_check.update_check_status(check_data=True)
+                self._confirm_check.update_check_status()
+        inputcheck.enabled = True
 
         return result
 
-    def _checkPasswordStrength(self, editable=None, data=None):
+    def _checkPasswordStrength(self, inputcheck):
         """Update the error message based on password strength.
-        
+
            The password strength has already been checked in _updatePwQuality, called
            previously in the signal chain. This method converts the data set from there
            into an error message.
 
            The password strength check can be waived by pressing "Done" twice. This
-           is controlled through the self._waivePasswordClicks counter. The counter
+           is controlled through the self._waiveStrengthClicks counter. The counter
            is set in on_back_clicked, which also re-runs this check manually.
          """
 
         # Skip the check if no password is required
         if (not self.usepassword.get_active()) or \
                 ((not self.pw.get_text()) and (self._user.password_kickstarted)):
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
 
         # If the password failed the validity check, fail this check
         if (not self._pwq_valid) and (self._pwq_error):
             return self._pwq_error
 
         pwstrength = self.pw_bar.get_value()
-        
+
         if pwstrength < 2:
             # If Done has been clicked twice, waive the check
-            if self._waivePasswordClicks > 1:
-                return GUICheck.CHECK_OK
-            elif self._waivePasswordClicks == 1:
+            if self._waiveStrengthClicks > 1:
+                return InputCheck.CHECK_OK
+            elif self._waiveStrengthClicks == 1:
                 if self._pwq_error:
                     return _(PASSWORD_WEAK_CONFIRM_WITH_ERROR) % self._pwq_error
                 else:
@@ -555,7 +574,24 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
                 else:
                     return _(PASSWORD_WEAK)
         else:
-            return GUICheck.CHECK_OK
+            return InputCheck.CHECK_OK
+
+    def _checkPasswordASCII(self, inputcheck):
+        """Set an error message if the password contains non-ASCII characters.
+
+           Like the password strength check, this check can be bypassed by
+           pressing Done twice.
+        """
+
+        # If Done has been clicked, waive the check
+        if self._waiveASCIIClicks > 0:
+            return InputCheck.CHECK_OK
+
+        password = self.get_input(inputcheck.input_obj)
+        if password and any(char not in PW_ASCII_CHARS for char in password):
+            return _(PASSWORD_ASCII)
+
+        return InputCheck.CHECK_OK
 
     def on_advanced_clicked(self, _button, data=None):
         """Handler for the Advanced.. button. It starts the Advanced dialog
@@ -572,19 +608,27 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
             self._user.groups.remove(self._wheel.name)
 
         self._advanced.refresh()
-        with enlightbox(self.window, self._advanced.window):
+        with self.main_window.enlightbox(self._advanced.window):
             self._advanced.run()
 
         self.admin.set_active(self._wheel.name in self._user.groups)
 
     def on_back_clicked(self, button):
-        # Add a click and re-check the password strength
-        self._waivePasswordClicks += 1
-        self._pwStrengthCheck.update_check_status()
+        # If the failed check is for password strength or non-ASCII
+        # characters, add a click to the counter and check again
+        failed_check = next(self.failed_checks_with_message, None)
+        if failed_check == self._pwStrengthCheck:
+            self._waiveStrengthClicks += 1
+            self._pwStrengthCheck.update_check_status()
+        elif failed_check == self._pwASCIICheck:
+            self._waiveASCIIClicks += 1
+            self._pwASCIICheck.update_check_status()
 
         # If there is no user set, skip the checks
         if not self.username.get_text():
             for check in self.checks:
-                check.disable()
-        NormalSpoke.on_back_clicked(self, button)
+                check.enabled = False
+
+        if GUISpokeInputCheckHandler.on_back_clicked(self, button):
+            NormalSpoke.on_back_clicked(self, button)
 
diff --git a/anaconda/pyanaconda/ui/gui/spokes/user.py.orig b/anaconda/pyanaconda/ui/gui/spokes/user.py.orig
new file mode 100644
index 0000000..9370876
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/spokes/user.py.orig
@@ -0,0 +1,590 @@
+# User creation spoke
+#
+# Copyright (C) 2013 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Martin Sivak <msivak@redhat.com>
+#
+
+from pyanaconda.i18n import _, N_
+from pyanaconda.users import cryptPassword, validatePassword, guess_username
+
+from pyanaconda.ui.gui.spokes import NormalSpoke
+from pyanaconda.ui.gui import GUIObject, GUIDialog, check_re, GUICheck
+from pyanaconda.ui.gui.categories.user_settings import UserSettingsCategory
+from pyanaconda.ui.common import FirstbootSpokeMixIn
+from pyanaconda.ui.gui.utils import enlightbox
+
+from pykickstart.constants import FIRSTBOOT_RECONFIG
+from pyanaconda.constants import ANACONDA_ENVIRON, FIRSTBOOT_ENVIRON,\
+        PASSWORD_EMPTY_ERROR, PASSWORD_CONFIRM_ERROR_GUI, PASSWORD_STRENGTH_DESC,\
+        PASSWORD_WEAK, PASSWORD_WEAK_WITH_ERROR, PASSWORD_WEAK_CONFIRM,\
+        PASSWORD_WEAK_CONFIRM_WITH_ERROR
+from pyanaconda.regexes import GECOS_VALID, USERNAME_VALID, GROUPNAME_VALID, GROUPLIST_FANCY_PARSE
+
+__all__ = ["UserSpoke", "AdvancedUserDialog"]
+
+def _checkUsername(editable, data):
+    """Validate a username. Allow empty usernames."""
+    if not (editable.get_text()):
+        return GUICheck.CHECK_OK
+    else:
+        return check_re(editable, data)
+
+def _validateGroups(editable, data):
+    groups_list = editable.get_text().split(",")
+
+    # Check each group name in the list
+    for group in groups_list:
+        group_name = GROUPLIST_FANCY_PARSE.match(group).group('name')
+        if not GROUPNAME_VALID.match(group_name):
+            return _("Invalid group name: %s") % group_name
+
+    return GUICheck.CHECK_OK
+
+class AdvancedUserDialog(GUIDialog):
+    builderObjects = ["advancedUserDialog", "uid", "gid"]
+    mainWidgetName = "advancedUserDialog"
+    uiFile = "spokes/advanced_user.glade"
+
+    def __init__(self, user, groupDict, data):
+        GUIDialog.__init__(self, data)
+        self._user = user
+        self._groupDict = groupDict
+
+    def _grabObjects(self):
+        self._cHome = self.builder.get_object("c_home")
+        self._cUid = self.builder.get_object("c_uid")
+        self._cGid = self.builder.get_object("c_gid")
+        self._tHome = self.builder.get_object("t_home")
+        self._lHome = self.builder.get_object("l_home")
+        self._tGroups = self.builder.get_object("t_groups")
+        self._spinUid = self.builder.get_object("spin_uid")
+        self._spinGid = self.builder.get_object("spin_gid")
+        self._uid = self.builder.get_object("uid")
+        self._gid = self.builder.get_object("gid")
+        self._groupsError = self.builder.get_object("groups_error")
+        self._saveButton = self.builder.get_object("save_button")
+
+    def initialize(self):
+        GUIObject.initialize(self)
+
+        self._grabObjects()
+
+        # Validate the group input box
+        self.add_check_with_error_label(editable=self._tGroups, 
+                error_label=self._groupsError, 
+                run_check=_validateGroups)
+
+    def update_check(self, check, check_status):
+        # If there are any errors, disable the save button
+        self._saveButton.set_sensitive(not next(self.failed_checks, None))
+
+        return GUIDialog.update_check(self, check, check_status)
+
+    def _apply_checkboxes(self, _editable = None, data = None):
+        """Update the state of this screen according to the
+        checkbox states on the screen. It is called from
+        the toggled Gtk event.
+        """
+        c_home = self._cHome.get_active()
+        c_uid = self._cUid.get_active()
+        c_gid = self._cGid.get_active()
+
+        self._tHome.set_sensitive(c_home)
+        self._lHome.set_sensitive(c_home)
+        self._spinUid.set_sensitive(c_uid)
+        self._spinGid.set_sensitive(c_gid)
+
+    def _parse_groups(self):
+        group_strings = self._tGroups.get_text().split(",")
+        group_objects = []
+
+        for group in group_strings:
+            # Skip empty strings
+            if not group:
+                continue
+
+            (group_name, group_id) = GROUPLIST_FANCY_PARSE.match(group).groups()
+            if group_id:
+                group_id = int(group_id)
+
+            group_objects.append(self.data.GroupData(name=group_name, gid=group_id))
+
+        return group_objects
+
+    def refresh(self):
+        if self._user.homedir:
+            self._tHome.set_text(self._user.homedir)
+        elif self._user.name:
+            homedir = "/home/" + self._user.name
+            self._tHome.set_text(homedir)
+            self._user.homedir = homedir
+
+        self._cHome.set_active(bool(self._user.homedir))
+        self._cUid.set_active(bool(self._user.uid))
+        self._cGid.set_active(bool(self._user.gid))
+        self._apply_checkboxes()
+
+        self._spinUid.update()
+        self._spinGid.update()
+
+        groups = []
+        for group_name in self._user.groups:
+            group = self._groupDict[group_name]
+
+            if group.name and group.gid is not None:
+                groups.append("%s (%d)" % (group.name, group.gid))
+            elif group.name:
+                groups.append(group.name)
+            elif group.gid is not None:
+                groups.append("(%d)" % (group.gid,))
+
+        self._tGroups.set_text(", ".join(groups))
+
+    def run(self):
+        self.window.show()
+        rc = self.window.run()
+        self.window.hide()
+
+        #OK clicked
+        if rc == 1:
+            if self._cHome.get_active():
+                self._user.homedir = self._tHome.get_text()
+            else:
+                self._user.homedir = None
+
+            if self._cUid.get_active():
+                self._user.uid = int(self._uid.get_value())
+            else:
+                self._user.uid = None
+
+            if self._cGid.get_active():
+                self._user.gid = int(self._gid.get_value())
+            else:
+                self._user.gid = None
+
+            groups = self._parse_groups()
+            self._user.groups = []
+            self._groupDict.clear()
+            for group in groups:
+                self._groupDict[group.name] = group
+                self._user.groups.append(group.name)
+
+        #Cancel clicked, window destroyed...
+        else:
+            pass
+
+        return rc
+
+class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
+    builderObjects = ["userCreationWindow"]
+
+    mainWidgetName = "userCreationWindow"
+    uiFile = "spokes/user.glade"
+
+    category = UserSettingsCategory
+
+    icon = "avatar-default-symbolic"
+    title = N_("_USER CREATION")
+
+    @classmethod
+    def should_run(cls, environment, data):
+        # The Qubes installer still uses old firstboot to create users (TODO)
+        return False
+
+        # the user spoke should run always in the anaconda and in firstboot only
+        # when doing reconfig or if no user has been created in the installation
+        if environment == ANACONDA_ENVIRON:
+            return True
+        elif environment == FIRSTBOOT_ENVIRON and data is None:
+            # cannot decide, stay in the game and let another call with data
+            # available (will come) decide
+            return True
+        elif environment == FIRSTBOOT_ENVIRON and data and \
+                (data.firstboot.firstboot == FIRSTBOOT_RECONFIG or \
+                     len(data.user.userList) == 0):
+            return True
+        else:
+            return False
+
+    def __init__(self, *args):
+        NormalSpoke.__init__(self, *args)
+        self._oldweak = None
+
+    def initialize(self):
+        NormalSpoke.initialize(self)
+
+        if self.data.user.userList:
+            self._user = self.data.user.userList[0]
+        else:
+            self._user = self.data.UserData()
+        self._wheel = self.data.GroupData(name = "wheel")
+        self._groupDict = {"wheel": self._wheel}
+
+        # placeholders for the text boxes
+        self.fullname = self.builder.get_object("t_fullname")
+        self.username = self.builder.get_object("t_username")
+        self.pw = self.builder.get_object("t_password")
+        self.confirm = self.builder.get_object("t_verifypassword")
+        self.admin = self.builder.get_object("c_admin")
+        self.usepassword = self.builder.get_object("c_usepassword")
+        self.b_advanced = self.builder.get_object("b_advanced")
+
+        # Counter for the click Done twice check
+        self._waivePasswordClicks = 0
+
+        self.guesser = {
+            self.username: True
+            }
+
+        # Updated during the password changed event and used by the password
+        # field validity checker
+        self._pwq_error = None
+        self._pwq_valid = True
+
+        self.pw_bar = self.builder.get_object("password_bar")
+        self.pw_label = self.builder.get_object("password_label")
+
+        # Configure levels for the password bar
+        self.pw_bar.add_offset_value("low", 2)
+        self.pw_bar.add_offset_value("medium", 3)
+        self.pw_bar.add_offset_value("high", 4)
+
+        # indicate when the password was set by kickstart
+        self._user.password_kickstarted = self.data.user.seen
+        if self._user.password_kickstarted:
+            self.usepassword.set_active(self._user.password != "")
+            if not self._user.isCrypted:
+                self.pw.set_text(self._user.password)
+                self.confirm.set_text(self._user.password)
+            else:
+                self.usepassword.set_active(True)
+                self.pw.set_placeholder_text(_("The password was set by kickstart."))
+                self.confirm.set_placeholder_text(_("The password was set by kickstart."))
+
+        # Password checks, in order of importance:
+        # - if a password is required, is one specified?
+        # - if a password is specified and there is data in the confirm box, do they match?
+        # - if a password is specified and the confirm box is empty or match, how strong is it?
+        # - if a password is required, is there any data in the confirm box?
+        self.add_check(self.pw, self._checkPasswordEmpty)
+        
+        # The password confirmation needs to be checked whenever either of the password
+        # fields change. Separate checks are created on each field so that edits on
+        # either will trigger a check and so that the last edited field will get the focus
+        # when Done is clicked. Whichever check is run needs to run the other check in
+        # order to reset the status. The check_data field is used as a flag to prevent
+        # infinite recursion.
+        self._confirm_check = self.add_check(self.confirm, self._checkPasswordConfirm)
+        self._password_check = self.add_check(self.pw, self._checkPasswordConfirm)
+
+        # Keep a reference to this check, since it has to be manually run for the
+        # click Done twice check.
+        self._pwStrengthCheck = self.add_check(self.pw, self._checkPasswordStrength)
+
+        self.add_check(self.confirm, self._checkPasswordEmpty)
+
+        # Allow empty usernames so the spoke can be exited without creating a user
+        self.add_check(self.username, _checkUsername,
+                {'regex': USERNAME_VALID, 'message': _("Invalid username")})
+
+        self.add_re_check(self.fullname, GECOS_VALID, _("Full name cannot contain colon characters"))
+
+        self._advanced = AdvancedUserDialog(self._user, self._groupDict,
+                                            self.data)
+        self._advanced.initialize()
+
+    def refresh(self):
+        # Enable the input checks in case they were disabled on the last exit
+        for check in self.checks:
+            check.enable()
+
+        self.username.set_text(self._user.name)
+        self.fullname.set_text(self._user.gecos)
+        self.admin.set_active(self._wheel.name in self._user.groups)
+
+        self.pw.emit("changed")
+        self.confirm.emit("changed")
+
+        if self.username.get_text() and self.usepassword.get_active() and \
+           self._user.password == "":
+            self.pw.grab_focus()
+        elif self.fullname.get_text():
+            self.username.grab_focus()
+        else:
+            self.fullname.grab_focus()
+
+        self.b_advanced.set_sensitive(bool(self._user.name))
+
+    @property
+    def status(self):
+        if len(self.data.user.userList) == 0:
+            return _("No user will be created")
+        elif self._wheel.name in self.data.user.userList[0].groups:
+            return _("Administrator %s will be created") % self.data.user.userList[0].name
+        else:
+            return _("User %s will be created") % self.data.user.userList[0].name
+
+    @property
+    def mandatory(self):
+        # mandatory only if root account is disabled
+        return (not self.data.rootpw.password) or self.data.rootpw.lock
+
+    def apply(self):
+        # set the password only if the user enters anything to the text entry
+        # this should preserve the kickstart based password
+        if self.usepassword.get_active():
+            if self.pw.get_text():
+                self._user.password_kickstarted = False
+                self._user.password = cryptPassword(self.pw.get_text())
+                self._user.isCrypted = True
+                self.pw.set_placeholder_text("")
+                self.confirm.set_placeholder_text("")
+
+        # reset the password when the user unselects it
+        else:
+            self.pw.set_placeholder_text("")
+            self.confirm.set_placeholder_text("")
+            self._user.password = ""
+            self._user.isCrypted = False
+            self._user.password_kickstarted = False
+
+        self._user.name = self.username.get_text()
+        self._user.gecos = self.fullname.get_text()
+
+        # Remove any groups that were created in a previous visit to this spoke
+        self.data.group.groupList = [g for g in self.data.group.groupList \
+                if not hasattr(g, 'anaconda_group')]
+
+        # the user will be created only if the username is set
+        if self._user.name:
+            if self.admin.get_active() and \
+               self._wheel.name not in self._user.groups:
+                self._user.groups.append(self._wheel.name)
+            elif not self.admin.get_active() and \
+                 self._wheel.name in self._user.groups:
+                self._user.groups.remove(self._wheel.name)
+
+            anaconda_groups = [self._groupDict[g] for g in self._user.groups
+                                if g != self._wheel.name]
+
+            self.data.group.groupList += anaconda_groups
+
+            # Flag the groups as being created in this spoke
+            for g in anaconda_groups:
+                g.anaconda_group = True
+
+            if self._user not in self.data.user.userList:
+                self.data.user.userList.append(self._user)
+
+        elif self._user in self.data.user.userList:
+            self.data.user.userList.remove(self._user)
+
+    @property
+    def completed(self):
+        return len(self.data.user.userList) > 0
+
+    def _updatePwQuality(self):
+        """This method updates the password indicators according
+        to the password entered by the user.
+        """
+        pwtext = self.pw.get_text()
+        username = self.username.get_text()
+
+        # Reset the counter used for the "press Done twice" logic
+        self._waivePasswordClicks = 0
+
+        self._pwq_valid, strength, self._pwq_error = validatePassword(pwtext, username)
+
+        if not pwtext:
+            val = 0
+        elif strength < 50:
+            val = 1
+        elif strength < 75:
+            val = 2
+        elif strength < 90:
+            val = 3
+        else:
+            val = 4
+        text = _(PASSWORD_STRENGTH_DESC[val])
+
+        self.pw_bar.set_value(val)
+        self.pw_label.set_text(text)
+
+    def usepassword_toggled(self, togglebutton = None, data = None):
+        """Called by Gtk callback when the "Use password" check
+        button is toggled. It will make password entries in/sensitive."""
+
+        self.pw.set_sensitive(self.usepassword.get_active())
+        self.confirm.set_sensitive(self.usepassword.get_active())
+
+        # Re-check the password
+        self.pw.emit("changed")
+        self.confirm.emit("changed")
+
+    def password_changed(self, editable=None, data=None):
+        """Update the password strength level bar"""
+        self._updatePwQuality()
+
+    def username_changed(self, editable = None, data = None):
+        """Called by Gtk callback when the username or hostname
+        entry changes. It disables the guess algorithm if the
+        user added his own text there and reenable it when the
+        user deletes the whole text."""
+
+        if editable.get_text() == "":
+            self.guesser[editable] = True
+            self.b_advanced.set_sensitive(False)
+        else:
+            self.guesser[editable] = False
+            self.b_advanced.set_sensitive(True)
+
+            # Re-run the password checks against the new username
+            self.pw.emit("changed")
+            self.confirm.emit("changed")
+
+    def full_name_changed(self, editable = None, data = None):
+        """Called by Gtk callback when the full name field changes.
+        It guesses the username and hostname, strips diacritics
+        and make those lowercase.
+        """
+
+        # after the text is updated in guesser, the guess has to be reenabled
+        if self.guesser[self.username]:
+            fullname = self.fullname.get_text()
+            username = guess_username(fullname)
+            self.username.set_text(username)
+            self.guesser[self.username] = True
+
+    def _checkPasswordEmpty(self, editable, data):
+        """Check whether a password has been specified at all.
+        
+           This check is used for both the password and the confirmation.
+        """
+
+        # If the password was set by kickstart, skip the strength check
+        if self._user.password_kickstarted:
+            return GUICheck.CHECK_OK
+
+        # Skip the check if no password is required
+        if (not self.usepassword.get_active()) or self._user.password_kickstarted:
+            return GUICheck.CHECK_OK
+        elif not editable.get_text():
+            if editable == self.pw:
+                return _(PASSWORD_EMPTY_ERROR)
+            else:
+                return _(PASSWORD_CONFIRM_ERROR_GUI)
+        else:
+            return GUICheck.CHECK_OK
+
+    def _checkPasswordConfirm(self, editable=None, reset_status=None):
+        """If the user has entered confirmation data, check whether it matches the password."""
+
+        # This check is triggered by changes to either the password field or the
+        # confirmation field. If this method is being run from a successful check
+        # to reset the status, just return success
+        if reset_status:
+            return GUICheck.CHECK_OK
+        
+        # Skip the check if no password is required
+        if (not self.usepassword.get_active()) or self._user.password_kickstarted:
+            result = GUICheck.CHECK_OK
+        elif self.confirm.get_text() and (self.pw.get_text() != self.confirm.get_text()):
+            result = _(PASSWORD_CONFIRM_ERROR_GUI)
+        else:
+            result = GUICheck.CHECK_OK
+
+        # If the check succeeded, reset the status of the other check object
+        if result == GUICheck.CHECK_OK:
+            if editable == self.confirm:
+                self._password_check.update_check_status(check_data=True)
+            else:
+                self._confirm_check.update_check_status(check_data=True)
+
+        return result
+
+    def _checkPasswordStrength(self, editable=None, data=None):
+        """Update the error message based on password strength.
+        
+           The password strength has already been checked in _updatePwQuality, called
+           previously in the signal chain. This method converts the data set from there
+           into an error message.
+
+           The password strength check can be waived by pressing "Done" twice. This
+           is controlled through the self._waivePasswordClicks counter. The counter
+           is set in on_back_clicked, which also re-runs this check manually.
+         """
+
+        # Skip the check if no password is required
+        if (not self.usepassword.get_active()) or \
+                ((not self.pw.get_text()) and (self._user.password_kickstarted)):
+            return GUICheck.CHECK_OK
+
+        # If the password failed the validity check, fail this check
+        if (not self._pwq_valid) and (self._pwq_error):
+            return self._pwq_error
+
+        pwstrength = self.pw_bar.get_value()
+        
+        if pwstrength < 2:
+            # If Done has been clicked twice, waive the check
+            if self._waivePasswordClicks > 1:
+                return GUICheck.CHECK_OK
+            elif self._waivePasswordClicks == 1:
+                if self._pwq_error:
+                    return _(PASSWORD_WEAK_CONFIRM_WITH_ERROR) % self._pwq_error
+                else:
+                    return _(PASSWORD_WEAK_CONFIRM)
+            else:
+                if self._pwq_error:
+                    return _(PASSWORD_WEAK_WITH_ERROR) % self._pwq_error
+                else:
+                    return _(PASSWORD_WEAK)
+        else:
+            return GUICheck.CHECK_OK
+
+    def on_advanced_clicked(self, _button, data=None):
+        """Handler for the Advanced.. button. It starts the Advanced dialog
+        for setting homedit, uid, gid and groups.
+        """
+
+        self._user.name = self.username.get_text()
+
+        if self.admin.get_active() and \
+           self._wheel.name not in self._user.groups:
+            self._user.groups.append(self._wheel.name)
+        elif not self.admin.get_active() and \
+             self._wheel.name in self._user.groups:
+            self._user.groups.remove(self._wheel.name)
+
+        self._advanced.refresh()
+        with enlightbox(self.window, self._advanced.window):
+            self._advanced.run()
+
+        self.admin.set_active(self._wheel.name in self._user.groups)
+
+    def on_back_clicked(self, button):
+        # Add a click and re-check the password strength
+        self._waivePasswordClicks += 1
+        self._pwStrengthCheck.update_check_status()
+
+        # If there is no user set, skip the checks
+        if not self.username.get_text():
+            for check in self.checks:
+                check.disable()
+        NormalSpoke.on_back_clicked(self, button)
+
diff --git a/anaconda/pyanaconda/ui/gui/spokes/welcome.glade b/anaconda/pyanaconda/ui/gui/spokes/welcome.glade
index 164c5eb..0180e63 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/welcome.glade
+++ b/anaconda/pyanaconda/ui/gui/spokes/welcome.glade
@@ -1,157 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires AnacondaWidgets 1.0 -->
-  <object class="GtkDialog" id="unsupportedHardwareDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="uhd-vbox">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="uhd-action_area">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="uhdQuitButton">
-                <property name="label" translatable="yes">_Quit</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="uhdContinueButton">
-                <property name="label" translatable="yes">_Continue</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="uhd-grid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">12</property>
-            <property name="column_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="unsupportedHardwareTitle">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">Unsupported Hardware Detected</property>
-                <attributes>
-                  <attribute name="font-desc" value="Cantarell Bold 12"/>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkImage" id="uhd-image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="stock">gtk-quit</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="unsupportedHardwareDesc">
-                <property name="width_request">300</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="label" translatable="yes">This hardware (or a combination thereof) is not supported by Red Hat.  For more information on supported hardware, please refer to http://www.redhat.com/hardware.</property>
-                <property name="wrap">True</property>
-                <attributes>
-                  <attribute name="font-desc" value="Cantarell 12"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">uhdQuitButton</action-widget>
-      <action-widget response="1">uhdContinueButton</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkListStore" id="languageStore">
-    <columns>
-      <!-- column-name nativeName -->
-      <column type="gchararray"/>
-      <!-- column-name englishName -->
-      <column type="gchararray"/>
-      <!-- column-name langSetting -->
-      <column type="gchararray"/>
-      <!-- column-name separator -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="localeStore">
-    <columns>
-      <!-- column-name nativeName -->
-      <column type="gchararray"/>
-      <!-- column-name locale -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkTreeModelFilter" id="languageStoreFilter">
-    <property name="child_model">languageStore</property>
-  </object>
+  <requires lib="gtk+" version="3.2"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
   <object class="GtkDialog" id="betaWarnDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
+    <property name="default_width">550</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
     <child internal-child="vbox">
@@ -165,7 +20,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="quitButton">
-                <property name="label" translatable="yes">_Get me out of here!</property>
+                <property name="label" translatable="yes" context="GUI|Welcome|Beta Warn Dialog">_Get me out of here!</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -179,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="continueButton">
-                <property name="label" translatable="yes">_I accept my fate.</property>
+                <property name="label" translatable="yes" context="GUI|Welcome|Beta Warn Dialog">_I accept my fate.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -219,22 +74,18 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-quit</property>
-                <property name="icon-size">6</property>
+                <property name="icon_name">application-exit</property>
+                <property name="icon_size">6</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -252,8 +103,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -272,14 +121,38 @@
       <action-widget response="0">quitButton</action-widget>
       <action-widget response="1">continueButton</action-widget>
     </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="betaWarnDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Beta Warn</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkListStore" id="languageStore">
+    <columns>
+      <!-- column-name nativeName -->
+      <column type="gchararray"/>
+      <!-- column-name englishName -->
+      <column type="gchararray"/>
+      <!-- column-name langSetting -->
+      <column type="gchararray"/>
+      <!-- column-name separator -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelFilter" id="languageStoreFilter">
+    <property name="child_model">languageStore</property>
+  </object>
+  <object class="GtkListStore" id="localeStore">
+    <columns>
+      <!-- column-name nativeName -->
+      <column type="gchararray"/>
+      <!-- column-name locale -->
+      <column type="gchararray"/>
+    </columns>
   </object>
   <object class="AnacondaStandaloneWindow" id="welcomeWindow">
-    <property name="startup_id">filler</property>
     <property name="can_focus">False</property>
-    <property name="startup_id">filler</property>
-    <property name="mnemonics_visible">False</property>
-    <property name="focus_visible">False</property>
-    <property name="window_name"></property>
+    <property name="window_name"/>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaStandaloneWindow-main_box1">
         <property name="can_focus">False</property>
@@ -324,8 +197,11 @@
                   <object class="GtkLabel" id="welcomeLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_left">36</property>
+                    <property name="margin_right">36</property>
+                    <property name="xalign">0</property>
                     <property name="ypad">6</property>
-                    <property name="label" translatable="yes">WELCOME TO %(name)s %(version)s.</property>
+                    <property name="label">WELCOME TO %(name)s %(version)s.</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell Bold 16"/>
                     </attributes>
@@ -342,6 +218,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
+                    <property name="margin_left">36</property>
+                    <property name="margin_right">36</property>
+                    <property name="xalign">0</property>
                     <property name="ypad">6</property>
                     <property name="label" translatable="yes">What language would you like to use during the installation process?</property>
                     <attributes>
@@ -358,11 +237,13 @@
                   <object class="GtkGrid" id="mainGrid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
+                    <property name="margin_left">36</property>
+                    <property name="margin_right">36</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">6</property>
+                    <property name="column_spacing">24</property>
+                    <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkScrolledWindow" id="languageWindow">
                         <property name="visible">True</property>
@@ -370,6 +251,7 @@
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">always</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="languageView">
@@ -394,7 +276,7 @@
                                 <property name="sort_column_id">0</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="nativeNameRenderer">
-                                    <property name="xalign">0.89999997615814209</property>
+                                    <property name="xalign">0.10000000149011612</property>
                                     <property name="font">Cantarell 12</property>
                                   </object>
                                   <attributes>
@@ -411,7 +293,7 @@
                                 <property name="sort_column_id">1</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="englishNameRenderer">
-                                    <property name="xalign">0.10000000149011612</property>
+                                    <property name="xalign">0.89999997615814209</property>
                                     <property name="font">Cantarell Italic 14</property>
                                     <property name="foreground">gray</property>
                                   </object>
@@ -429,14 +311,20 @@
                                 </child>
                               </object>
                             </child>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="languageView-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Languages</property>
+                              </object>
+                            </child>
+                            <style>
+                              <class name="solid-separator"/>
+                            </style>
                           </object>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -445,7 +333,6 @@
                         <property name="can_focus">True</property>
                         <property name="valign">start</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="secondary_icon_name">edit-clear-symbolic</property>
                         <property name="placeholder_text" translatable="yes">Type here to search.</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
@@ -454,8 +341,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -499,14 +384,17 @@
                                 </child>
                               </object>
                             </child>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="localeView-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Locales</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -530,5 +418,134 @@
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="welcomeWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">WELCOME</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="unsupportedHardwareDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="default_width">550</property>
+    <property name="type_hint">dialog</property>
+    <property name="decorated">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="uhd-vbox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="uhd-action_area">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="uhdQuitButton">
+                <property name="label" translatable="yes" context="GUI|Welcome|Unsupported Hardware Dialog">_Quit</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="uhdContinueButton">
+                <property name="label" translatable="yes" context="GUI|Welcome|Unsupported Hardware Dialog">_Continue</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="uhd-grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">12</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="unsupportedHardwareTitle">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="label" translatable="yes">Unsupported Hardware Detected</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell Bold 12"/>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="uhd-image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">application-exit</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="unsupportedHardwareDesc">
+                <property name="width_request">300</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="label" translatable="yes">This hardware (or a combination thereof) is not supported by Red Hat.  For more information on supported hardware, please refer to http://www.redhat.com/hardware.</property>
+                <property name="wrap">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 12"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">uhdQuitButton</action-widget>
+      <action-widget response="1">uhdContinueButton</action-widget>
+    </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="unsupportedHardwareDialog-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Unsupported Hardware</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/anaconda/pyanaconda/ui/gui/spokes/welcome.py b/anaconda/pyanaconda/ui/gui/spokes/welcome.py
index c6f411d..7e997bf 100644
--- a/anaconda/pyanaconda/ui/gui/spokes/welcome.py
+++ b/anaconda/pyanaconda/ui/gui/spokes/welcome.py
@@ -26,7 +26,8 @@ import langtable
 
 from pyanaconda.ui.gui.hubs.summary import SummaryHub
 from pyanaconda.ui.gui.spokes import StandaloneSpoke
-from pyanaconda.ui.gui.utils import enlightbox, setup_gtk_direction
+from pyanaconda.ui.gui.utils import setup_gtk_direction, escape_markup
+from pyanaconda.ui.gui.xkl_wrapper import XklWrapper
 from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
 
 from pyanaconda import localization
@@ -34,7 +35,7 @@ from pyanaconda.product import distributionText, isFinal, productName, productVe
 from pyanaconda import keyboard
 from pyanaconda import flags
 from pyanaconda import geoloc
-from pyanaconda.i18n import _
+from pyanaconda.i18n import _, C_
 from pyanaconda.iutil import is_unsupported_hw
 from pyanaconda.constants import DEFAULT_LANG, DEFAULT_KEYBOARD
 
@@ -45,7 +46,9 @@ __all__ = ["WelcomeLanguageSpoke"]
 
 class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
     mainWidgetName = "welcomeWindow"
+    focusWidgetName = "languageEntry"
     uiFile = "spokes/welcome.glade"
+    helpFile = "WelcomeSpoke.xml"
     builderObjects = ["languageStore", "languageStoreFilter", "localeStore",
                       "welcomeWindow", "betaWarnDialog", "unsupportedHardwareDialog"]
 
@@ -55,7 +58,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
     def __init__(self, *args, **kwargs):
         StandaloneSpoke.__init__(self, *args, **kwargs)
         LangLocaleHandler.__init__(self)
-        self._xklwrapper = keyboard.XklWrapper.get_instance()
+        self._xklwrapper = XklWrapper.get_instance()
         self._origStrings = {}
 
     def apply(self):
@@ -81,9 +84,6 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
             # current language
             self.data.timezone.timezone = loc_timezones[0]
 
-        # setup Gtk direction (RTL/LTR) now that we have the language
-        # configuration applied
-        setup_gtk_direction()
         self._set_keyboard_defaults(self.data.lang.lang)
 
     def _set_keyboard_defaults(self, locale):
@@ -139,7 +139,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
 
     @property
     def completed(self):
-        if flags.flags.automatedInstall:
+        if flags.flags.automatedInstall and self.data.lang.seen:
             return self.data.lang.lang and self.data.lang.lang != ""
         else:
             return False
@@ -221,7 +221,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
         localization.setup_locale(locales[0], self.data.lang)
         self._select_locale(self.data.lang.lang)
 
-    def _retranslate_one(self, widgetName):
+    def _retranslate_one(self, widgetName, context=None):
         widget = self.builder.get_object(widgetName)
         if not widget:
             return
@@ -230,26 +230,29 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
             self._origStrings[widget] = widget.get_label()
 
         before = self._origStrings[widget]
-        widget.set_label(_(before))
+        if context is not None:
+            widget.set_label(C_(context, before))
+        else:
+            widget.set_label(_(before))
 
     def retranslate(self, lang):
         # Change the translations on labels and buttons that do not have
         # substitution text.
-        for name in ["pickLanguageLabel", "betaWarnTitle", "betaWarnDesc",
-                     "quitButton", "continueButton"]:
+        for name in ["pickLanguageLabel", "betaWarnTitle", "betaWarnDesc"]:
             self._retranslate_one(name)
 
+        # It would be nice to be able to read the translation context from the
+        # widget, but we live in an imperfect world.
+        # See also: https://bugzilla.gnome.org/show_bug.cgi?id=729066
+        for name in ["quitButton", "continueButton"]:
+            self._retranslate_one(name, "GUI|Welcome|Beta Warn Dialog")
+
         # The welcome label is special - it has text that needs to be
         # substituted.
         welcomeLabel = self.builder.get_object("welcomeLabel")
 
-        if not welcomeLabel in self._origStrings:
-            self._origStrings[welcomeLabel] = welcomeLabel.get_label()
-
-        before = self._origStrings[welcomeLabel]
-        # pylint: disable-msg=E1103
-        xlated = _(before) % {"name" : productName.upper(), "version" : productVersion}
-        welcomeLabel.set_label(xlated)
+        welcomeLabel.set_text(_("WELCOME TO %(name)s %(version)s.") %
+                {"name" : productName.upper(), "version" : productVersion})
 
         # Retranslate the language (filtering) entry's placeholder text
         languageEntry = self.builder.get_object("languageEntry")
@@ -268,11 +271,15 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
         self._languageStoreFilter.refilter()
 
     def _add_language(self, store, native, english, lang):
-        native_span = '<span lang="%s">%s</span>' % (lang, native)
+        native_span = '<span lang="%s">%s</span>' % \
+                (escape_markup(lang),
+                 escape_markup(native))
         store.append([native_span, english, lang, False])
 
     def _add_locale(self, store, native, locale):
-        native_span = '<span lang="%s">%s</span>' % (re.sub(r'\..*', '', locale), native)
+        native_span = '<span lang="%s">%s</span>' % \
+                (escape_markup(re.sub(r'\..*', '', locale)),
+                 escape_markup(native))
         store.append([native_span, locale])
 
     # Signal handlers.
@@ -293,25 +300,31 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
             localization.setup_locale(lang)
             self.retranslate(lang)
 
+            # Reset the text direction
+            setup_gtk_direction()
+
+            # Redraw the window to reset the sidebar to where it needs to be
+            self.window.queue_draw()
+
     # Override the default in StandaloneSpoke so we can display the beta
     # warning dialog first.
-    def _on_continue_clicked(self, cb):
+    def _on_continue_clicked(self, window, user_data=None):
         # Don't display the betanag dialog if this is the final release.
         if not isFinal:
             dlg = self.builder.get_object("betaWarnDialog")
-            with enlightbox(self.window, dlg):
+            with self.main_window.enlightbox(dlg):
                 rc = dlg.run()
                 dlg.destroy()
-            if rc == 0:
+            if rc != 1:
                 sys.exit(0)
 
-        if productName.startswith("Red Hat Enterprise Linux") and \
+        if productName.startswith("Red Hat ") and \
           is_unsupported_hw() and not self.data.unsupportedhardware.unsupported_hardware:
             dlg = self.builder.get_object("unsupportedHardwareDialog")
-            with enlightbox(self.window, dlg):
+            with self.main_window.enlightbox(dlg):
                 rc = dlg.run()
                 dlg.destroy()
-            if rc == 0:
+            if rc != 1:
                 sys.exit(0)
 
-        StandaloneSpoke._on_continue_clicked(self, cb)
+        StandaloneSpoke._on_continue_clicked(self, window, user_data)
diff --git a/anaconda/pyanaconda/ui/gui/tools/run-spoke.py b/anaconda/pyanaconda/ui/gui/tools/run-spoke.py
index 6ac3b75..4edaacd 100755
--- a/anaconda/pyanaconda/ui/gui/tools/run-spoke.py
+++ b/anaconda/pyanaconda/ui/gui/tools/run-spoke.py
@@ -16,7 +16,7 @@ import os.path
 
 # Check command line arguments
 if len(sys.argv)<2:
-    print "Usage: $0 <spoke module name> [<spoke widget class>]"
+    print("Usage: $0 <spoke module name> [<spoke widget class>]")
     sys.exit(1)
 
 # This is a hack to make sure the AnacondaWidgets library gets loaded
@@ -54,7 +54,7 @@ elif os.path.basename(sys.argv[0]) == "run-hub.py":
     spokeText = "hub"
     SpokeText = "Hub"
 else:
-    print "You have to run this command as run-spoke.py or run-hub.py."
+    print("You have to run this command as run-spoke.py or run-hub.py.")
     sys.exit(1)
 
 # Set default spoke class
@@ -82,11 +82,11 @@ if not spokeClass:
     try:
         spokeClass = getattr(spokeModule, spokeClassName)
     except KeyError:
-        print "%s %s could not be found in %s" % (SpokeText, spokeClassName, spokeModuleName)
+        print("%s %s could not be found in %s" % (SpokeText, spokeClassName, spokeModuleName))
         sys.exit(1)
 
 
-print "Running %s %s from %s" % (spokeText, spokeClass, spokeModule)
+print("Running %s %s from %s" % (spokeText, spokeClass, spokeModule))
 
 ksdata = makeVersion()
 storage = Blivet(ksdata=ksdata)
@@ -96,14 +96,15 @@ instclass = DefaultInstall()
 payload = YumPayload(ksdata)
 payload.setup(storage)
 
+from pyanaconda.ui.gui.spokes import StandaloneSpoke
 spoke = spokeClass(ksdata, storage, payload, instclass)
-if hasattr(spoke, "register_event_cb"):
-    spoke.register_event_cb("continue", Gtk.main_quit)
-    spoke.register_event_cb("quit", Gtk.main_quit)
+if isinstance(spoke, StandaloneSpoke):
+    spoke.window.connect_after("continue-clicked", Gtk.main_quit)
+    spoke.window.connect("quit-clicked", Gtk.main_quit)
 
 if hasattr(spoke, "set_path"):
     spoke.set_path("categories", [
-        ("pyanaconda.ui.gui.categories.%s",
+        ("pyanaconda.ui.categories.%s",
          os.path.join(os.path.dirname(__file__),"..", "categories"))
          ])
     spoke.set_path("spokes", [
@@ -114,7 +115,7 @@ if hasattr(spoke, "set_path"):
 spoke.initialize()
     
 if not spoke.showable:
-    print "This %s is not showable, but I'll continue anyway." % spokeText
+    print("This %s is not showable, but I'll continue anyway." % spokeText)
 
 spoke.refresh()
 spoke.window.set_beta(True)
@@ -124,7 +125,7 @@ spoke.window.show_all()
 Gtk.main()
 
 if hasattr(spoke, "status"):
-    print "%s status:\n%s\n" % (SpokeText, spoke.status)
+    print("%s status:\n%s\n" % (SpokeText, spoke.status))
 if hasattr(spoke, "completed"):
-    print "%s completed:\n%s\n" % (SpokeText, spoke.completed)
-print "%s kickstart fragment:\n%s" % (SpokeText, ksdata)
+    print("%s completed:\n%s\n" % (SpokeText, spoke.completed))
+print("%s kickstart fragment:\n%s" % (SpokeText, ksdata))
diff --git a/anaconda/pyanaconda/ui/gui/utils.py b/anaconda/pyanaconda/ui/gui/utils.py
index 558abd9..e6573b8 100644
--- a/anaconda/pyanaconda/ui/gui/utils.py
+++ b/anaconda/pyanaconda/ui/gui/utils.py
@@ -21,13 +21,20 @@
 #                    Vratislav Podzimek <vpodzime@redhat.com>
 #
 
-from pyanaconda.threads import threadMgr
+from pyanaconda.threads import threadMgr, AnacondaThread
 
-from contextlib import contextmanager
-from gi.repository import Gdk, Gtk, GLib, AnacondaWidgets
+from pyanaconda.constants import NOTICEABLE_FREEZE
+from gi.repository import Gdk, Gtk, GLib
 import Queue
-import gettext
 import time
+import threading
+
+import logging
+log = logging.getLogger("anaconda")
+
+# any better idea how to create a unique, distinguishable object that cannot be
+# confused with anything else?
+TERMINATOR = object()
 
 def gtk_call_once(func, *args):
     """Wrapper for GLib.idle_add call that ensures the func is called
@@ -68,6 +75,14 @@ def gtk_action_wait(func):
 
     return _call_method
 
+def fire_gtk_action(func, *args):
+    """Run some Gtk action in the main thread and wait for it."""
+
+    @gtk_action_wait
+    def gtk_action():
+        return func(*args)
+
+    return gtk_action()
 
 def gtk_action_nowait(func):
     """Decorator method which ensures every call of the decorated function to be
@@ -93,6 +108,105 @@ def gtk_action_nowait(func):
 
     return _call_method
 
+class GtkActionList(object):
+    """Class for scheduling Gtk actions to be all run at once."""
+
+    def __init__(self):
+        self._actions = []
+
+    def add_action(self, func, *args):
+        """Add Gtk action to be run later."""
+
+        @gtk_action_wait
+        def gtk_action():
+            func(*args)
+
+        self._actions.append(gtk_action)
+
+    def fire(self):
+        """Run all scheduled Gtk actions."""
+
+        for action in self._actions:
+            action()
+
+        self._actions = []
+
+def gtk_batch_map(action, items, args=(), pre_func=None, batch_size=1):
+    """
+    Function that maps an action on items in a way that makes the action run in
+    the main thread, but without blocking the main thread for a noticeable
+    time. If a pre-processing function is given it is mapped on the items first
+    before the action happens in the main thread.
+
+    MUST NOT BE CALLED NOR WAITED FOR FROM THE MAIN THREAD.
+
+    :param action: any action that has to be done on the items in the main
+                   thread
+    :type action: (action_item, *args) -> None
+    :param items: an iterable of items that the action should be mapped on
+    :type items: iterable
+    :param args: additional arguments passed to the action function
+    :type args: tuple
+    :param pre_func: a function that is mapped on the items before they are
+                     passed to the action function
+    :type pre_func: item -> action_item
+    :param batch_size: how many items should be processed in one run in the main loop
+    :raise AssertionError: if called from the main thread
+    :return: None
+
+    """
+
+    assert(not threadMgr.in_main_thread())
+
+    def preprocess(queue):
+        if pre_func:
+            for item in items:
+                queue.put(pre_func(item))
+        else:
+            for item in items:
+                queue.put(item)
+
+        queue.put(TERMINATOR)
+
+    def process_one_batch((queue, action, done_event)):
+        tstamp_start = time.time()
+        tstamp = time.time()
+
+        # process as many batches as user shouldn't notice
+        while tstamp - tstamp_start < NOTICEABLE_FREEZE:
+            for _i in xrange(batch_size):
+                try:
+                    action_item = queue.get_nowait()
+                    if action_item is TERMINATOR:
+                        # all items processed, tell we are finished and return
+                        done_event.set()
+                        return False
+                    else:
+                        # run action on the item
+                        action(action_item, *args)
+                except Queue.Empty:
+                    # empty queue, reschedule to run later
+                    return True
+
+            tstamp = time.time()
+
+        # out of time but something left, reschedule to run again later
+        return True
+
+    item_queue = Queue.Queue()
+    done_event = threading.Event()
+
+    # we don't want to log the whole list, type and address is enough
+    log.debug("Starting applying %s on %s", action, object.__repr__(items))
+
+    # start a thread putting preprocessed items into the queue
+    threadMgr.add(AnacondaThread(prefix="AnaGtkBatchPre",
+                                 target=preprocess,
+                                 args=(item_queue,)))
+
+    GLib.idle_add(process_one_batch, (item_queue, action, done_event))
+    done_event.wait()
+    log.debug("Finished applying %s on %s", action, object.__repr__(items))
 
 def timed_action(delay=300, threshold=750, busy_cursor=True):
     """
@@ -182,18 +296,6 @@ def unbusyCursor():
     window = Gdk.get_default_root_window()
     window.set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW))
 
-@contextmanager
-def enlightbox(mainWindow, dialog):
-    # importing globally would cause a circular dependency
-    from pyanaconda.ui.gui import ANACONDA_WINDOW_GROUP
-
-    lightbox = AnacondaWidgets.Lightbox(parent_window=mainWindow)
-    ANACONDA_WINDOW_GROUP.add_window(lightbox)
-    dialog.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
-    dialog.set_transient_for(lightbox)
-    yield
-    lightbox.destroy()
-
 def ignoreEscape(dlg):
     """Prevent a dialog from accepting the escape keybinding, which emits a
        close signal and will cause the dialog to close with some return value
@@ -286,25 +388,6 @@ def set_treeview_selection(treeview, item, col=0):
 
     return itr
 
-def get_default_widget_direction():
-    """
-    Function to get default widget direction (RTL/LTR) for the current language
-    configuration.
-
-    XXX: this should be provided by the Gtk itself (#1008821)
-
-    :return: either Gtk.TextDirection.LTR or Gtk.TextDirection.RTL
-    :rtype: GtkTextDirection
-
-    """
-
-    # this is quite a hack, but it's exactly the same check Gtk uses internally
-    xlated = gettext.ldgettext("gtk30", "default:LTR")
-    if xlated == "default:LTR":
-        return Gtk.TextDirection.LTR
-    else:
-        return Gtk.TextDirection.RTL
-
 def setup_gtk_direction():
     """
     Set the right direction (RTL/LTR) of the Gtk widget's and their layout based
@@ -312,4 +395,52 @@ def setup_gtk_direction():
 
     """
 
-    Gtk.Widget.set_default_direction(get_default_widget_direction())
+    Gtk.Widget.set_default_direction(Gtk.get_locale_direction())
+
+def escape_markup(value):
+    """
+    Escape strings for use within Pango markup.
+
+    This function converts the value to a string before passing markup_escape_text().
+    """
+
+    if isinstance(value, unicode):
+        value = value.encode("utf-8")
+
+    return GLib.markup_escape_text(str(value))
+
+# This will be populated by override_cell_property. Keys are tuples of (column, renderer).
+# Values are a dict of the form {property-name: (property-func, property-data)}.
+_override_cell_property_map = {}
+
+def override_cell_property(tree_column, cell_renderer, propname, property_func, data=None):
+    """
+    Override a single property of a cell renderer.
+
+    property_func takes the same arguments as GtkTreeCellDataFunc:
+    (TreeViewColumn, CellRenderer, TreeModel, TreeIter, data). Instead of being
+    expected to manipulate the CellRenderer itself, this method should instead
+    return the value to which the property should be set.
+
+    This method calls set_cell_data_func on the column and renderer.
+
+    :param GtkTreeViewColumn column: the column to override
+    :param GtkCellRenderer cell_renderer: the cell renderer to override
+    :param str propname: the property to set on the renderer
+    :param function property_func: a function that returns the value of the property to set
+    :param data: Optional data to pass to property_func
+    """
+
+    def _cell_data_func(tree_column, cell_renderer, tree_model, tree_iter, _data=None):
+        overrides = _override_cell_property_map[(tree_column, cell_renderer)]
+        for property_name in overrides:
+            property_func, property_func_data = overrides[property_name]
+            property_value = property_func(tree_column, cell_renderer,
+                    tree_model, tree_iter, property_func_data)
+            cell_renderer.set_property(property_name, property_value)
+
+    if (tree_column, cell_renderer) not in _override_cell_property_map:
+        _override_cell_property_map[(tree_column, cell_renderer)] = {}
+        tree_column.set_cell_data_func(cell_renderer, _cell_data_func)
+
+    _override_cell_property_map[(tree_column, cell_renderer)][propname] = (property_func, data)
diff --git a/anaconda/pyanaconda/ui/gui/xkl_wrapper.py b/anaconda/pyanaconda/ui/gui/xkl_wrapper.py
new file mode 100644
index 0000000..1f7855b
--- /dev/null
+++ b/anaconda/pyanaconda/ui/gui/xkl_wrapper.py
@@ -0,0 +1,383 @@
+#
+# Copyright (C) 2012-2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+"""
+This module include functions and classes for dealing with multiple layouts in
+Anaconda. It wraps the libxklavier functionality to protect Anaconda from
+dealing with its "nice" API that looks like a Lisp-influenced "good old C" and
+also systemd-localed functionality.
+
+It provides a XklWrapper class with several methods that can be used for listing
+and various modifications of keyboard layouts settings.
+
+"""
+
+import threading
+import gettext
+from gi.repository import GdkX11, Xkl
+from collections import namedtuple
+
+from pyanaconda import flags
+from pyanaconda import iutil
+from pyanaconda.constants import DEFAULT_KEYBOARD
+from pyanaconda.keyboard import join_layout_variant, parse_layout_variant, KeyboardConfigError, InvalidLayoutVariantSpec
+from pyanaconda.ui.gui.utils import gtk_action_wait
+
+import logging
+log = logging.getLogger("anaconda")
+
+Xkb_ = lambda x: gettext.ldgettext("xkeyboard-config", x)
+iso_ = lambda x: gettext.ldgettext("iso_639", x)
+
+# namedtuple for information about a keyboard layout (its language and description)
+LayoutInfo = namedtuple("LayoutInfo", ["lang", "desc"])
+
+class XklWrapperError(KeyboardConfigError):
+    """Exception class for reporting libxklavier-related problems"""
+
+    pass
+
+class XklWrapper(object):
+    """
+    Class wrapping the libxklavier functionality
+
+    Use this class as a singleton class because it provides read-only data
+    and initialization (that takes quite a lot of time) reads always the
+    same data. It doesn't have sense to make multiple instances
+
+    """
+
+    _instance = None
+    _instance_lock = threading.Lock()
+
+    @staticmethod
+    def get_instance():
+        with XklWrapper._instance_lock:
+            if not XklWrapper._instance:
+                XklWrapper._instance = XklWrapper()
+
+        return XklWrapper._instance
+
+    def __init__(self):
+        #initialize Xkl-related stuff
+        display = GdkX11.x11_get_default_xdisplay()
+        self._engine = Xkl.Engine.get_instance(display)
+
+        self._rec = Xkl.ConfigRec()
+        if not self._rec.get_from_server(self._engine):
+            raise XklWrapperError("Failed to get configuration from server")
+
+        #X is probably initialized to the 'us' layout without any variant and
+        #since we want to add layouts with variants we need the layouts and
+        #variants lists to have the same length. Add "" padding to variants.
+        #See docstring of the add_layout method for details.
+        diff = len(self._rec.layouts) - len(self._rec.variants)
+        if diff > 0 and flags.can_touch_runtime_system("activate layouts"):
+            self._rec.set_variants(self._rec.variants + (diff * [""]))
+            if not self._rec.activate(self._engine):
+                # failed to activate layouts given e.g. by a kickstart (may be
+                # invalid)
+                lay_var_str = ",".join(map(join_layout_variant,
+                                           self._rec.layouts,
+                                           self._rec.variants))
+                log.error("Failed to activate layouts: '%s', "
+                          "falling back to default %s", lay_var_str, DEFAULT_KEYBOARD)
+                self._rec.set_layouts([DEFAULT_KEYBOARD])
+                self._rec.set_variants([""])
+
+                if not self._rec.activate(self._engine):
+                    # failed to activate even the default layout, something is
+                    # really wrong
+                    raise XklWrapperError("Failed to initialize layouts")
+
+        #needed also for Gkbd.KeyboardDrawingDialog
+        self.configreg = Xkl.ConfigRegistry.get_instance(self._engine)
+        self.configreg.load(False)
+
+        self._layout_infos = dict()
+        self._switch_opt_infos = dict()
+
+        #this might take quite a long time
+        self.configreg.foreach_language(self._get_language_variants, None)
+        self.configreg.foreach_country(self._get_country_variants, None)
+
+        #'grp' means that we want layout (group) switching options
+        self.configreg.foreach_option('grp', self._get_switch_option, None)
+
+    def _get_lang_variant(self, c_reg, item, subitem, lang):
+        if subitem:
+            name = item.get_name() + " (" + subitem.get_name() + ")"
+            description = subitem.get_description()
+        else:
+            name = item.get_name()
+            description = item.get_description()
+
+        #if this layout has already been added for some other language,
+        #do not add it again (would result in duplicates in our lists)
+        if name not in self._layout_infos:
+            self._layout_infos[name] = LayoutInfo(lang, description)
+
+    def _get_country_variant(self, c_reg, item, subitem, country):
+        if subitem:
+            name = item.get_name() + " (" + subitem.get_name() + ")"
+            description = subitem.get_description()
+        else:
+            name = item.get_name()
+            description = item.get_description()
+
+        # if the layout was not added with any language, add it with a country
+        if name not in self._layout_infos:
+            self._layout_infos[name] = LayoutInfo(country, description)
+
+    def _get_language_variants(self, c_reg, item, user_data=None):
+        lang_name, lang_desc = item.get_name(), item.get_description()
+
+        c_reg.foreach_language_variant(lang_name, self._get_lang_variant, lang_desc)
+
+    def _get_country_variants(self, c_reg, item, user_data=None):
+        country_name, country_desc = item.get_name(), item.get_description()
+
+        c_reg.foreach_country_variant(country_name, self._get_country_variant,
+                                      country_desc)
+
+    def _get_switch_option(self, c_reg, item, user_data=None):
+        """Helper function storing layout switching options in foreach cycle"""
+        desc = item.get_description()
+        name = item.get_name()
+
+        self._switch_opt_infos[name] = desc
+
+    def get_current_layout(self):
+        """
+        Get current activated X layout and variant
+
+        :return: current activated X layout and variant (e.g. "cz (qwerty)")
+
+        """
+        # ported from the widgets/src/LayoutIndicator.c code
+
+        self._engine.start_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
+        state = self._engine.get_current_state()
+        cur_group = state.group
+        num_groups = self._engine.get_num_groups()
+
+        # BUG?: if the last layout in the list is activated and removed,
+        #       state.group may be equal to n_groups
+        if cur_group >= num_groups:
+            cur_group = num_groups - 1
+
+        layout = self._rec.layouts[cur_group]
+        try:
+            variant = self._rec.variants[cur_group]
+        except IndexError:
+            # X server may have forgotten to add the "" variant for its default layout
+            variant = ""
+
+        self._engine.stop_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
+
+        return join_layout_variant(layout, variant)
+
+    def get_available_layouts(self):
+        """A generator yielding layouts (no need to store them as a bunch)"""
+
+        return self._layout_infos.iterkeys()
+
+    def get_switching_options(self):
+        """Method returning list of available layout switching options"""
+
+        return self._switch_opt_infos.iterkeys()
+
+    def get_layout_variant_description(self, layout_variant, with_lang=True, xlated=True):
+        """
+        Get description of the given layout-variant.
+
+        :param layout_variant: layout-variant specification (e.g. 'cz (qwerty)')
+        :type layout_variant: str
+        :param with_lang: whether to include language of the layout-variant (if defined)
+                          in the description or not
+        :type with_lang: bool
+        :param xlated: whethe to return translated or english version of the description
+        :type xlated: bool
+        :return: description of the layout-variant specification (e.g. 'Czech (qwerty)')
+        :rtype: str
+
+        """
+
+        layout_info = self._layout_infos[layout_variant]
+
+        # translate language and upcase its first letter, translate the
+        # layout-variant description
+        if xlated:
+            lang = iutil.upcase_first_letter(iso_(layout_info.lang).decode("utf-8"))
+            description = Xkb_(layout_info.desc).decode("utf-8")
+        else:
+            lang = iutil.upcase_first_letter(layout_info.lang)
+            description = layout_info.desc
+
+        if with_lang and lang and not description.startswith(lang):
+            return "%s (%s)" % (lang, description)
+        else:
+            return description
+
+    def get_switch_opt_description(self, switch_opt):
+        """
+        Get description of the given layout switching option.
+
+        :param switch_opt: switching option name/ID (e.g. 'grp:alt_shift_toggle')
+        :type switch_opt: str
+        :return: description of the layout switching option (e.g. 'Alt + Shift')
+        :rtype: str
+
+        """
+
+        # translate the description of the switching option
+        return Xkb_(self._switch_opt_infos[switch_opt])
+
+    @gtk_action_wait
+    def activate_default_layout(self):
+        """
+        Activates default layout (the first one in the list of configured
+        layouts).
+
+        """
+
+        self._engine.lock_group(0)
+
+    def is_valid_layout(self, layout):
+        """Return if given layout is valid layout or not"""
+
+        return layout in self._layout_infos
+
+    @gtk_action_wait
+    def add_layout(self, layout):
+        """
+        Method that tries to add a given layout to the current X configuration.
+
+        The X layouts configuration is handled by two lists. A list of layouts
+        and a list of variants. Index-matching items in these lists (as if they
+        were zipped) are used for the construction of real layouts (e.g.
+        'cz (qwerty)').
+
+        :param layout: either 'layout' or 'layout (variant)'
+        :raise XklWrapperError: if the given layout is invalid or cannot be added
+
+        """
+
+        try:
+            #we can get 'layout' or 'layout (variant)'
+            (layout, variant) = parse_layout_variant(layout)
+        except InvalidLayoutVariantSpec as ilverr:
+            raise XklWrapperError("Failed to add layout: %s" % ilverr)
+
+        #do not add the same layout-variant combinanion multiple times
+        if (layout, variant) in zip(self._rec.layouts, self._rec.variants):
+            return
+
+        self._rec.set_layouts(self._rec.layouts + [layout])
+        self._rec.set_variants(self._rec.variants + [variant])
+
+        if not self._rec.activate(self._engine):
+            raise XklWrapperError("Failed to add layout '%s (%s)'" % (layout,
+                                                                      variant))
+
+    @gtk_action_wait
+    def remove_layout(self, layout):
+        """
+        Method that tries to remove a given layout from the current X
+        configuration.
+
+        See also the documentation for the add_layout method.
+
+        :param layout: either 'layout' or 'layout (variant)'
+        :raise XklWrapperError: if the given layout cannot be removed
+
+        """
+
+        #we can get 'layout' or 'layout (variant)'
+        (layout, variant) = parse_layout_variant(layout)
+
+        layouts_variants = zip(self._rec.layouts, self._rec.variants)
+
+        if not (layout, variant) in layouts_variants:
+            msg = "'%s (%s)' not in the list of added layouts" % (layout,
+                                                                  variant)
+            raise XklWrapperError(msg)
+
+        idx = layouts_variants.index((layout, variant))
+        new_layouts = self._rec.layouts[:idx] + self._rec.layouts[(idx + 1):]
+        new_variants = self._rec.variants[:idx] + self._rec.variants[(idx + 1):]
+
+        self._rec.set_layouts(new_layouts)
+        self._rec.set_variants(new_variants)
+
+        if not self._rec.activate(self._engine):
+            raise XklWrapperError("Failed to remove layout '%s (%s)'" % (layout,
+                                                                       variant))
+
+    @gtk_action_wait
+    def replace_layouts(self, layouts_list):
+        """
+        Method that replaces the layouts defined in the current X configuration
+        with the new ones given.
+
+        :param layouts_list: list of layouts defined as either 'layout' or
+                             'layout (variant)'
+        :raise XklWrapperError: if layouts cannot be replaced with the new ones
+
+        """
+
+        new_layouts = list()
+        new_variants = list()
+
+        for layout_variant in layouts_list:
+            (layout, variant) = parse_layout_variant(layout_variant)
+            new_layouts.append(layout)
+            new_variants.append(variant)
+
+        self._rec.set_layouts(new_layouts)
+        self._rec.set_variants(new_variants)
+
+        if not self._rec.activate(self._engine):
+            msg = "Failed to replace layouts with: %s" % ",".join(layouts_list)
+            raise XklWrapperError(msg)
+
+    @gtk_action_wait
+    def set_switching_options(self, options):
+        """
+        Method that sets options for layout switching. It replaces the old
+        options with the new ones.
+
+        :param options: layout switching options to be set
+        :type options: list or generator
+        :raise XklWrapperError: if the old options cannot be replaced with the
+                                new ones
+
+        """
+
+        #preserve old "non-switching options"
+        new_options = [opt for opt in self._rec.options if "grp:" not in opt]
+        new_options += options
+
+        self._rec.set_options(new_options)
+
+        if not self._rec.activate(self._engine):
+            msg = "Failed to set switching options to: %s" % ",".join(options)
+            raise XklWrapperError(msg)
+
diff --git a/anaconda/pyanaconda/ui/helpers.py b/anaconda/pyanaconda/ui/helpers.py
new file mode 100644
index 0000000..e6654b9
--- /dev/null
+++ b/anaconda/pyanaconda/ui/helpers.py
@@ -0,0 +1,385 @@
+# Abstract base classes for UI classes
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dshea@redhat.com>
+#
+
+# This file contains abstract base classes that provide specific functionality
+# that can be added to another class. The idea is sort-of modelled after Java's
+# interfaces. An abstract base class cannot be instatiated, and it provides a
+# contract for classes that inherit from it: any method or property marked as
+# abstract in the base class must be overriden in the inheriting class. This
+# allows for cleaner implementation of certain types of mixin-classes: a class
+# that adds functionality to another class can explicitly require that methods
+# or properties be provided by the inheriting class or another superclass of
+# the inheriting class.
+#
+# In general, classes that inherit from abstract base classes should place the
+# abstract base class at the end of the inheritance list. This way any abstract
+# methods or properties in the abc will be overridden by the base classes
+# that are first in the inheritance list. For example, an abstract base class
+# may add a method that reads from Spoke.data:
+#
+#    class Mixin(object):
+#        __metaclass__ = ABCMeta
+#
+#        @abstractproperty
+#        def data(self):
+#            pass
+#
+#        def isHD(self):
+#            return self.data.method == "harddrive"
+#
+# The Mixin class will add the method isHD to any class that inherits from it,
+# and classes that inherit from Mixin must provide a data property.
+#
+#    class MixedObject(UIObject, Mixin):
+#        ....
+#
+# The method resolution order of MixedObject resolves UIObject.data before
+# Mixin.data, so UIObject.data satisfies the requirment that Mixin.data be
+# overriden.
+
+from abc import ABCMeta, abstractproperty, abstractmethod
+
+from pyanaconda import constants
+from pyanaconda.threads import threadMgr, AnacondaThread
+from pyanaconda.ui.communication import hubQ
+from pyanaconda.i18n import _
+from pyanaconda import isys
+
+import logging
+import copy
+
+class StorageChecker(object):
+    __metaclass__ = ABCMeta
+
+    log = logging.getLogger("anaconda")
+    errors = []
+    warnings = []
+
+    def __init__(self, min_ram=isys.MIN_RAM, mainSpokeClass="StorageSpoke"):
+        self._mainSpokeClass = mainSpokeClass
+        self._min_ram = min_ram
+
+    @abstractproperty
+    def storage(self):
+        pass
+
+    def run(self):
+        threadMgr.add(AnacondaThread(name=constants.THREAD_CHECK_STORAGE,
+                                     target=self.checkStorage))
+
+    def checkStorage(self):
+        from pyanaconda.storage_utils import sanity_check, SanityError, SanityWarning
+
+        threadMgr.wait(constants.THREAD_EXECUTE_STORAGE)
+
+        hubQ.send_not_ready(self._mainSpokeClass)
+        hubQ.send_message(self._mainSpokeClass, _("Checking storage configuration..."))
+        exns = sanity_check(self.storage, min_ram=self._min_ram)
+        errors = [exn.message for exn in exns if isinstance(exn, SanityError)]
+        warnings = [exn.message for exn in exns if isinstance(exn, SanityWarning)]
+        (StorageChecker.errors, StorageChecker.warnings) = (errors, warnings)
+        hubQ.send_ready(self._mainSpokeClass, True)
+        for e in StorageChecker.errors:
+            self.log.error(e)
+        for w in StorageChecker.warnings:
+            self.log.warning(w)
+
+class SourceSwitchHandler(object):
+    """ A class that can be used as a mixin handling
+    installation source switching.
+    It will correctly switch to the new method
+    and cleanup any previous method set.
+    """
+
+    __metaclass__ = ABCMeta
+
+    @abstractproperty
+    def data(self):
+        pass
+
+    @abstractproperty
+    def storage(self):
+        pass
+
+    def __init__(self):
+        self._device = None
+        self._current_iso_path = None
+
+    def _clean_hdd_iso(self):
+        """ Clean HDD ISO usage
+        This means unmounting the partition and unprotecting it,
+        so it can be used for the installation.
+        """
+        if self.data.method.method == "harddrive" and self.data.method.partition:
+            part = self.data.method.partition
+            dev = self.storage.devicetree.getDeviceByName(part)
+            if dev:
+                dev.protected = False
+            self.storage.config.protectedDevSpecs.remove(part)
+
+    def set_source_hdd_iso(self, device, iso_path):
+        """ Switch to the HDD ISO install source
+        :param partition: name of the partition hosting the ISO
+        :type partition: string
+        :param iso_path: full path to the source ISO file
+        :type iso_path: string
+        """
+        partition = device.name
+        # the GUI source spoke also does the copy
+        old_source = copy.copy(self.data.method)
+
+        # if a different partition was used previously, unprotect it
+        if old_source.method == "harddrive" and old_source.partition != partition:
+            self._clean_hdd_iso()
+
+        # protect current device
+        if device:
+            device.protected = True
+            self.storage.config.protectedDevSpecs.append(device.name)
+
+        self.data.method.method = "harddrive"
+        self.data.method.partition = partition
+        # the / gets stripped off by payload.ISOImage
+        self.data.method.dir = "/" + iso_path
+
+        # as we already made the device protected when
+        # switching to it, we don't need to protect it here
+
+    def set_source_url(self, url=None):
+        """ Switch to install source specified by URL """
+        # clean any old HDD ISO sources
+        self._clean_hdd_iso()
+
+        self.data.method.method = "url"
+        if url is not None:
+            self.data.method.url = url
+
+    def set_source_nfs(self, opts=None):
+        """ Switch to NFS install source """
+        # clean any old HDD ISO sources
+        self._clean_hdd_iso()
+
+        self.data.method.method = "nfs"
+        if opts is not None:
+            self.data.method.opts = opts
+
+    def set_source_cdrom(self):
+        """ Switch to cdrom install source """
+        # clean any old HDD ISO sources
+        self._clean_hdd_iso()
+
+        self.data.method.method = "cdrom"
+
+    def set_source_closest_mirror(self):
+        """ Switch to the closest mirror install source """
+        # clean any old HDD ISO sources
+        self._clean_hdd_iso()
+
+        self.data.method.method = None
+
+class InputCheck(object):
+    """Handle an input validation check.
+
+       This class is used by classes that implement InputCheckHandler to
+       manage and manipulate input validation check instances.
+    """
+
+    # Use as a return value to indicate a passed check
+    CHECK_OK = None
+
+    # Treat the check as failed but don't display anything
+    # This can be used, for example, to reject empty input without setting
+    # a big loud error message.
+    CHECK_SILENT = ""
+
+    # Read-only properties
+    input_obj = property(lambda s: s._input_obj,
+                     doc="The input to check.")
+    run_check = property(lambda s: s._run_check,
+                         doc="A function to call to perform the input check.")
+    data = property(lambda s: s._data,
+                    doc="Optional data associated with the input check.")
+    check_status = property(lambda s: s._check_status,
+                            doc="The current status of the check")
+
+    def __init__(self, parent, input_obj, run_check, data=None):
+        """Create a new input validation check.
+
+           :param InputCheckHandler parent: The InputCheckHandler object to which this
+                                            check is being added.
+
+           :param function input_obj: An object representing the input to check.
+
+           :param function run_check: A function to call to perform the input check. This
+                                      function is called with the InputCheck object as a
+                                      parameter.  The return value an object representing
+                                      the error state, or CHECK_OK if the check succeeds.
+
+           :param data: Optional data associated with the input check
+        """
+        self._parent = parent
+        self._input_obj = input_obj
+        self._run_check = run_check
+        self._data = data
+        self._check_status = None
+        self._enabled = True
+
+    def update_check_status(self):
+        """Run an input validation check."""
+        if not self.enabled:
+            return
+
+        new_check_status = self._run_check(self)
+        check_status_changed = (self.check_status != new_check_status)
+        self._check_status = new_check_status
+
+        if check_status_changed:
+            self._parent.set_status(self)
+
+    @property
+    def enabled(self):
+        """Whether the check is enabled or not.
+
+           Disabling a check indicates that the status will not change if
+           the input changes. The value of check_status will be the result of
+           the last time the InputCheck was run when enabled. Disabled checks
+           will not be included in InputCheckHandler.failed_checks.
+        """
+        return self._enabled
+
+    @enabled.setter
+    def enabled(self, value):
+        self._enabled = value
+
+class InputCheckHandler(object):
+    """Provide a framework for adding input validation checks to a screen.
+
+       This helper class provides a mean of defining and associating input
+       validation checks with an input screen. Running the checks and acting
+       upon the results is left up to the subclasses. Classes implementing
+       InputCheckHandler should ensure that the checks are run at the
+       appropriate times (e.g., calling InputCheck.update_check_status when
+       input is changed), and that input for the screen is not accepted if
+       self.failed_checks is not empty.
+
+       See GUIInputCheckHandler and GUISpokeInputCheckHandler for additional
+       functionality.
+    """
+
+    __metaclass__ = ABCMeta
+
+    def __init__(self):
+        self._check_list = []
+
+    def _check_re(self, inputcheck):
+        """Perform an input validation check against a regular expression."""
+        if inputcheck.data['regex'].match(self.get_input(inputcheck.input_obj)):
+            return inputcheck.CHECK_OK
+        else:
+            return inputcheck.data['message']
+
+    @abstractmethod
+    def get_input(self, input_obj):
+        """Return the input string from an input object.
+
+           :param input_obj: The input object
+
+           :returns: An input string
+           :rtype: str
+        """
+        pass
+
+    @abstractmethod
+    def set_status(self, inputcheck):
+        """Update the status of the window from the input validation results.
+
+           This function could, for example, set or clear an error on the window,
+           or display a message near an input area with invalid data.
+
+           :param InputCheck inputcheck: The InputCheck object whose status last changed.
+        """
+        pass
+
+    def add_check(self, input_obj, run_check, data=None):
+
+        """Add an input validation check to this object.
+
+           :param input_obj: An object representing the input to check.
+
+           :param function run_check: A function to call to perform the input check. This
+                                      function is called with the InputCheck object as a
+                                      parameter.  The return value an object representing
+                                      the error state, or CHECK_OK if the check succeeds.
+
+           :param data: Optional data associated with the input check
+
+           :returns: The InputCheck object created.
+           :rtype: InputCheck
+        """
+        checkRef = InputCheck(self, input_obj, run_check, data)
+        self._check_list.append(checkRef)
+        return checkRef
+
+    def add_re_check(self, input_obj, regex, message):
+        """Add a check using a regular expression.
+
+           :param function input_obj: An object representing the input to check.
+
+           :param re.RegexObject regex: The regular expression to check input against.
+
+           :param str message: A message to return for failed checks
+
+           :returns: The InputCheck object created.
+           :rtype: InputCheck
+        """
+        return self.add_check(input_obj=input_obj, run_check=self._check_re,
+                data={'regex': regex, 'message': message})
+
+    def remove_check(self, inputcheck):
+        """Remove an input check.
+
+           If the check being removed is not in the OK status, the status will
+           be set to CHECK_OK and set_status will be called.
+
+           :param inputcheck InputCheck: the InputCheck object to remove
+           :raise ValueError: if the inputcheck does not exist for this InputCheckHandler
+        """
+        self._check_list.remove(inputcheck)
+        if inputcheck.check_status != InputCheck.CHECK_OK:
+            inputcheck._check_status = InputCheck.CHECK_OK
+            self.set_status(inputcheck)
+
+    @property
+    def failed_checks(self):
+        """A generator of all failed input checks"""
+        return (c for c in self._check_list \
+                if c.enabled and c.check_status != InputCheck.CHECK_OK)
+
+    @property
+    def failed_checks_with_message(self):
+        """A generator of all failed input checks with an error message"""
+        return (c for c in self._check_list \
+                if c.enabled and c.check_status not in (InputCheck.CHECK_OK, InputCheck.CHECK_SILENT))
+
+    @property
+    def checks(self):
+        """An iterator over all input checks"""
+        return self._check_list.__iter__()
diff --git a/anaconda/pyanaconda/ui/lib/disks.py b/anaconda/pyanaconda/ui/lib/disks.py
index 32389e0..9d4607f 100644
--- a/anaconda/pyanaconda/ui/lib/disks.py
+++ b/anaconda/pyanaconda/ui/lib/disks.py
@@ -20,12 +20,11 @@
 #                    Chris Lumens <clumens@redhat.com>
 #
 
-from blivet.devices import MultipathDevice, iScsiDiskDevice
-from blivet.size import Size
+from blivet.devices import MultipathDevice, iScsiDiskDevice, FcoeDiskDevice
 
 from pyanaconda.flags import flags
 
-__all__ = ["FakeDiskLabel", "FakeDisk", "getDisks", "isLocalDisk", "size_str"]
+__all__ = ["FakeDiskLabel", "FakeDisk", "getDisks", "isLocalDisk"]
 
 class FakeDiskLabel(object):
     def __init__(self, free=0):
@@ -50,14 +49,24 @@ class FakeDisk(object):
 def getDisks(devicetree, fake=False):
     if not fake:
         devices = devicetree.devices
-        if not flags.imageInstall:
+        if flags.imageInstall:
+            hidden_images = [d for d in devicetree._hidden \
+                             if d.name in devicetree.diskImages]
+            devices += hidden_images
+        else:
             devices += devicetree._hidden
 
-        disks = [d for d in devices if d.isDisk and
-                                       d.size > 0 and
-                                       not d.format.hidden and
-                                       not (d.protected and
-                                            d.removable)]
+        disks = []
+        for d in devices:
+            if d.isDisk and not d.format.hidden and not d.protected:
+                # unformatted DASDs are detected with a size of 0, but they should
+                # still show up as valid disks if this function is called, since we
+                # can still use them; anaconda will know how to handle them, so they
+                # don't need to be ignored anymore
+                if d.type == "dasd":
+                    disks.append(d)
+                elif d.size > 0 and d.mediaPresent:
+                    disks.append(d)
     else:
         disks = []
         disks.append(FakeDisk("sda", size=300000, free=10000, serial="00001",
@@ -68,15 +77,18 @@ def getDisks(devicetree, fake=False):
                               vendor="SanDisk", model="Cruzer", serial="00003"))
 
     # Remove duplicate names from the list.
-    return sorted(list(set(disks)), key=lambda d: d.name)
+    return sorted(set(disks), key=lambda d: d.name)
 
 def isLocalDisk(disk):
-    return not isinstance(disk, MultipathDevice) and not isinstance(disk, iScsiDiskDevice)
+    return (not isinstance(disk, MultipathDevice)
+            and not isinstance(disk, iScsiDiskDevice)
+            and not isinstance(disk, FcoeDiskDevice))
 
-def size_str(mb):
-    if isinstance(mb, Size):
-        size = mb
-    else:
-        size = Size(en_spec="%f mb" % mb)
+def applyDiskSelection(storage, data, use_names):
+    onlyuse = use_names[:]
+    for disk in (d for d in storage.disks if d.name in onlyuse):
+        onlyuse.extend(d.name for d in disk.ancestors
+                       if d.name not in onlyuse)
 
-    return str(size).upper()
+    data.ignoredisk.onlyuse = onlyuse
+    data.clearpart.drives = use_names[:]
diff --git a/anaconda/pyanaconda/ui/lib/entropy.py b/anaconda/pyanaconda/ui/lib/entropy.py
new file mode 100644
index 0000000..c108480
--- /dev/null
+++ b/anaconda/pyanaconda/ui/lib/entropy.py
@@ -0,0 +1,127 @@
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+"""
+Helper module with functions for informing user we are waiting for random
+data entropy.
+
+"""
+
+import time
+import select
+import sys
+import termios
+import errno
+import math
+
+from pyanaconda.progress import progress_message
+from pyanaconda.constants import MAX_ENTROPY_WAIT
+from pykickstart.constants import DISPLAY_MODE_GRAPHICAL
+from blivet.util import get_current_entropy
+
+from pyanaconda.i18n import _, P_
+
+def wait_for_entropy(msg, desired_entropy, ksdata):
+    """
+    Show UI dialog/message for waiting for desired random data entropy.
+
+    :param ksdata: kickstart data
+    :type ksdata: pykickstart.base.BaseHandler
+    :param desired_entropy: entropy level to wait for
+    :type desired_entropy: int
+    :returns: whether to force continuing regardless of the available entropy level
+    :rtype: bool
+
+    """
+
+    if ksdata.displaymode.displayMode == DISPLAY_MODE_GRAPHICAL:
+        # cannot import globally because GUI code may be missing for text mode
+        # in some cases
+        from pyanaconda.ui.gui.spokes.lib.entropy_dialog import run_entropy_dialog
+        progress_message(_("The system needs more random data entropy"))
+        return run_entropy_dialog(ksdata, desired_entropy)
+    else:
+        return _tui_wait(msg, desired_entropy)
+
+def _tui_wait(msg, desired_entropy):
+    """Tell user we are waiting for entropy"""
+
+    print(msg)
+    print(_("Entropy can be increased by typing randomly on keyboard"))
+    print(_("After %d minutes, the installation will continue regardless of the "
+            "amount of available entropy") % (MAX_ENTROPY_WAIT / 60))
+    fd = sys.stdin.fileno()
+    termios_attrs_changed = False
+
+    try:
+        old = termios.tcgetattr(fd)
+        new = termios.tcgetattr(fd)
+        new[3] = new[3] & ~termios.ICANON & ~termios.ECHO
+        new[6][termios.VMIN] = 1
+        termios.tcsetattr(fd, termios.TCSANOW, new)
+        termios_attrs_changed = True
+    except termios.error as term_err:
+        if term_err.args[0] == errno.ENOTTY:
+            # "Inappropriate ioctl for device" --> terminal attributes not supported
+            pass
+        else:
+            raise
+
+    # wait for the entropy to become high enough or time has run out
+    cur_entr = get_current_entropy()
+    secs = 0
+    while cur_entr < desired_entropy and secs <= MAX_ENTROPY_WAIT:
+        remaining = (MAX_ENTROPY_WAIT - secs) / 60.0
+        print(_("Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%] (%(rem)d %(min)s remaining)")
+                % {"av_entr": cur_entr, "req_entr": desired_entropy,
+                   "pct": int((float(cur_entr) / desired_entropy) * 100),
+                   "min": P_("minute", "minutes", remaining),
+                   "rem": math.ceil(remaining)})
+        time.sleep(1)
+        cur_entr = get_current_entropy()
+        secs += 1
+
+    # print the final state as well
+    print(_("Available entropy: %(av_entr)s, Required entropy: %(req_entr)s [%(pct)d %%]")
+            % {"av_entr": cur_entr, "req_entr": desired_entropy,
+               "pct": int((float(cur_entr) / desired_entropy) * 100)})
+
+    if secs <= MAX_ENTROPY_WAIT:
+        print(_("Enough entropy gathered, please stop typing."))
+        force_cont = False
+    else:
+        print(_("Giving up, time (%d minutes) ran out.") % (MAX_ENTROPY_WAIT / 60))
+        force_cont = True
+
+    # we are done
+    # first let the user notice we are done and stop typing
+    time.sleep(5)
+
+    # and then just read everything from the input buffer and revert the
+    # termios state
+    data = "have something"
+    while sys.stdin in select.select([sys.stdin], [], [], 0)[0] and data:
+        # just read from stdin and scratch the read data
+        data = sys.stdin.read(1)
+
+    if termios_attrs_changed:
+        termios.tcsetattr(fd, termios.TCSAFLUSH, old)
+
+    return force_cont
diff --git a/anaconda/pyanaconda/ui/lib/space.py b/anaconda/pyanaconda/ui/lib/space.py
index 8a45022..e556492 100644
--- a/anaconda/pyanaconda/ui/lib/space.py
+++ b/anaconda/pyanaconda/ui/lib/space.py
@@ -18,8 +18,9 @@
 #
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
 #
-
+import os
 from blivet.size import Size
+from pyanaconda import iutil
 
 from pyanaconda.i18n import _, N_
 
@@ -54,7 +55,7 @@ class FileSystemSpaceChecker(object):
            check again.
         """
         self.success = False
-        self.deficit = Size(bytes=0)
+        self.deficit = Size(0)
         self.error_message = ""
 
     def check(self):
@@ -65,13 +66,44 @@ class FileSystemSpaceChecker(object):
            success       -- A simple boolean defining whether there's enough
                             space or not.
            deficit       -- If unsuccessful, how much space the system is
-                            short for current software selections (in MB).
+                            short for current software selections.
            error_message -- If unsuccessful, an error message describing the
                             situation.  This message is suitable for putting
                             in the info bar at the bottom of a Hub.
         """
         self.reset()
-        free = Size(en_spec="%.2f MB" % self.storage.fileSystemFreeSpace)
+        free = Size(self.storage.fileSystemFreeSpace)
+        needed = self.payload.spaceRequired
+        log.info("fs space: %s  needed: %s", free, needed)
+        self.success = (free >= needed)
+        if not self.success:
+            self.deficit = needed - free
+            self.error_message = _(self.error_template) % self.deficit
+
+        return self.success
+
+class DirInstallSpaceChecker(FileSystemSpaceChecker):
+    """Use the amount of space available at ROOT_PATH to calculate free space.
+
+    This is used for the --dirinstall option where no storage is mounted and it
+    is using space from the host's filesystem.
+    """
+    def check(self):
+        """Check configured storage against software selections.  When this
+           method is complete (which should be pretty quickly), the following
+           attributes are available for inspection:
+
+           success       -- A simple boolean defining whether there's enough
+                            space or not.
+           deficit       -- If unsuccessful, how much space the system is
+                            short for current software selections.
+           error_message -- If unsuccessful, an error message describing the
+                            situation.  This message is suitable for putting
+                            in the info bar at the bottom of a Hub.
+        """
+        self.reset()
+        stat = iutil.eintr_retry_call(os.statvfs, iutil.getSysroot())
+        free = Size(stat.f_bsize * stat.f_bfree)
         needed = self.payload.spaceRequired
         log.info("fs space: %s  needed: %s", free, needed)
         self.success = (free >= needed)
diff --git a/anaconda/pyanaconda/ui/tui/__init__.py b/anaconda/pyanaconda/ui/tui/__init__.py
index 1b12fb9..655913a 100644
--- a/anaconda/pyanaconda/ui/tui/__init__.py
+++ b/anaconda/pyanaconda/ui/tui/__init__.py
@@ -79,7 +79,7 @@ class TextUserInterface(ui.UserInterface):
                         as final (True) or development
                         (False) version.
         :type isFinal: bool
-        
+
         :param quitMessage: The text to be used in quit
                             dialog question. It should not
                             be translated to allow for change
@@ -97,19 +97,22 @@ class TextUserInterface(ui.UserInterface):
         self.isFinal = isFinal
         self.quitMessage = quitMessage
 
-    basemask = "pyanaconda.ui.tui"
+    basemask = "pyanaconda.ui"
     basepath = os.path.dirname(__file__)
-    updatepath = "/tmp/updates/pyanaconda/ui/tui"
-    sitepackages = [os.path.join(dir, "pyanaconda", "ui", "tui")
+    updatepath = "/tmp/updates/pyanaconda/ui"
+    sitepackages = [os.path.join(dir, "pyanaconda", "ui")
                     for dir in site.getsitepackages()]
     pathlist = set([updatepath, basepath] + sitepackages)
 
     paths = ui.UserInterface.paths + {
-            "spokes": [(basemask + ".spokes.%s",
-                        os.path.join(path, "spokes"))
+            "categories": [(basemask + ".categories.%s",
+                        os.path.join(path, "categories"))
                         for path in pathlist],
-            "hubs": [(basemask + ".hubs.%s",
-                      os.path.join(path, "hubs"))
+            "spokes": [(basemask + ".tui.spokes.%s",
+                        os.path.join(path, "tui/spokes"))
+                        for path in pathlist],
+            "hubs": [(basemask + ".tui.hubs.%s",
+                      os.path.join(path, "tui/hubs"))
                       for path in pathlist]
             }
 
@@ -162,6 +165,7 @@ class TextUserInterface(ui.UserInterface):
 
             if hasattr(obj, "set_path"):
                 obj.set_path("spokes", self.paths["spokes"])
+                obj.set_path("categories", self.paths["categories"])
 
             should_schedule = obj.setup(self.ENVIRONMENT)
 
diff --git a/anaconda/pyanaconda/ui/tui/hubs/__init__.py b/anaconda/pyanaconda/ui/tui/hubs/__init__.py
index 2bf3186..e89bf71 100644
--- a/anaconda/pyanaconda/ui/tui/hubs/__init__.py
+++ b/anaconda/pyanaconda/ui/tui/hubs/__init__.py
@@ -20,10 +20,9 @@
 #
 from pyanaconda.ui.tui import simpleline as tui
 from pyanaconda.ui.tui.tuiobject import TUIObject
-from pyanaconda.ui.tui.spokes import collect_spokes
 from pyanaconda.ui import common
 
-from pyanaconda.i18n import _
+from pyanaconda.i18n import _, C_, N_
 
 class TUIHub(TUIObject, common.Hub):
     """Base Hub class implementing the pyanaconda.ui.common.Hub interface.
@@ -39,32 +38,32 @@ class TUIHub(TUIObject, common.Hub):
     """
 
     categories = []
-    title = _("Default HUB title")
+    title = N_("Default HUB title")
 
     def __init__(self, app, data, storage, payload, instclass):
         TUIObject.__init__(self, app, data)
-        common.Hub.__init__(self, data, storage, payload, instclass)
+        common.Hub.__init__(self, storage, payload, instclass)
 
         self._spokes = {}     # holds spokes referenced by their class name
         self._keys = {}       # holds spokes referenced by their user input key
         self._spoke_count = 0
 
     def setup(self, environment="anaconda"):
-        # look for spokes having category present in self.categories
-        for c in self.categories:
-            spokes = collect_spokes(self.paths["spokes"], c)
+        cats_and_spokes = self._collectCategoriesAndSpokes()
+        categories = cats_and_spokes.keys()
 
-            # sort them according to their priority
-            for s in sorted(spokes, key = lambda s: s.title):
+        for c in sorted(categories, key=lambda c: c.title):
+
+            for spokeClass in sorted(cats_and_spokes[c], key=lambda s: s.title):
                 # Check if this spoke is to be shown in anaconda
-                if not s.should_run(environment, self.data):
+                if not spokeClass.should_run(environment, self.data):
                     continue
 
-                spoke = s(self.app, self.data, self.storage, self.payload, self.instclass)
-                spoke.initialize()
+                spoke = spokeClass(self.app, self.data, self.storage, self.payload, self.instclass)
 
-                if not spoke.showable:
-                    spoke.teardown()
+                if spoke.showable:
+                    spoke.initialize()
+                else:
                     del spoke
                     continue
 
@@ -73,7 +72,7 @@ class TUIHub(TUIObject, common.Hub):
 
                 self._spoke_count += 1
                 self._keys[self._spoke_count] = spoke
-                self._spokes[spoke.__class__.__name__] = spoke
+                self._spokes[spokeClass.__name__] = spoke
 
         # only schedule the hub if it has some spokes
         return self._spoke_count != 0
@@ -109,7 +108,7 @@ class TUIHub(TUIObject, common.Hub):
             # If we get a continue, check for unfinished spokes.  If unfinished
             # don't continue
             # TRANSLATORS: 'c' to continue
-            if key == _('c'):
+            if key == C_('TUI|Spoke Navigation', 'c'):
                 for spoke in self._spokes.values():
                     if not spoke.completed and spoke.mandatory:
                         print(_("Please complete all spokes before continuing"))
diff --git a/anaconda/pyanaconda/ui/tui/hubs/summary.py b/anaconda/pyanaconda/ui/tui/hubs/summary.py
index 6265608..c363d7a 100644
--- a/anaconda/pyanaconda/ui/tui/hubs/summary.py
+++ b/anaconda/pyanaconda/ui/tui/hubs/summary.py
@@ -20,16 +20,27 @@
 #                    Jesse Keating <jkeating@redhat.com>
 #
 
+from pyanaconda.ui.lib.space import FileSystemSpaceChecker, DirInstallSpaceChecker
 from pyanaconda.ui.tui.hubs import TUIHub
 from pyanaconda.flags import flags
-from pyanaconda.i18n import _
+from pyanaconda.errors import CmdlineError
+from pyanaconda.i18n import N_, _
 import sys
 import time
 
+import logging
+log = logging.getLogger("anaconda")
+
 class SummaryHub(TUIHub):
-    title = _("Installation")
-    ## FIXME: this should be pulling data from somewhere, not just a static list
-    categories = ["localization", "software", "system", "user"]
+    title = N_("Installation")
+
+    def __init__(self, app, data, storage, payload, instclass):
+        super(SummaryHub, self).__init__(app, data, storage, payload, instclass)
+
+        if not flags.dirInstall:
+            self._checker = FileSystemSpaceChecker(storage, payload)
+        else:
+            self._checker = DirInstallSpaceChecker(storage, payload)
 
     def setup(self, environment="anaconda"):
         should_schedule = TUIHub.setup(self, environment=environment)
@@ -55,11 +66,58 @@ class SummaryHub(TUIHub):
     # override the prompt so that we can skip user input on kickstarts
     # where all the data is in hand.  If not in hand, do the actual prompt.
     def prompt(self, args=None):
-        if flags.automatedInstall and \
-        all(spoke.completed for spoke in self._keys.values() if spoke.mandatory):
-            self.close()
-            return None
+        incompleteSpokes = [spoke for spoke in self._keys.values()
+                                      if spoke.mandatory and not spoke.completed]
+
+        # do a bit of final sanity checking, make sure pkg selection
+        # size < available fs space
+        if flags.automatedInstall:
+            if self._checker and not self._checker.check():
+                print(self._checker.error_message)
+            if not incompleteSpokes:
+                self.close()
+                return None
+
         if not flags.ksprompt:
-            errtxt = _("Can't have a question in command line mode!")
-            raise RuntimeError(errtxt)
-        return TUIHub.prompt(self, args)
+            errtxt = _("The following mandatory spokes are not completed:") + \
+                     "\n" + "\n".join(spoke.title for spoke in incompleteSpokes)
+            log.error("CmdlineError: %s", errtxt)
+            raise CmdlineError(errtxt)
+
+
+        # override the default prompt since we want to offer the 'b' to begin
+        # installation option here
+        return _("  Please make your choice from above ['q' to quit | 'b' to begin installation |\n  'r' to refresh]: ")
+
+    def input(self, args, key):
+        """Handle user input. Numbers are used to show a spoke, the rest is passed
+        to the higher level for processing."""
+        try:
+            number = int(key)
+            self.app.switch_screen_with_return(self._keys[number])
+            return None
+
+        except (ValueError, KeyError):
+            # If we get a continue, check for unfinished spokes.  If unfinished
+            # don't continue
+            # TRANSLATORS: 'b' to begin installation
+            if key == _('b'):
+                for spoke in self._spokes.values():
+                    if not spoke.completed and spoke.mandatory:
+                        print(_("Please complete all spokes before continuing"))
+                        return False
+                # do a bit of final sanity checking, making sure pkg selection
+                # size < available fs space
+                if self._checker and not self._checker.check():
+                    print(self._checker.error_message)
+                    return False
+                if self.app._screens:
+                    self.app.close_screen()
+                    return True
+            # TRANSLATORS: 'c' to continue
+            elif key == _('c'):
+                # Kind of a hack, but we want to ignore if anyone presses 'c'
+                # which is the global TUI key to close the current screen
+                return False
+            else:
+                super(SummaryHub, self).input(args, key)
diff --git a/anaconda/pyanaconda/ui/tui/simpleline/__init__.py b/anaconda/pyanaconda/ui/tui/simpleline/__init__.py
index 2c715e2..652069b 100644
--- a/anaconda/pyanaconda/ui/tui/simpleline/__init__.py
+++ b/anaconda/pyanaconda/ui/tui/simpleline/__init__.py
@@ -19,7 +19,7 @@
 # Red Hat Author(s): Martin Sivak <msivak@redhat.com>
 #
 
-# pylint: disable-msg=W0401
+# pylint: disable=wildcard-import
 from pyanaconda.ui.tui.simpleline.base import *
-# pylint: disable-msg=W0401
+# pylint: disable=wildcard-import
 from pyanaconda.ui.tui.simpleline.widgets import *
diff --git a/anaconda/pyanaconda/ui/tui/simpleline/base.py b/anaconda/pyanaconda/ui/tui/simpleline/base.py
index e26d317..04e4053 100644
--- a/anaconda/pyanaconda/ui/tui/simpleline/base.py
+++ b/anaconda/pyanaconda/ui/tui/simpleline/base.py
@@ -25,10 +25,11 @@ import sys
 import Queue
 import getpass
 import threading
+import functools
 from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda.ui.communication import hubQ
 from pyanaconda import constants
-from pyanaconda.i18n import _, N_
+from pyanaconda.i18n import _, N_, C_
 
 RAW_INPUT_LOCK = threading.Lock()
 
@@ -91,9 +92,6 @@ class App(object):
         else:
             self.queue = Queue.Queue()
 
-        # ensure unique thread names
-        self._in_thread_counter = 0
-
         # event handlers
         # key: event id
         # value: list of tuples (callback, data)
@@ -158,8 +156,12 @@ class App(object):
                 return
             else:
                 # lock acquired, we can run raw_input
-                data = raw_input()
-                RAW_INPUT_LOCK.release()
+                try:
+                    data = raw_input()
+                except EOFError:
+                    data = ""
+                finally:
+                    RAW_INPUT_LOCK.release()
 
         queue.put((hubQ.HUB_CODE_INPUT, [data]))
 
@@ -281,7 +283,7 @@ class App(object):
             # get the widget tree from the screen and show it in the screen
             try:
                 input_needed = screen.refresh(args)
-                screen.window.show_all()
+                screen.show_all()
                 self._redraw = False
             except ExitMainLoop:
                 raise
@@ -313,7 +315,7 @@ class App(object):
         # ask for redraw by default
         self._redraw = True
 
-        # inital state
+        # initial state
         last_screen = None
         error_counter = 0
 
@@ -325,7 +327,7 @@ class App(object):
             # if redraw is needed, separate the content on the screen from the
             # stuff we are about to display now
             if self._redraw:
-                print self._spacer
+                print(self._spacer)
 
             try:
                 # draw the screen if redraw is needed or the screen changed
@@ -408,10 +410,7 @@ class App(object):
         """This method reads one input from user. Its basic form has only one
         line, but we might need to override it for more complex apps or testing."""
 
-        thread_name = "%s%d" % (constants.THREAD_INPUT_BASENAME,
-                                self._in_thread_counter)
-        self._in_thread_counter += 1
-        input_thread = AnacondaThread(name=thread_name,
+        input_thread = AnacondaThread(prefix=constants.THREAD_INPUT_BASENAME,
                                       target=self._thread_input,
                                       args=(self.queue, prompt, hidden))
         input_thread.daemon = True
@@ -448,19 +447,19 @@ class App(object):
 
         # global refresh command
         # TRANSLATORS: 'r' to refresh
-        if self._screens and (key == _('r')):
+        if self._screens and (key == C_('TUI|Spoke Navigation', 'r')):
             self._do_redraw()
             return True
 
         # global close command
         # TRANSLATORS: 'c' to continue
-        if self._screens and (key == _('c')):
+        if self._screens and (key == C_('TUI|Spoke Navigation', 'c')):
             self.close_screen()
             return True
 
         # global quit command
         # TRANSLATORS: 'q' to quit
-        elif self._screens and (key == _('q')):
+        elif self._screens and (key == C_('TUI|Spoke Navigation', 'q')):
             if self.quit_question:
                 d = self.quit_question(self, _(self.quit_message))
                 self.switch_screen_modal(d)
@@ -533,14 +532,9 @@ class UIScreen(object):
         :rtype: True|False
         """
 
-        self._window = [self.title, u""]
+        self._window = [_(self.title), u""]
         return True
 
-    @property
-    def window(self):
-        """Return reference to the window instance. In TUI, just return self."""
-        return self
-
     def _print_long_widget(self, widget):
         """Prints a long widget (possibly longer than the screen height) with
            user interaction (when needed).
@@ -556,7 +550,7 @@ class UIScreen(object):
 
         if num_lines < self._screen_height - 2:
             # widget plus prompt are shorter than screen height, just print the widget
-            print u"\n".join(lines)
+            print(u"\n".join(lines))
             return
 
         # long widget, print it in steps and prompt user to continue
@@ -566,12 +560,12 @@ class UIScreen(object):
                 # enough space to print the rest of the widget plus regular
                 # prompt (2 lines)
                 for line in lines[pos:]:
-                    print line
+                    print(line)
                 pos += self._screen_height - 1
             else:
                 # print part with a prompt to continue
                 for line in lines[pos:(pos + self._screen_height - 2)]:
-                    print line
+                    print(line)
                 self._app.raw_input(_("Press ENTER to continue"))
                 pos += self._screen_height - 1
 
@@ -581,13 +575,14 @@ class UIScreen(object):
 
         for w in self._window:
             if hasattr(w, "render"):
-                # pylint: disable-msg=E1101
                 w.render(self.app.width)
             if isinstance(w, Widget):
                 self._print_long_widget(w)
+            elif type(w) == str:
+                print(w.decode("utf-8"))
             else:
                 # not a widget, just print its unicode representation
-                print unicode(w)
+                print(unicode(w))
     show = show_all
 
     def hide(self):
@@ -658,7 +653,7 @@ class Widget(object):
     def width(self):
         """The current width of the internal buffer
            (id of the first empty column)."""
-        return reduce(lambda acc,l: max(acc, len(l)), self._buffer, 0)
+        return functools.reduce(lambda acc, l: max(acc, len(l)), self._buffer, 0)
 
     def clear(self):
         """Clears this widgets buffer and resets cursor."""
@@ -773,11 +768,12 @@ class Widget(object):
         if not text:
             return
 
-        try:
-            text = text.decode("utf-8")
-        except UnicodeDecodeError as e:
-            raise ValueError("Unable to decode string %s" %
-                    str(e.object).decode("utf-8", "replace"))
+        if isinstance(text, str):
+            try:
+                text = text.decode("utf-8")
+            except UnicodeDecodeError as e:
+                raise ValueError("Unable to decode string %s" %
+                                 str(e.object).decode("utf-8", "replace"))
 
         if row is None:
             row = self._cursor[0]
@@ -829,7 +825,7 @@ class Widget(object):
 if __name__ == "__main__":
     class HelloWorld(UIScreen):
         def show(self, args = None):
-            print """Hello World\nquit by typing 'quit'"""
+            print("""Hello World\nquit by typing 'quit'""")
             return True
 
     a = App("Hello World")
diff --git a/anaconda/pyanaconda/ui/tui/simpleline/widgets.py b/anaconda/pyanaconda/ui/tui/simpleline/widgets.py
index 438a35f..b3d8508 100644
--- a/anaconda/pyanaconda/ui/tui/simpleline/widgets.py
+++ b/anaconda/pyanaconda/ui/tui/simpleline/widgets.py
@@ -23,6 +23,7 @@
 
 __all__ = ["TextWidget", "ColumnWidget", "CheckboxWidget", "CenterWidget"]
 
+from pyanaconda.i18n import _
 from pyanaconda.ui.tui.simpleline import base
 
 class TextWidget(base.Widget):
@@ -166,7 +167,7 @@ class CheckboxWidget(base.Widget):
 
         # append lines
         if self.title:
-            data.append(TextWidget(self.title))
+            data.append(TextWidget(_(self.title)))
 
         if self.text:
             data.append(TextWidget("(%s)" % self.text))
@@ -204,10 +205,10 @@ if __name__ == "__main__":
 
     c = ColumnWidget([(15, [t1, t2, t3]), (10, [t4, t5])], spacing = 1)
     c.render(80)
-    print u"\n".join(c.get_lines())
+    print(u"\n".join(c.get_lines()))
 
-    print 80*"-"
+    print(80*"-")
 
     c = ColumnWidget([(20, [t1, t2, t3]), (25, [t4, t5]), (15, [t1, t2, t3])], spacing = 3)
     c.render(80)
-    print u"\n".join(c.get_lines())
+    print(u"\n".join(c.get_lines()))
diff --git a/anaconda/pyanaconda/ui/tui/spokes/__init__.py b/anaconda/pyanaconda/ui/tui/spokes/__init__.py
index 8ffe5d1..4f72600 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/__init__.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/__init__.py
@@ -20,17 +20,19 @@
 #
 from pyanaconda.ui.tui import simpleline as tui
 from pyanaconda.ui.tui.tuiobject import TUIObject, YesNoDialog
-from pyanaconda.ui.common import Spoke, StandaloneSpoke, NormalSpoke, PersonalizationSpoke, collect
+from pyanaconda.ui.common import Spoke, StandaloneSpoke, NormalSpoke
 from pyanaconda.users import validatePassword, cryptPassword
 import re
 from collections import namedtuple
 from pyanaconda.iutil import setdeepattr, getdeepattr
-from pyanaconda.i18n import _
-from pyanaconda.constants import PASSWORD_CONFIRM_ERROR_TUI
+from pyanaconda.i18n import N_, _
+from pyanaconda.constants import PASSWORD_CONFIRM_ERROR_TUI, PW_ASCII_CHARS
 
-__all__ = ["TUISpoke", "EditTUISpoke", "EditTUIDialog", "EditTUISpokeEntry", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke",
-           "collect_spokes", "collect_categories"]
+__all__ = ["TUISpoke", "EditTUISpoke", "EditTUIDialog", "EditTUISpokeEntry",
+           "StandaloneSpoke", "NormalTUISpoke"]
 
+# Inherit abstract methods from Spoke
+# pylint: disable=abstract-method
 class TUISpoke(TUIObject, tui.Widget, Spoke):
     """Base TUI Spoke class implementing the pyanaconda.ui.common.Spoke API.
     It also acts as a Widget so we can easily add it to Hub, where is shows
@@ -43,13 +45,15 @@ class TUISpoke(TUIObject, tui.Widget, Spoke):
     :type category: string
     """
 
-    title = _("Default spoke title")
-    category = u""
+    title = N_("Default spoke title")
 
     def __init__(self, app, data, storage, payload, instclass):
+        if self.__class__ is TUISpoke:
+            raise TypeError("TUISpoke is an abstract class")
+
         TUIObject.__init__(self, app, data)
         tui.Widget.__init__(self)
-        Spoke.__init__(self, data, storage, payload, instclass)
+        Spoke.__init__(self, storage, payload, instclass)
 
     @property
     def status(self):
@@ -73,13 +77,15 @@ class TUISpoke(TUIObject, tui.Widget, Spoke):
 
         if self.mandatory and not self.completed:
             key = "!"
-        else:
+        elif self.completed:
             key = "x"
+        else:
+            key = " "
 
         # always set completed = True here; otherwise key value won't be
         # displayed if completed (spoke value from above) is False
         c = tui.CheckboxWidget(key = key, completed = True,
-                               title = self.title, text = self.status)
+                               title = _(self.title), text = self.status)
         c.render(width)
         self.draw(c)
 
@@ -88,13 +94,18 @@ class NormalTUISpoke(TUISpoke, NormalSpoke):
 
 EditTUISpokeEntry = namedtuple("EditTUISpokeEntry", ["title", "attribute", "aux", "visible"])
 
+# Inherit abstract methods from NormalTUISpoke
+# pylint: disable=abstract-method
 class EditTUIDialog(NormalTUISpoke):
     """Spoke/dialog used to read new value of textual or password data"""
 
-    title = _("New value")
+    title = N_("New value")
     PASSWORD = re.compile(".*")
 
     def __init__(self, app, data, storage, payload, instclass):
+        if self.__class__ is EditTUIDialog:
+            raise TypeError("EditTUIDialog is an abstract class")
+
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
         self.value = None
 
@@ -119,6 +130,11 @@ class EditTUIDialog(NormalTUISpoke):
                 print(_(PASSWORD_CONFIRM_ERROR_TUI))
                 return None
 
+            # If an empty password was provided, unset the value
+            if not pw:
+                self.value = ""
+                return None
+
             valid, strength, message = validatePassword(pw, user=None)
 
             if not valid:
@@ -137,6 +153,10 @@ class EditTUIDialog(NormalTUISpoke):
                 if not question_window.answer:
                     return None
 
+            if any(char not in PW_ASCII_CHARS for char in pw):
+                print(_("You have provided a password containing non-ASCII characters.\n"
+                        "You may not be able to switch between keyboard layouts to login.\n"))
+
             self.value = cryptPassword(pw)
             return None
         else:
@@ -148,6 +168,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)
             return NormalTUISpoke.input(self, entry, key)
 
 class OneShotEditTUIDialog(EditTUIDialog):
@@ -165,6 +187,8 @@ class OneShotEditTUIDialog(EditTUIDialog):
 
         return ret
 
+# Inherit abstract methods from NormalTUISpoke
+# pylint: disable=abstract-method
 class EditTUISpoke(NormalTUISpoke):
     """Spoke with declarative semantics, it contains
        a list of titles, attribute names and regexps
@@ -199,6 +223,9 @@ class EditTUISpoke(NormalTUISpoke):
     ]
 
     def __init__(self, app, data, storage, payload, instclass):
+        if self.__class__ is EditTUISpoke:
+            raise TypeError("EditTUISpoke is an abstract class")
+
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
         self.dialog = OneShotEditTUIDialog(app, data, storage, payload, instclass)
 
@@ -206,6 +233,22 @@ class EditTUISpoke(NormalTUISpoke):
         # to edit
         self.args = None
 
+    @property
+    def visible_fields(self):
+        """Get the list of currently visible entries"""
+
+        # it would be nice to have this a static list, but visibility of the
+        # entries often depends on the current state of the spoke and thus
+        # changes dynamically
+        ret = []
+        for entry in self.edit_fields:
+            if callable(entry.visible) and entry.visible(self, self.args):
+                ret.append(entry)
+            elif not callable(entry.visible) and entry.visible:
+                ret.append(entry)
+
+        return ret
+
     def refresh(self, args = None):
         NormalTUISpoke.refresh(self, args)
 
@@ -241,12 +284,7 @@ class EditTUISpoke(NormalTUISpoke):
 
             return tui.ColumnWidget([(3, [number]), (None, [title, value])], 1)
 
-        for idx,entry in enumerate(self.edit_fields):
-            if callable(entry.visible) and not entry.visible(self, self.args):
-                continue
-            elif not callable(entry.visible) and not entry.visible:
-                continue
-
+        for idx, entry in enumerate(self.visible_fields):
             entry_type = entry.aux
             if entry_type == self.PASSWORD:
                 w = _prep_password(idx+1, entry)
@@ -262,16 +300,16 @@ class EditTUISpoke(NormalTUISpoke):
     def input(self, args, key):
         try:
             idx = int(key) - 1
-            if idx >= 0 and idx < len(self.edit_fields):
+            if idx >= 0 and idx < len(self.visible_fields):
                 if self.edit_fields[idx].aux == self.CHECK:
-                    setdeepattr(self.args, self.edit_fields[idx].attribute,
+                    setdeepattr(self.args, self.visible_fields[idx].attribute,
                                 not getdeepattr(self.args, self.edit_fields[idx][1]))
                     self.app.redraw()
                     self.apply()
                 else:
-                    self.app.switch_screen_modal(self.dialog, self.edit_fields[idx])
+                    self.app.switch_screen_modal(self.dialog, self.visible_fields[idx])
                     if self.dialog.value is not None:
-                        setdeepattr(self.args, self.edit_fields[idx].attribute,
+                        setdeepattr(self.args, self.visible_fields[idx].attribute,
                                     self.dialog.value)
                         self.apply()
                 return True
@@ -282,24 +320,3 @@ class EditTUISpoke(NormalTUISpoke):
 
 class StandaloneTUISpoke(TUISpoke, StandaloneSpoke):
     pass
-
-class PersonalizationTUISpoke(TUISpoke, PersonalizationSpoke):
-    pass
-
-def collect_spokes(mask_paths, category):
-    """Return a list of all spoke subclasses that should appear for a given
-       category.
-    """
-    spokes = []
-    for mask, path in mask_paths:
-        spokes.extend(collect(mask, path, lambda obj: hasattr(obj, "category") and obj.category != None and obj.category == category))
-        
-    return spokes
-        
-def collect_categories(mask_paths):
-    classes = []
-    for mask, path in mask_paths:
-        classes.extend(collect(mask, path, lambda obj: hasattr(obj, "category") and obj.category != None and obj.category != ""))
-        
-    categories = set(c.category for c in classes)
-    return categories
diff --git a/anaconda/pyanaconda/ui/tui/spokes/askvnc.py b/anaconda/pyanaconda/ui/tui/spokes/askvnc.py
index d97763e..5d815e2 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/askvnc.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/askvnc.py
@@ -21,12 +21,13 @@
 
 from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget
+from pyanaconda.ui.tui.tuiobject import YesNoDialog
 from pyanaconda.constants import USEVNC, USETEXT
 from pyanaconda.constants_text import INPUT_PROCESSED
-from pyanaconda.i18n import _
+from pyanaconda.i18n import N_, _
 from pyanaconda.ui.communication import hubQ
 from pyanaconda.ui.tui import exception_msg_handler
-import getpass
+import getpass, subprocess
 import sys
 
 def exception_msg_handler_and_exit(event, data):
@@ -35,8 +36,7 @@ def exception_msg_handler_and_exit(event, data):
     sys.exit(1)
 
 class AskVNCSpoke(NormalTUISpoke):
-    title = _("VNC")
-    category = "vnc"
+    title = N_("VNC")
 
     # This spoke is kinda standalone, not meant to be used with a hub
     # We pass in some fake data just to make our parents happy
@@ -84,32 +84,35 @@ class AskVNCSpoke(NormalTUISpoke):
 
         try:
             keyid = int(key) - 1
-        except ValueError:
-            return key
+            if 0 <= keyid < len(self._choices):
+                choice = self._choices[keyid]
+                if choice == _(USETEXT):
+                    self._usevnc = False
+                else:
+                    self._usevnc = True
+                    newspoke = VNCPassSpoke(self.app, self.data, self.storage,
+                                            self.payload, self.instclass)
+                    self.app.switch_screen_modal(newspoke)
 
-        if 0 <= keyid < len(self._choices):
-            choice = self._choices[keyid]
-        else:
+                self.apply()
+                self.close()
             return INPUT_PROCESSED
+        except ValueError:
+            pass
 
-        if choice == _(USETEXT):
-            self._usevnc = False
+        if key.lower() == _('q'):
+            d = YesNoDialog(self.app, _(self.app.quit_message))
+            self.app.switch_screen_modal(d)
+            if d.answer:
+                subprocess.Popen(["systemctl", "--no-wall", "reboot"])
         else:
-            self._usevnc = True
-            newspoke = VNCPassSpoke(self.app, self.data, self.storage,
-                                    self.payload, self.instclass)
-            self.app.switch_screen_modal(newspoke)
-
-        self.apply()
-        self.close()
-        return INPUT_PROCESSED
+            return key
 
     def apply(self):
         self.data.vnc.enabled = self._usevnc
 
 class VNCPassSpoke(NormalTUISpoke):
-    title = _("VNC Password")
-    category = "vnc"
+    title = N_("VNC Password")
 
     def __init__(self, app, data, storage, payload, instclass, message=None):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
@@ -117,8 +120,8 @@ class VNCPassSpoke(NormalTUISpoke):
         if message:
             self._message = message
         else:
-            self._message = _("Please provide VNC password. You will have to type it twice. \n"
-                              "Leave blank for no password")
+            self._message = _("Please provide VNC password (must be six to eight characters long).\n"
+                              "You will have to type it twice. Leave blank for no password")
 
     @property
     def indirect(self):
@@ -140,11 +143,15 @@ class VNCPassSpoke(NormalTUISpoke):
         p2 = getpass.getpass(_("Password (confirm): "))
 
         if p1 != p2:
-            print _("Passwords do not match!")
+            print(_("Passwords do not match!"))
             return None
         elif 0 < len(p1) < 6:
-            print _("The password must be at least "
-                    "six characters long.")
+            print(_("The password must be at least "
+                    "six characters long."))
+            return None
+        elif len(p1) > 8:
+            print(_("The password cannot be more than "
+                    "eight characters long."))
             return None
         else:
             self._password = p1
diff --git a/anaconda/pyanaconda/ui/tui/spokes/langsupport.py b/anaconda/pyanaconda/ui/tui/spokes/langsupport.py
new file mode 100644
index 0000000..98b5250
--- /dev/null
+++ b/anaconda/pyanaconda/ui/tui/spokes/langsupport.py
@@ -0,0 +1,129 @@
+# Language text spoke
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Samantha N. Bueno <sbueno@redhat.com>
+#
+
+from pyanaconda.ui.categories.localization import LocalizationCategory
+from pyanaconda.ui.tui.spokes import NormalTUISpoke
+from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget
+from pyanaconda.ui.common import FirstbootSpokeMixIn
+from pyanaconda import localization
+from pyanaconda.i18n import N_, _
+
+from pyanaconda import flags
+
+class LangSpoke(FirstbootSpokeMixIn, NormalTUISpoke):
+    """
+    This spoke allows a user to select their installed language. Note that this
+    does not affect the display of the installer, it only will affect the system
+    post-install, because it's too much of a pain to make other languages work
+    in text-mode.
+
+    Also this doesn't allow for selection of multiple languages like in the GUI.
+    """
+    title = N_("Language settings")
+    category = LocalizationCategory
+
+    def __init__(self, app, data, storage, payload, instclass):
+        NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
+
+        self._langs = [localization.get_english_name(lang)
+                        for lang in localization.get_available_translations()]
+        self._langs_and_locales = dict((localization.get_english_name(lang), lang)
+                                for lang in localization.get_available_translations())
+        self._locales = dict((lang, localization.get_language_locales(lang))
+                                for lang in self._langs_and_locales.values())
+        self._selected = self.data.lang.lang
+
+    @property
+    def completed(self):
+        if flags.flags.automatedInstall:
+            return self.data.lang.lang and self.data.lang.lang != ""
+        else:
+            return False
+
+    @property
+    def mandatory(self):
+        return False
+
+    @property
+    def status(self):
+        if self.data.lang.lang:
+            return localization.get_english_name(self._selected)
+        else:
+            return _("Language is not set.")
+
+    def refresh(self, args=None):
+        """
+        args is None if we want a list of languages; or, it is a list of all
+        locales for a language.
+        """
+        NormalTUISpoke.refresh(self, args)
+
+        if args:
+            self._window += [TextWidget(_("Available locales"))]
+            displayed = [TextWidget(localization.get_english_name(z)) for z in args]
+        else:
+            self._window += [TextWidget(_("Available languages"))]
+            displayed = [TextWidget(z) for z in self._langs]
+
+        def _prep(i, w):
+            """ make everything look nice """
+            number = TextWidget("%2d)" % (i + 1))
+            return ColumnWidget([(4, [number]), (None, [w])], 1)
+
+        # split zones to three columns
+        middle = len(displayed) / 3
+        left = [_prep(i, w) for i, w in enumerate(displayed) if i <= middle]
+        center = [_prep(i, w) for i, w in enumerate(displayed) if i > middle and i <= 2*middle]
+        right = [_prep(i, w) for i, w in enumerate(displayed) if i > 2*middle]
+
+        c = ColumnWidget([(24, left), (24, center), (24, right)], 3)
+        self._window.append(c)
+
+        return True
+
+    def input(self, args, key):
+        """ Handle user input. """
+        try:
+            keyid = int(key) - 1
+            if args:
+                self._selected = args[keyid]
+                self.apply()
+                self.close()
+            else:
+                self.app.switch_screen(self, self._locales[self._langs_and_locales[self._langs[keyid]]])
+            return True
+        except (ValueError, IndexError):
+            pass
+
+        # TRANSLATORS: 'b' to go back
+        if key.lower() == _("b"):
+            self.app.switch_screen(self, None)
+            return True
+        else:
+            return key
+
+    def prompt(self, args=None):
+        """ Override default prompt with a custom prompt. """
+        return _("Please select language support to install.\n[b to language list, c to continue, q to quit]: ")
+
+    def apply(self):
+        """ Store the selected langsupport locales """
+        self.data.lang.lang = self._selected
diff --git a/anaconda/pyanaconda/ui/tui/spokes/password.py b/anaconda/pyanaconda/ui/tui/spokes/password.py
index 97fa5ed..4fe971a 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/password.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/password.py
@@ -1,6 +1,6 @@
 # Root password text spoke
 #
-# Copyright (C) 2012  Red Hat, Inc.
+# Copyright (C) 2012-2014  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -18,16 +18,19 @@
 #
 # Red Hat Author(s): Martin Sivak <msivak@redhat.com>
 #                    Jesse Keating <jkeating@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
 #
 
+from pyanaconda.ui.categories.user_settings import UserSettingsCategory
 from pyanaconda.ui.tui.spokes import EditTUIDialog, EditTUISpokeEntry
 from pyanaconda.ui.common import FirstbootSpokeMixIn
 from pyanaconda.ui.tui.simpleline import TextWidget
-from pyanaconda.i18n import _
+from pyanaconda.flags import flags
+from pyanaconda.i18n import N_, _
 
 class PasswordSpoke(FirstbootSpokeMixIn, EditTUIDialog):
-    title = _("Root password")
-    category = "user"
+    title = N_("Root password")
+    category = UserSettingsCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         EditTUIDialog.__init__(self, app, data, storage, payload, instclass)
@@ -37,6 +40,10 @@ class PasswordSpoke(FirstbootSpokeMixIn, EditTUIDialog):
     def completed(self):
         return bool(self.data.rootpw.password or self.data.rootpw.lock)
 
+    @property
+    def showable(self):
+        return not (self.completed and flags.automatedInstall)
+
     @property
     def mandatory(self):
         return not any(user for user in self.data.user.userList
diff --git a/anaconda/pyanaconda/ui/tui/spokes/progress.py b/anaconda/pyanaconda/ui/tui/spokes/progress.py
index 2638d8f..28376d3 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/progress.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/progress.py
@@ -22,7 +22,7 @@
 import sys
 
 from pyanaconda.flags import flags
-from pyanaconda.i18n import _
+from pyanaconda.i18n import N_, _
 from pyanaconda.constants import THREAD_INSTALL, THREAD_CONFIGURATION
 from pykickstart.constants import KS_SHUTDOWN, KS_REBOOT
 
@@ -33,7 +33,7 @@ from pyanaconda.ui.tui.simpleline.base import ExitAllMainLoops
 __all__ = ["ProgressSpoke"]
 
 class ProgressSpoke(StandaloneTUISpoke):
-    title = _("Progress")
+    title = N_("Progress")
 
     postForHub = SummaryHub
     priority = 0
@@ -108,7 +108,7 @@ class ProgressSpoke(StandaloneTUISpoke):
         from pyanaconda.threads import threadMgr, AnacondaThread
 
         # We print this here because we don't really use the window object
-        print(self.title)
+        print(_(self.title))
 
         threadMgr.add(AnacondaThread(name=THREAD_INSTALL, target=doInstall,
                                      args=(self.storage, self.payload, self.data,
@@ -138,3 +138,7 @@ class ProgressSpoke(StandaloneTUISpoke):
     def input(self, args, key):
         # There is nothing to do here, just raise to exit the spoke
         raise ExitAllMainLoops()
+
+    # Override Spoke.apply
+    def apply(self):
+        pass
diff --git a/anaconda/pyanaconda/ui/tui/spokes/shell_spoke.py b/anaconda/pyanaconda/ui/tui/spokes/shell_spoke.py
index 0f34f17..e0115ca 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/shell_spoke.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/shell_spoke.py
@@ -20,22 +20,24 @@
 
 """Text mode shell spoke"""
 
+from pyanaconda.ui.categories.system import SystemCategory
 from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline.widgets import TextWidget
-from pyanaconda.i18n import _
+from pyanaconda.i18n import N_, _
 from pyanaconda.constants import ANACONDA_ENVIRON
+from pyanaconda.flags import flags
 from blivet import arch
 
 import subprocess
 
 class ShellSpoke(NormalTUISpoke):
-    title = _("Shell")
-    category = "system"
+    title = N_("Shell")
+    category = SystemCategory
 
     @classmethod
     def should_run(cls, environment, data):
         # run only in the installer on s390(x) machines
-        return environment == ANACONDA_ENVIRON and arch.isS390()
+        return flags.debug or (environment == ANACONDA_ENVIRON and arch.isS390())
 
     @property
     def completed(self):
diff --git a/anaconda/pyanaconda/ui/tui/spokes/software.py b/anaconda/pyanaconda/ui/tui/spokes/software.py
index 85b65fa..ce069c9 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/software.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/software.py
@@ -20,14 +20,15 @@
 #
 
 from pyanaconda.flags import flags
+from pyanaconda.ui.categories.software import SoftwareCategory
 from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget, CheckboxWidget
 from pyanaconda.threads import threadMgr, AnacondaThread
-from pyanaconda.packaging import MetadataError, DependencyError
-from pyanaconda.i18n import _
+from pyanaconda.packaging import DependencyError, PackagePayload
+from pyanaconda.i18n import N_, _
 
-from pyanaconda.constants import THREAD_PAYLOAD, THREAD_PAYLOAD_MD
-from pyanaconda.constants import THREAD_CHECK_SOFTWARE, THREAD_SOFTWARE_WATCHER
+from pyanaconda.constants import THREAD_PAYLOAD
+from pyanaconda.constants import THREAD_CHECK_SOFTWARE
 from pyanaconda.constants_text import INPUT_PROCESSED
 
 __all__ = ["SoftwareSpoke"]
@@ -35,12 +36,11 @@ __all__ = ["SoftwareSpoke"]
 
 class SoftwareSpoke(NormalTUISpoke):
     """ Spoke used to read new value of text to represent source repo. """
-    title = _("Software selection")
-    category = "software"
+    title = N_("Software selection")
+    category = SoftwareCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
-        self._ready = False
         self.errors = []
         self._tx_id = None
         # default to first selection (Gnome) in list of environments
@@ -53,25 +53,10 @@ class SoftwareSpoke(NormalTUISpoke):
         # are we taking values (package list) from a kickstart file?
         self._kickstarted = flags.automatedInstall and self.data.packages.seen
 
-    def initialize(self):
-        NormalTUISpoke.initialize(self)
-        threadMgr.add(AnacondaThread(name=THREAD_SOFTWARE_WATCHER, target=self._initialize))
+    @property
+    def showable(self):
+        return isinstance(self.payload, PackagePayload)
 
-    def _initialize(self):
-        """ Private initialize. """
-        threadMgr.wait(THREAD_PAYLOAD)
-
-        if self._kickstarted:
-            threadMgr.wait(THREAD_PAYLOAD_MD)
-        else:
-            try:
-                self.payload.environments
-            except MetadataError:
-                self.errors.append(_("No installation source available"))
-                return
-        self.payload.release()
-
-        self._ready = True
 
     @property
     def status(self):
@@ -90,7 +75,7 @@ class SoftwareSpoke(NormalTUISpoke):
         # default, and it really should be so we can maintain consistency
         # with graphical behavior
         if self._selection >= 0 and not self.environment \
-                and not self._kickstarted:
+                and not flags.automatedInstall:
             self.apply()
 
         if not self.environment:
@@ -105,14 +90,18 @@ class SoftwareSpoke(NormalTUISpoke):
 
     @property
     def completed(self):
-        """ Make sure our threads are done running and vars are set. """
-        processingDone = not threadMgr.get(THREAD_CHECK_SOFTWARE) and \
-                         not self.errors and self.txid_valid
+        """ Make sure our threads are done running and vars are set.
+
+           WARNING: This can be called before the spoke is finished initializing
+           if the spoke starts a thread. It should make sure it doesn't access
+           things until they are completely setup.
+        """
+        processingDone = self.ready and not self.errors and self.txid_valid
 
         if flags.automatedInstall:
             return processingDone and self.payload.baseRepo and self.data.packages.seen
         else:
-            return self.payload.baseRepo and self.environment is not None and processingDone
+            return processingDone and self.payload.baseRepo and self.environment is not None
 
     def refresh(self, args=None):
         """ Refresh screen. """
@@ -175,8 +164,7 @@ class SoftwareSpoke(NormalTUISpoke):
     @property
     def ready(self):
         """ If we're ready to move on. """
-        return (not threadMgr.get(THREAD_SOFTWARE_WATCHER) and
-                not threadMgr.get(THREAD_PAYLOAD_MD) and
+        return (not threadMgr.get(THREAD_PAYLOAD) and
                 not threadMgr.get(THREAD_CHECK_SOFTWARE))
 
     def apply(self):
diff --git a/anaconda/pyanaconda/ui/tui/spokes/source.py b/anaconda/pyanaconda/ui/tui/spokes/source.py
index 42bf728..7f0c79f 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/source.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/source.py
@@ -20,25 +20,28 @@
 #
 
 from pyanaconda.flags import flags
+from pyanaconda.ui.categories.software import SoftwareCategory
 from pyanaconda.ui.tui.spokes import EditTUISpoke, NormalTUISpoke
 from pyanaconda.ui.tui.spokes import EditTUISpokeEntry as Entry
 from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget
 from pyanaconda.threads import threadMgr, AnacondaThread
-from pyanaconda.packaging import PayloadError, MetadataError
-from pyanaconda.i18n import _
+from pyanaconda.packaging import PackagePayload, payloadMgr
+from pyanaconda.i18n import N_, _
 from pyanaconda.image import opticalInstallMedia, potentialHdisoSources
+from pyanaconda.iutil import DataHolder
 
-from pyanaconda.constants import THREAD_SOURCE_WATCHER, THREAD_SOFTWARE_WATCHER, THREAD_PAYLOAD
-from pyanaconda.constants import THREAD_PAYLOAD_MD, THREAD_STORAGE, THREAD_STORAGE_WATCHER
+from pyanaconda.constants import THREAD_SOURCE_WATCHER, THREAD_PAYLOAD
+from pyanaconda.constants import THREAD_STORAGE_WATCHER
 from pyanaconda.constants import THREAD_CHECK_SOFTWARE, ISO_DIR, DRACUT_ISODIR
 from pyanaconda.constants_text import INPUT_PROCESSED
 
+from pyanaconda.ui.helpers import SourceSwitchHandler
+
 from blivet.util import get_mount_paths
 
 import re
 import os
 import fnmatch
-import copy
 
 import logging
 LOG = logging.getLogger("anaconda")
@@ -46,103 +49,19 @@ LOG = logging.getLogger("anaconda")
 
 __all__ = ["SourceSpoke"]
 
-class SourceSwitchHandler(object):
-    """ A class that can be used as a mixin handling
-    installation source switching.
-    It will correctly switch to the new method
-    and cleanup any previous method set.
-    """
-    def __init__(self, data, storage):
-        self._device = None
-        self._current_iso_path = None
-        self._data = data
-        self._storage = storage
-
-    def _clean_hdd_iso(self):
-        """ Clean HDD ISO usage
-        This means unmounting the partition and unprotecting it,
-        so it can be used for the installation.
-        """
-        if self._data.method.method == "harddrive" and self._data.method.partition:
-            part = self._data.method.partition
-            dev = self._storage.devicetree.getDeviceByName(part)
-            if dev:
-                dev.protected = False
-            self._storage.config.protectedDevSpecs.remove(part)
-
-    def set_source_hdd_iso(self, device, iso_path):
-        """ Switch to the HDD ISO install source
-        :param partition: name of the partition hosting the ISO
-        :type partition: string
-        :param iso_path: full path to the source ISO file
-        :type iso_path: string
-        """
-        partition = device.name
-        # the GUI source spoke also does the copy
-        old_source = copy.copy(self._data.method)
-
-        # if a different partition was used previously, unprotect it
-        if old_source.method == "harddrive" and old_source.partition != partition:
-            self._clean_hdd_iso()
-
-        # protect current device
-        if device:
-            device.protected = True
-            self._storage.config.protectedDevSpecs.append(device.name)
-
-        self._data.method.method = "harddrive"
-        self._data.method.partition = partition
-        # the / gets stripped off by payload.ISOImage
-        self._data.method.dir = "/" + iso_path
-
-        # as we already made the device protected when
-        # switching to it, we don't need to protect it here
-
-    def set_source_url(self, url=None):
-        """ Switch to install source specified by URL """
-        # clean any old HDD ISO sources
-        self._clean_hdd_iso()
-
-        self._data.method.method = "url"
-        if url is not None:
-            self._data.method.url = url
-
-    def set_source_nfs(self, opts=None):
-        """ Switch to NFS install source """
-        # clean any old HDD ISO sources
-        self._clean_hdd_iso()
-
-        self._data.method.method = "nfs"
-        if opts is not None:
-            self._data.method.opts = opts
-
-    def set_source_cdrom(self):
-        """ Switch to cdrom install source """
-        # clean any old HDD ISO sources
-        self._clean_hdd_iso()
-
-        self._data.method.method = "cdrom"
-
-    def set_source_closest_mirror(self):
-        """ Switch to the closest mirror install source """
-        # clean any old HDD ISO sources
-        self._clean_hdd_iso()
-
-        self._data.method.method = None
-
 class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
     """ Spoke used to customize the install source repo. """
-    title = _("Installation source")
-    category = "software"
+    title = N_("Installation source")
+    category = SoftwareCategory
 
-    _protocols = (_("Closest mirror"), "http://", "https://", "ftp://", "nfs")
+    _protocols = (N_("Closest mirror"), "http://", "https://", "ftp://", "nfs")
 
     # default to 'closest mirror', as done in the GUI
     _selection = 1
 
     def __init__(self, app, data, storage, payload, instclass):
         EditTUISpoke.__init__(self, app, data, storage, payload, instclass)
-        SourceSwitchHandler.__init__(self, data, storage)
+        SourceSwitchHandler.__init__(self)
         self._ready = False
         self.errors = []
         self._cdrom = None
@@ -152,10 +71,10 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
 
         threadMgr.add(AnacondaThread(name=THREAD_SOURCE_WATCHER,
                                      target=self._initialize))
+        payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error)
 
     def _initialize(self):
         """ Private initialize. """
-        threadMgr.wait(THREAD_STORAGE)
         threadMgr.wait(THREAD_PAYLOAD)
         # If we've previously set up to use a CD/DVD method, the media has
         # already been mounted by payload.setup.  We can't try to mount it
@@ -168,6 +87,9 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
 
         self._ready = True
 
+    def _payload_error(self):
+        self.errors.append(payloadMgr.error)
+
     def _repo_status(self):
         """ Return a string describing repo url or lack of one. """
         if self.data.method.method == "url":
@@ -185,6 +107,10 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
         else:
             return _("Nothing selected")
 
+    @property
+    def showable(self):
+        return isinstance(self.payload, PackagePayload)
+
     @property
     def status(self):
         if self.errors:
@@ -205,7 +131,7 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
 
     @property
     def completed(self):
-        if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo):
+        if flags.automatedInstall and self.ready and not self.payload.baseRepo:
             return False
         else:
             return not self.errors and self.ready and (self.data.method.method or self.payload.baseRepo)
@@ -214,11 +140,10 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
         EditTUISpoke.refresh(self, args)
 
         threadMgr.wait(THREAD_PAYLOAD)
-        threadMgr.wait(THREAD_PAYLOAD_MD)
 
         _methods = [_("CD/DVD"), _("local ISO file"), _("Network")]
         if args == 3:
-            text = [TextWidget(p) for p in self._protocols]
+            text = [TextWidget(_(p)) for p in self._protocols]
         else:
             self._window += [TextWidget(_("Choose an installation source type."))]
             text = [TextWidget(m) for m in _methods]
@@ -294,34 +219,11 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
                 self.app.switch_screen(self, num)
         return INPUT_PROCESSED
 
-    def getRepoMetadata(self):
-        """ Pull down yum repo metadata """
-        try:
-            self.payload.updateBaseRepo(fallback=False, checkmount=False)
-        except (OSError, PayloadError) as err:
-            LOG.error("Error: %s", err)
-            self.errors.append(_("Failed to set up installation source"))
-        else:
-            self.payload.gatherRepoMetadata()
-            self.payload.release()
-            if not self.payload.baseRepo:
-                self.errors.append(_("Error downloading package metadata"))
-            else:
-                try:
-                    # pylint: disable-msg=W0104
-                    self.payload.environments
-                    # pylint: disable-msg=W0104
-                    self.payload.groups
-                    self.errors = []
-                except MetadataError:
-                    self.errors.append(_("No installation source available"))
-
     @property
     def ready(self):
         """ Check if the spoke is ready. """
         return (self._ready and
-                not threadMgr.get(THREAD_PAYLOAD_MD) and
-                not threadMgr.get(THREAD_SOFTWARE_WATCHER) and
+                not threadMgr.get(THREAD_PAYLOAD) and
                 not threadMgr.get(THREAD_CHECK_SOFTWARE))
 
     def apply(self):
@@ -331,21 +233,21 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
         if flags.askmethod:
             flags.askmethod = False
 
-        threadMgr.add(AnacondaThread(name=THREAD_PAYLOAD_MD,
-                                     target=self.getRepoMetadata))
+        payloadMgr.restartThread(self.storage, self.data, self.payload, self.instclass,
+                checkmount=False)
 
 class SpecifyRepoSpoke(EditTUISpoke, SourceSwitchHandler):
     """ Specify the repo URL here if closest mirror not selected. """
-    title = _("Specify Repo Options")
-    category = "software"
+    title = N_("Specify Repo Options")
+    category = SoftwareCategory
 
     edit_fields = [
-        Entry(_("Repo URL"), "url", re.compile(".*$"), True)
+        Entry(N_("Repo URL"), "url", re.compile(".*$"), True)
         ]
 
     def __init__(self, app, data, storage, payload, instclass, selection):
         EditTUISpoke.__init__(self, app, data, storage, payload, instclass)
-        SourceSwitchHandler.__init__(self, data, storage)
+        SourceSwitchHandler.__init__(self)
         self.selection = selection
         self.args = self.data.method
 
@@ -374,21 +276,25 @@ class SpecifyRepoSpoke(EditTUISpoke, SourceSwitchHandler):
 
 class SpecifyNFSRepoSpoke(EditTUISpoke, SourceSwitchHandler):
     """ Specify server and mount opts here if NFS selected. """
-    title = _("Specify Repo Options")
-    category = "software"
+    title = N_("Specify Repo Options")
+    category = SoftwareCategory
 
     edit_fields = [
-        Entry(_("NFS <server>:/<path>"), "server", re.compile(".*$"), True),
-        Entry(_("NFS mount options"), "opts", re.compile(".*$"), True)
+        Entry(N_("<server>:/<path>"), "server", re.compile(".*$"), True),
+        Entry(N_("NFS mount options"), "opts", re.compile(".*$"), True)
     ]
 
     def __init__(self, app, data, storage, payload, instclass, selection, errors):
         EditTUISpoke.__init__(self, app, data, storage, payload, instclass)
-        SourceSwitchHandler.__init__(self, data, storage)
+        SourceSwitchHandler.__init__(self)
         self.selection = selection
-        self.args = self.data.method
         self.errors = errors
 
+        nfs = self.data.method
+        self.args = DataHolder(server="", opts=nfs.opts or "")
+        if nfs.method == "nfs" and nfs.server and nfs.dir:
+            self.args.server = "%s:%s" % (nfs.server, nfs.dir)
+
     def refresh(self, args=None):
         """ Refresh window. """
         return EditTUISpoke.refresh(self, args)
@@ -417,8 +323,8 @@ class SpecifyNFSRepoSpoke(EditTUISpoke, SourceSwitchHandler):
 
 class SelectDeviceSpoke(NormalTUISpoke):
     """ Select device containing the install source ISO file. """
-    title = _("Select device containing the ISO file")
-    category = "source"
+    title = N_("Select device containing the ISO file")
+    category = SoftwareCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
@@ -498,14 +404,18 @@ class SelectDeviceSpoke(NormalTUISpoke):
             # we don't have the disk for the given number
             return key
 
+    # Override Spoke.apply
+    def apply(self):
+        pass
+
 class SelectISOSpoke(NormalTUISpoke, SourceSwitchHandler):
     """ Select an ISO to use as install source. """
-    title = _("Select an ISO to use as install source")
-    category = "source"
+    title = N_("Select an ISO to use as install source")
+    category = SoftwareCategory
 
     def __init__(self, app, data, storage, payload, instclass, device):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
-        SourceSwitchHandler.__init__(self, data, storage)
+        SourceSwitchHandler.__init__(self)
         self.selection = None
         self.args = self.data.method
         self._device = device
diff --git a/anaconda/pyanaconda/ui/tui/spokes/storage.py b/anaconda/pyanaconda/ui/tui/spokes/storage.py
index a1131f3..2df64ed 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/storage.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/storage.py
@@ -1,6 +1,6 @@
 # Text storage configuration spoke classes
 #
-# Copyright (C) 2012  Red Hat, Inc.
+# Copyright (C) 2012-2014  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -22,22 +22,27 @@
 # which has the same license and authored by David Lehman <dlehman@redhat.com>
 #
 
-from pyanaconda.ui.lib.disks import getDisks, size_str
+from pyanaconda.ui.lib.disks import getDisks, applyDiskSelection
+from pyanaconda.ui.categories.system import SystemCategory
 from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget, CheckboxWidget
+from pyanaconda.ui.tui.tuiobject import YesNoDialog
+from pyanaconda.storage_utils import AUTOPART_CHOICES, sanity_check, SanityError, SanityWarning
 
-from pykickstart.constants import AUTOPART_TYPE_LVM, AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_PLAIN
+from blivet import arch
 from blivet.size import Size
-from blivet.errors import StorageError
+from blivet.errors import StorageError, DasdFormatError
+from blivet.devices import DASDDevice, FcoeDiskDevice, iScsiDiskDevice, MultipathDevice, ZFCPDiskDevice
+from blivet.devicelibs.dasd import format_dasd, make_unformatted_dasd_list
 from pyanaconda.flags import flags
-from pyanaconda.kickstart import doKickstartStorage
+from pyanaconda.kickstart import doKickstartStorage, resetCustomStorageData
 from pyanaconda.threads import threadMgr, AnacondaThread
-from pyanaconda.constants import THREAD_STORAGE, THREAD_STORAGE_WATCHER
+from pyanaconda.constants import THREAD_STORAGE, THREAD_STORAGE_WATCHER, THREAD_DASDFMT, DEFAULT_AUTOPART_TYPE
 from pyanaconda.constants_text import INPUT_PROCESSED
-from pyanaconda.i18n import _, P_
+from pyanaconda.i18n import _, P_, N_
 from pyanaconda.bootloader import BootLoaderError
 
-from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE
+from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM
 from pykickstart.errors import KickstartValueError
 
 from collections import OrderedDict
@@ -47,9 +52,9 @@ log = logging.getLogger("anaconda")
 
 __all__ = ["StorageSpoke", "AutoPartSpoke"]
 
-CLEARALL = _("Use All Space")
-CLEARLINUX = _("Replace Existing Linux system(s)")
-CLEARNONE = _("Use Free Space")
+CLEARALL = N_("Use All Space")
+CLEARLINUX = N_("Replace Existing Linux system(s)")
+CLEARNONE = N_("Use Free Space")
 
 PARTTYPES = {CLEARALL: CLEARPART_TYPE_ALL, CLEARLINUX: CLEARPART_TYPE_LINUX,
              CLEARNONE: CLEARPART_TYPE_NONE}
@@ -59,14 +64,15 @@ class StorageSpoke(NormalTUISpoke):
     Storage spoke where users proceed to customize storage features such
     as disk selection, partitioning, and fs type.
     """
-    title = _("Installation Destination")
-    category = "system"
+    title = N_("Installation Destination")
+    category = SystemCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
 
         self._ready = False
         self.selected_disks = self.data.ignoredisk.onlyuse[:]
+        self.selection = None
 
         self.autopart = None
         self.clearPartType = None
@@ -78,6 +84,13 @@ class StorageSpoke(NormalTUISpoke):
         self.errors = []
         self.warnings = []
 
+        if self.data.zerombr.zerombr and arch.isS390():
+            # if zerombr is specified in a ks file and there are unformatted
+            # dasds, automatically format them
+            to_format = make_unformatted_dasd_list(self.selected_disks)
+            if to_format:
+                self.run_dasdfmt(to_format)
+
         if not flags.automatedInstall:
             # default to using autopart for interactive installs
             self.data.autopart.autopart = True
@@ -92,7 +105,7 @@ class StorageSpoke(NormalTUISpoke):
     def ready(self):
         # By default, the storage spoke is not ready.  We have to wait until
         # storageInitialize is done.
-        return self._ready and not threadMgr.get(THREAD_STORAGE_WATCHER)
+        return self._ready and not (threadMgr.get(THREAD_STORAGE_WATCHER) or threadMgr.get(THREAD_DASDFMT))
 
     @property
     def mandatory(self):
@@ -142,7 +155,7 @@ class StorageSpoke(NormalTUISpoke):
         """ Update the summary based on the UI. """
         count = 0
         capacity = 0
-        free = Size(bytes=0)
+        free = Size(0)
 
         # pass in our disk list so hidden disks' free space is available
         free_space = self.storage.getFreeSpace(disks=self.disks)
@@ -155,7 +168,7 @@ class StorageSpoke(NormalTUISpoke):
 
         summary = (P_(("%d disk selected; %s capacity; %s free ..."),
                       ("%d disks selected; %s capacity; %s free ..."),
-                      count) % (count, str(Size(en_spec="%f MB" % capacity)), free))
+                      count) % (count, str(Size(capacity)), free))
 
         if len(self.disks) == 0:
             summary = _("No disks detected.  Please shut down the computer, connect at least one disk, and restart to complete installation.")
@@ -188,26 +201,84 @@ class StorageSpoke(NormalTUISpoke):
 
         # loop through the disks and present them.
         for disk in self.disks:
-            size = size_str(disk.size)
-            c = CheckboxWidget(title="%i) %s: %s (%s)" % (self.disks.index(disk) + 1,
-                                                 disk.model, size, disk.name),
+            disk_info = self._format_disk_info(disk)
+            c = CheckboxWidget(title="%i) %s" % (self.disks.index(disk) + 1, disk_info),
                                completed=(disk.name in self.selected_disks))
             self._window += [c, ""]
 
+        # if we have more than one disk, present an option to just
+        # select all disks
+        if len(self.disks) > 1:
+            c = CheckboxWidget(title="%i) %s" % (len(self.disks) + 1, _("Select all")),
+                                completed=(self.selection == len(self.disks)))
+
+            self._window += [c, ""]
+
         self._window += [TextWidget(message), ""]
 
         return True
 
+    def _select_all_disks(self):
+        """ Mark all disks as selected for use in partitioning. """
+        for disk in self.disks:
+            if disk.name not in self.selected_disks:
+                self._update_disk_list(disk)
+
+    def _format_disk_info(self, disk):
+        """ Some specialized disks are difficult to identify in the storage
+            spoke, so add and return extra identifying information about them.
+
+            Since this is going to be ugly to do within the confines of the
+            CheckboxWidget, pre-format the display string right here.
+        """
+        # show this info for all disks
+        format_str = "%s: %s (%s)" % (disk.model, disk.size, disk.name)
+
+        disk_attrs = []
+        # now check for/add info about special disks
+        if (isinstance(disk, MultipathDevice) or isinstance(disk, iScsiDiskDevice) or isinstance(disk, FcoeDiskDevice)):
+            if hasattr(disk, "wwid"):
+                disk_attrs.append(disk.wwid)
+        elif isinstance(disk, DASDDevice):
+            if hasattr(disk, "busid"):
+                disk_attrs.append(disk.busid)
+        elif isinstance (disk, ZFCPDiskDevice):
+            if hasattr(disk, "fcp_lun"):
+                disk_attrs.append(disk.fcp_lun)
+            if hasattr(disk, "wwpn"):
+                disk_attrs.append(disk.wwpn)
+            if hasattr(disk, "hba_id"):
+                disk_attrs.append(disk.hba_id)
+
+        # now append all additional attributes to our string
+        for attr in disk_attrs:
+            format_str += ", %s" % attr
+
+        return format_str
+
     def input(self, args, key):
         """Grab the disk choice and update things"""
 
         try:
             keyid = int(key) - 1
-            self._update_disk_list(self.disks[keyid])
+            self.selection = keyid
+            if len(self.disks) > 1 and keyid == len(self.disks):
+                self._select_all_disks()
+            else:
+                self._update_disk_list(self.disks[keyid])
             return INPUT_PROCESSED
         except (ValueError, IndexError):
             if key.lower() == "c":
                 if self.selected_disks:
+                    # check selected disks to see if we have any unformatted DASDs
+                    # if we're on s390x, since they need to be formatted before we
+                    # can use them.
+                    if arch.isS390():
+                        to_format = make_unformatted_dasd_list(self.selected_disks)
+                        if to_format:
+                            self.run_dasdfmt(to_format)
+                            return None
+
                     newspoke = AutoPartSpoke(self.app, self.data, self.storage,
                                              self.payload, self.instclass)
                     self.app.switch_screen_modal(newspoke)
@@ -218,6 +289,43 @@ class StorageSpoke(NormalTUISpoke):
             else:
                 return key
 
+    def run_dasdfmt(self, to_format):
+        """
+        This generates the list of DASDs requiring dasdfmt and runs dasdfmt
+        against them.
+        """
+        # if the storage thread is running, wait on it to complete before taking
+        # any further actions on devices; most likely to occur if user has
+        # zerombr in their ks file
+        threadMgr.wait(THREAD_STORAGE)
+
+        # 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")
+
+            warntext = _("Warning: All storage changes made using the installer will be lost when you choose to format.\n\nProceed to run dasdfmt?\n")
+
+            displaytext = summary + "\n".join("/dev/" + d for d in to_format) + "\n" + warntext
+
+            # now show actual prompt; note -- in cmdline mode, auto-answer for
+            # this is 'no', so unformatted DASDs will remain so unless zerombr
+            # is added to the ks file
+            question_window = YesNoDialog(self._app, displaytext)
+            self._app.switch_screen_modal(question_window)
+            if not question_window.answer:
+                # no? well fine then, back to the storage spoke with you;
+                return None
+
+        for disk in to_format:
+            try:
+                print(_("Formatting /dev/%s. This may take a moment.") % disk)
+                format_dasd(disk)
+            except DasdFormatError as err:
+                # Log errors if formatting fails, but don't halt the installer
+                log.error(str(err))
+                continue
+
     def apply(self):
         self.autopart = self.data.autopart.autopart
         self.data.ignoredisk.onlyuse = self.selected_disks[:]
@@ -260,31 +368,36 @@ class StorageSpoke(NormalTUISpoke):
             doKickstartStorage(self.storage, self.data, self.instclass)
         except (StorageError, KickstartValueError) as e:
             log.error("storage configuration failed: %s", e)
-            print _("storage configuration failed: %s") % e
+            print(_("storage configuration failed: %s") % e)
             self.errors = [str(e)]
             self.data.bootloader.bootDrive = ""
             self.data.clearpart.type = CLEARPART_TYPE_ALL
             self.data.clearpart.initAll = False
             self.storage.config.update(self.data)
-            self.storage.autoPartType = self.data.clearpart.type
+            self.storage.autoPartType = self.data.autopart.type
             self.storage.reset()
-            self._ready = True
+            # now set ksdata back to the user's specified config
+            applyDiskSelection(self.storage, self.data, self.selected_disks)
         except BootLoaderError as e:
             log.error("BootLoader setup failed: %s", e)
-            print _("storage configuration failed: %s") % e
+            print(_("storage configuration failed: %s") % e)
             self.errors = [str(e)]
             self.data.bootloader.bootDrive = ""
-            self._ready = True
         else:
             print(_("Checking storage configuration..."))
-            (self.errors, self.warnings) = self.storage.sanityCheck()
-            self._ready = True
+            exns = sanity_check(self.storage)
+            errors = [exn.message for exn in exns if isinstance(exn, SanityError)]
+            warnings = [exn.message for exn in exns if isinstance(exn, SanityWarning)]
+            (self.errors, self.warnings) = (errors, warnings)
             for e in self.errors:
                 log.error(e)
-                print e
+                print(e)
             for w in self.warnings:
-                log.warn(w)
-                print w
+                log.warning(w)
+                print(w)
+        finally:
+            resetCustomStorageData(self.data)
+            self._ready = True
 
     def initialize(self):
         NormalTUISpoke.initialize(self)
@@ -314,8 +427,8 @@ class StorageSpoke(NormalTUISpoke):
 
 class AutoPartSpoke(NormalTUISpoke):
     """ Autopartitioning options are presented here. """
-    title = _("Autopartitioning Options")
-    category = "system"
+    title = N_("Autopartitioning Options")
+    category = SystemCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
@@ -335,9 +448,8 @@ class AutoPartSpoke(NormalTUISpoke):
             # Default to clearing everything.
             self.clearPartType = CLEARPART_TYPE_ALL
 
-        for parttype in self.parttypelist:
-            c = CheckboxWidget(title="%i) %s" % (self.parttypelist.index(parttype) + 1,
-                                                 parttype),
+        for i, parttype in enumerate(self.parttypelist):
+            c = CheckboxWidget(title="%i) %s" % (i + 1, _(parttype)),
                                completed=(PARTTYPES[parttype] == self.clearPartType))
             self._window += [c, ""]
 
@@ -380,16 +492,17 @@ class AutoPartSpoke(NormalTUISpoke):
 
 class PartitionSchemeSpoke(NormalTUISpoke):
     """ Spoke to select what partitioning scheme to use on disk(s). """
-    title = _("Partition Scheme Options")
-    category = "system"
-
-    # set default FS to LVM, for consistency with graphical behavior
-    _selection = 1
+    title = N_("Partition Scheme Options")
+    category = SystemCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
-        self.partschemes = OrderedDict([("Standard Partition", AUTOPART_TYPE_PLAIN),
-                        ("LVM", AUTOPART_TYPE_LVM), ("BTRFS", AUTOPART_TYPE_BTRFS)])
+        self.partschemes = OrderedDict()
+        pre_select = self.data.autopart.type or DEFAULT_AUTOPART_TYPE
+        for i, item in enumerate(AUTOPART_CHOICES):
+            self.partschemes[item[0]] = item[1]
+            if item[1] == pre_select:
+                self._selection = i
 
     @property
     def indirect(self):
@@ -399,10 +512,8 @@ class PartitionSchemeSpoke(NormalTUISpoke):
         NormalTUISpoke.refresh(self, args)
 
         schemelist = self.partschemes.keys()
-        for sch in schemelist:
-            box = CheckboxWidget(title="%i) %s" %(schemelist.index(sch) \
-                                 + 1, sch), completed=(schemelist.index(sch) \
-                                 == self._selection))
+        for i, sch in enumerate(schemelist):
+            box = CheckboxWidget(title="%i) %s" %(i + 1, _(sch)), completed=(i == self._selection))
             self._window += [box, ""]
 
         message = _("Select a partition scheme configuration.")
@@ -430,10 +541,4 @@ class PartitionSchemeSpoke(NormalTUISpoke):
         """ Apply our selections. """
 
         schemelist = self.partschemes.values()
-        try:
-            self.data.autopart.type = schemelist[self._selection]
-        except IndexError:
-            # we shouldn't ever see this, but just in case, don't crash.
-            # when autopart.type is detected as None in AutoPartSpoke.apply(),
-            # it'll automatically just be set to LVM
-            pass
+        self.data.autopart.type = schemelist[self._selection]
diff --git a/anaconda/pyanaconda/ui/tui/spokes/time_spoke.py b/anaconda/pyanaconda/ui/tui/spokes/time_spoke.py
index fc9ff36..a6e59e3 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/time_spoke.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/time_spoke.py
@@ -19,23 +19,28 @@
 # Red Hat Author(s): Martin Sivak <msivak@redhat.com>
 #
 
+from pyanaconda.ui.categories.localization import LocalizationCategory
 from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget
 from pyanaconda.ui.common import FirstbootSpokeMixIn
 from pyanaconda import timezone
-from pyanaconda.i18n import _
+from pyanaconda.i18n import N_, _
 from pyanaconda.constants_text import INPUT_PROCESSED
 
 class TimeZoneSpoke(FirstbootSpokeMixIn, NormalTUISpoke):
-    title = _("Timezone settings")
-    category = "localization"
+    title = N_("Timezone settings")
+    category = LocalizationCategory
 
     def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
 
     def initialize(self):
-        self._timezones = dict((k, sorted(v)) for k,v in timezone.get_all_regions_and_timezones().iteritems())
-        self._regions = [r for r in self._timezones]
+        # it's stupid to call get_all_regions_and_timezones twice, but regions
+        # needs to be unsorted in order to display in the same order as the GUI
+        # so whatever
+        self._regions = timezone.get_all_regions_and_timezones().keys()
+        self._timezones = dict((k, sorted(v)) for k,v in timezone.get_all_regions_and_timezones
+().iteritems())
         self._lower_regions = [r.lower() for r in self._timezones]
 
         self._zones = ["%s/%s" % (region, z) for region in self._timezones for z in self._timezones[region]]
@@ -103,7 +108,7 @@ class TimeZoneSpoke(FirstbootSpokeMixIn, NormalTUISpoke):
                     self.apply()
                     self.close()
                 else:
-                    self.app.switch_screen(self, self._regions[id])
+                    self.app.switch_screen(self, self._regions[index])
                 return INPUT_PROCESSED
             elif key.lower() == "b":
                 self.app.switch_screen(self, None)
diff --git a/anaconda/pyanaconda/ui/tui/spokes/user.py b/anaconda/pyanaconda/ui/tui/spokes/user.py
index 31bf17e..1c24d6d 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/user.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/user.py
@@ -1,6 +1,6 @@
 # User creation text spoke
 #
-# Copyright (C) 2013  Red Hat, Inc.
+# Copyright (C) 2013-2014  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions of
@@ -17,13 +17,16 @@
 # Red Hat, Inc.
 #
 # Red Hat Author(s): Martin Sivak <msivak@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
 #
 
+from pyanaconda.ui.categories.user_settings import UserSettingsCategory
 from pyanaconda.ui.tui.spokes import EditTUISpoke
 from pyanaconda.ui.tui.spokes import EditTUISpokeEntry as Entry
 from pyanaconda.ui.common import FirstbootSpokeMixIn
 from pyanaconda.users import guess_username
-from pyanaconda.i18n import _
+from pyanaconda.flags import flags
+from pyanaconda.i18n import N_, _
 from pykickstart.constants import FIRSTBOOT_RECONFIG
 from pyanaconda.constants import ANACONDA_ENVIRON, FIRSTBOOT_ENVIRON
 from pyanaconda.regexes import GECOS_VALID, USERNAME_VALID, GROUPLIST_SIMPLE_VALID
@@ -31,8 +34,8 @@ from pyanaconda.regexes import GECOS_VALID, USERNAME_VALID, GROUPLIST_SIMPLE_VAL
 __all__ = ["UserSpoke"]
 
 class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke):
-    title = _("User creation")
-    category = "user"
+    title = N_("User creation")
+    category = UserSettingsCategory
 
     edit_fields = [
         Entry("Create user", "_create", EditTUISpoke.CHECK, True),
@@ -94,10 +97,16 @@ class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke):
         else:
             return False
 
+    @property
+    def showable(self):
+        return not (self.completed and flags.automatedInstall)
+
     @property
     def mandatory(self):
-        """ Only mandatory if root account is disabled. """
-        return not bool(self.data.rootpw.password) or self.data.rootpw.lock
+        """ Only mandatory if the root pw hasn't been set in the UI
+            eg. not mandatory if the root account was locked in a kickstart
+        """
+        return not self.data.rootpw.password and not self.data.rootpw.lock
 
     @property
     def status(self):
diff --git a/anaconda/pyanaconda/ui/tui/spokes/warnings.py b/anaconda/pyanaconda/ui/tui/spokes/warnings.py
index c844183..b98882b 100644
--- a/anaconda/pyanaconda/ui/tui/spokes/warnings.py
+++ b/anaconda/pyanaconda/ui/tui/spokes/warnings.py
@@ -22,7 +22,7 @@
 from pyanaconda.ui.tui.spokes import StandaloneTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget
 from pyanaconda.ui.tui.hubs.summary import SummaryHub
-from pyanaconda.i18n import _
+from pyanaconda.i18n import N_, _
 
 from pyanaconda.iutil import is_unsupported_hw
 from pyanaconda.product import productName
@@ -33,7 +33,7 @@ log = logging.getLogger("anaconda")
 __all__ = ["WarningsSpoke"]
 
 class WarningsSpoke(StandaloneTUISpoke):
-    title = _("Warnings")
+    title = N_("Warnings")
 
     preForHub = SummaryHub
     priority = 0
@@ -46,7 +46,7 @@ class WarningsSpoke(StandaloneTUISpoke):
                           "supported hardware, please refer to "
                           "http://www.redhat.com/hardware." )
         # Does anything need to be displayed?
-        self._unsupported = productName.startswith("Red Hat Enterprise Linux") and \
+        self._unsupported = productName.startswith("Red Hat ") and \
                             is_unsupported_hw() and \
                             not self.data.unsupportedhardware.unsupported_hardware
 
@@ -61,3 +61,6 @@ class WarningsSpoke(StandaloneTUISpoke):
 
         return True
 
+    # Override Spoke.apply
+    def apply(self):
+        pass
diff --git a/anaconda/pyanaconda/ui/tui/tools/run-text-spoke.py b/anaconda/pyanaconda/ui/tui/tools/run-text-spoke.py
index 09c91a3..c503cdc 100755
--- a/anaconda/pyanaconda/ui/tui/tools/run-text-spoke.py
+++ b/anaconda/pyanaconda/ui/tui/tools/run-text-spoke.py
@@ -5,7 +5,7 @@ import os.path
 
 # Check command line arguments
 if len(sys.argv)<2:
-    print "Usage: $0 <spoke module name> [<spoke widget class>]"
+    print("Usage: $0 <spoke module name> [<spoke widget class>]")
     sys.exit(1)
 
 # Logging always needs to be set up first thing, or there'll be tracebacks.
@@ -42,7 +42,7 @@ elif os.path.basename(sys.argv[0]) == "run-text-hub.py":
     spokeText = "hub"
     SpokeText = "Hub"
 else:
-    print "You have to run this command as run-spoke.py or run-hub.py."
+    print("You have to run this command as run-spoke.py or run-hub.py.")
     sys.exit(1)
 
 # Set default spoke class
@@ -61,7 +61,7 @@ except IndexError:
     spokeModule = sys.modules[spokeModuleName]
     for k,v in vars(spokeModule).iteritems():
         try:
-            print k,v
+            print(k,v)
             if issubclass(v, spokeBaseClass) and v != spokeBaseClass:
                 spokeClassName = k
                 spokeClass = v
@@ -72,11 +72,11 @@ if not spokeClass:
     try:
         spokeClass = getattr(spokeModule, spokeClassName)
     except KeyError:
-        print "%s %s could not be found in %s" % (SpokeText, spokeClassName, spokeModuleName)
+        print("%s %s could not be found in %s" % (SpokeText, spokeClassName, spokeModuleName))
         sys.exit(1)
 
 
-print "Running %s %s from %s" % (spokeText, spokeClass, spokeModule)
+print("Running %s %s from %s" % (spokeText, spokeClass, spokeModule))
 
 ksdata = makeVersion()
 storage = Blivet(ksdata=ksdata)
@@ -91,13 +91,13 @@ payload.install_log = sys.stdout
 spoke = spokeClass(app, ksdata, storage, payload, instclass)
 
 if not spoke.showable:
-    print "This %s is not showable, but I'll continue anyway." % spokeText
+    print("This %s is not showable, but I'll continue anyway." % spokeText)
 
 app.schedule_screen(spoke)
 app.run()
 
 if hasattr(spoke, "status"):
-    print "%s status:\n%s\n" % (SpokeText, spoke.status)
+    print("%s status:\n%s\n" % (SpokeText, spoke.status))
 if hasattr(spoke, "completed"):
-    print "%s completed:\n%s\n" % (SpokeText, spoke.completed)
-print "%s kickstart fragment:\n%s" % (SpokeText, ksdata)
+    print("%s completed:\n%s\n" % (SpokeText, spoke.completed))
+print("%s kickstart fragment:\n%s" % (SpokeText, ksdata))
diff --git a/anaconda/pyanaconda/ui/tui/tuiobject.py b/anaconda/pyanaconda/ui/tui/tuiobject.py
index ef1253d..0a5243f 100644
--- a/anaconda/pyanaconda/ui/tui/tuiobject.py
+++ b/anaconda/pyanaconda/ui/tui/tuiobject.py
@@ -19,7 +19,7 @@
 # Red Hat Author(s): Martin Sivak <msivak@redhat.com>
 #
 
-from pyanaconda.i18n import _
+from pyanaconda.i18n import N_, _
 from pyanaconda.ui import common
 from pyanaconda.ui.tui import simpleline as tui
 from pyanaconda.constants_text import INPUT_PROCESSED
@@ -27,7 +27,7 @@ from pyanaconda.constants_text import INPUT_PROCESSED
 class ErrorDialog(tui.UIScreen):
     """Dialog screen for reporting errors to user."""
 
-    title = _("Error")
+    title = N_("Error")
 
     def __init__(self, app, message):
         """
@@ -58,7 +58,7 @@ class ErrorDialog(tui.UIScreen):
 class YesNoDialog(tui.UIScreen):
     """Dialog screen for Yes - No questions."""
 
-    title = _("Question")
+    title = N_("Question")
 
     def __init__(self, app, message):
         """
diff --git a/anaconda/pyanaconda/users.py b/anaconda/pyanaconda/users.py
index 335f121..68e497a 100644
--- a/anaconda/pyanaconda/users.py
+++ b/anaconda/pyanaconda/users.py
@@ -29,7 +29,6 @@ import os.path
 from pyanaconda import iutil
 import pwquality
 from pyanaconda.iutil import strip_accents
-from pyanaconda.i18n import _
 from pyanaconda.constants import PASSWORD_MIN_LEN
 
 import logging
@@ -70,6 +69,14 @@ directory = %(instPath)s/etc
 directory = %(instPath)s/etc
 """ % {"instPath": instPath, "algo": algoname}
 
+    # Import login.defs if installed
+    if os.path.exists(os.path.normpath(instPath + "/etc/login.defs")):
+        buf += """
+[import]
+login_defs = %(instPath)s/etc/login.defs
+""" % {"instPath": instPath}
+
+
     fd.write(buf)
     fd.close()
     os.environ["LIBUSER_CONF"] = fn
@@ -154,15 +161,6 @@ def validatePassword(pw, user="root", settings=None):
             validatePassword.pwqsettings.minlen = PASSWORD_MIN_LEN
         settings = validatePassword.pwqsettings
 
-    legal = string.digits + string.ascii_letters + string.punctuation + " "
-    for letter in pw:
-        if letter not in legal:
-            message = _("Requested password contains "
-                      "non-ASCII characters, which are "
-                      "not allowed.")
-            valid = False
-            break
-
     if valid:
         try:
             strength = settings.check(pw, None, user)
@@ -183,7 +181,7 @@ def guess_username(fullname):
     else:
         username = u""
 
-    # and prefix it with the first name inital
+    # and prefix it with the first name initial
     if len(fullname) > 1:
         username = fullname[0].decode("utf-8")[0].lower() + username
 
@@ -194,6 +192,35 @@ class Users:
     def __init__ (self):
         self.admin = libuser.admin()
 
+    def _prepareChroot(self, root):
+        # Unfortunately libuser doesn't have an API to operate on a
+        # chroot, so we hack it here by forking a child and calling
+        # chroot() in that child's context.
+
+        childpid = os.fork()
+        if not childpid:
+            if not root in ["","/"]:
+                os.chroot(root)
+                os.chdir("/")
+                del(os.environ["LIBUSER_CONF"])
+
+            self.admin = libuser.admin()
+
+        return childpid
+
+    def _finishChroot(self, childpid):
+        assert childpid > 0
+        try:
+            status = iutil.eintr_retry_call(os.waitpid, childpid, 0)[1]
+        except OSError as e:
+            log.critical("exception from waitpid: %s %s", e.errno, e.strerror)
+            return False
+
+        if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0):
+            return True
+        else:
+            return False
+
     def createGroup (self, group_name, **kwargs):
         """Create a new user on the system with the given name.  Optional kwargs:
 
@@ -204,17 +231,8 @@ class Users:
                         Defaults to /mnt/sysimage.
         """
 
-        childpid = os.fork()
-        root = kwargs.get("root", "/mnt/sysimage")
-
-        if not childpid:
-            if not root in ["","/"]:
-                os.chroot(root)
-                os.chdir("/")
-                del(os.environ["LIBUSER_CONF"])
-
-            self.admin = libuser.admin()
-
+        childpid = self._prepareChroot(kwargs.get("root", iutil.getSysroot()))
+        if childpid == 0:
             if self.admin.lookupGroupByName(group_name):
                 log.error("Group %s already exists, not creating.", group_name)
                 os._exit(1)
@@ -231,17 +249,8 @@ class Users:
                 os._exit(1)
 
             os._exit(0)
-
-        try:
-            status = os.waitpid(childpid, 0)[1]
-        except OSError as e:
-            log.critical("exception from waitpid while creating a group: %s %s", e.errno, e.strerror)
-            return False
-
-        if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0):
-            return True
         else:
-            return False
+            return self._finishChroot(childpid)
 
     def createUser (self, user_name, *args, **kwargs):
         """Create a new user on the system with the given name.  Optional kwargs:
@@ -272,17 +281,8 @@ class Users:
            gid       -- The GID for the new user.  If none is given, the next
                         available one is used.
         """
-        childpid = os.fork()
-        root = kwargs.get("root", "/mnt/sysimage")
-
-        if not childpid:
-            if not root in ["","/"]:
-                os.chroot(root)
-                os.chdir("/")
-                del(os.environ["LIBUSER_CONF"])
-
-            self.admin = libuser.admin()
-
+        childpid = self._prepareChroot(kwargs.get("root", iutil.getSysroot()))
+        if childpid == 0:
             if self.admin.lookupUserByName(user_name):
                 log.error("User %s already exists, not creating.", user_name)
                 os._exit(1)
@@ -301,7 +301,7 @@ class Users:
             if kwargs.get("homedir", False):
                 userEnt.set(libuser.HOMEDIRECTORY, kwargs["homedir"])
             else:
-                iutil.mkdirChain(root+'/home')
+                iutil.mkdirChain('/home')
                 userEnt.set(libuser.HOMEDIRECTORY, "/home/" + user_name)
 
             if kwargs.get("shell", False):
@@ -337,12 +337,14 @@ class Users:
                     orig_gid = stats.st_gid
 
                     log.info("Home directory for the user %s already existed, "
-                             "fixing the owner.", user_name)
+                             "fixing the owner and SELinux context.", user_name)
                     # home directory already existed, change owner of it properly
                     iutil.chown_dir_tree(userEnt.get(libuser.HOMEDIRECTORY)[0],
                                          userEnt.get(libuser.UIDNUMBER)[0],
                                          groupEnt.get(libuser.GIDNUMBER)[0],
                                          orig_uid, orig_gid)
+                    iutil.execWithRedirect("restorecon",
+                                           ["-r", userEnt.get(libuser.HOMEDIRECTORY)[0]])
                 except OSError as e:
                     log.critical("Unable to change owner of existing home directory: %s",
                             os.strerror)
@@ -383,44 +385,19 @@ class Users:
                 os._exit(1)
 
             os._exit(0)
-
-        try:
-            status = os.waitpid(childpid, 0)[1]
-        except OSError as e:
-            log.critical("exception from waitpid while creating a user: %s %s", e.errno, e.strerror)
-            return False
-
-        if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0):
-            return True
         else:
-            return False
+            return self._finishChroot(childpid)
 
-    def checkUserExists(self, username, root="/mnt/sysimage"):
-        childpid = os.fork()
-
-        if not childpid:
-            if not root in ["","/"]:
-                os.chroot(root)
-                os.chdir("/")
-                del(os.environ["LIBUSER_CONF"])
-
-            self.admin = libuser.admin()
+    def checkUserExists(self, username, root=None):
+        childpid = self._prepareChroot(root)
 
+        if childpid == 0:
             if self.admin.lookupUserByName(username):
                 os._exit(0)
             else:
                 os._exit(1)
-
-        try:
-            status = os.waitpid(childpid, 0)[1]
-        except OSError as e:
-            log.critical("exception from waitpid while creating a user: %s %s", e.errno, e.strerror)
-            return False
-
-        if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0):
-            return True
         else:
-            return False
+            return self._finishChroot(childpid)
 
     def setUserPassword(self, username, password, isCrypted, lock, algo=None):
         user = self.admin.lookupUserByName(username)
@@ -434,7 +411,7 @@ class Users:
             self.admin.lockUser(user)
 
         user.set(libuser.SHADOWLASTCHANGE, "")
-        self.admin.modifyUser(user)
+        return self.admin.modifyUser(user)
 
     def setRootPassword(self, password, isCrypted=False, isLocked=False, algo=None):
         return self.setUserPassword("root", password, isCrypted, isLocked, algo)
diff --git a/anaconda/pyanaconda/version.py.in b/anaconda/pyanaconda/version.py.in
new file mode 100644
index 0000000..8b5161a
--- /dev/null
+++ b/anaconda/pyanaconda/version.py.in
@@ -0,0 +1 @@
+__version__ = "@PACKAGE_VERSION@-@PACKAGE_RELEASE@"
diff --git a/anaconda/pyanaconda/vnc.py b/anaconda/pyanaconda/vnc.py
index 85b729b..9abee56 100644
--- a/anaconda/pyanaconda/vnc.py
+++ b/anaconda/pyanaconda/vnc.py
@@ -80,15 +80,15 @@ class VncServer:
         """Set the vnc server password. Output to file. """
 
         r, w = os.pipe()
-        os.write(w, "%s\n" % self.password)
+        iutil.eintr_retry_call(os.write, w, "%s\n" % self.password)
 
         with open(self.pw_file, "w") as pw_file:
             # the -f option makes sure vncpasswd does not ask for the password again
             rc = iutil.execWithRedirect("vncpasswd", ["-f"],
-                                        stdin=r, stdout=pw_file)
+                    stdin=r, stdout=pw_file, binary_output=True, log_output=False)
 
-            os.close(r)
-            os.close(w)
+            iutil.eintr_retry_call(os.close, r)
+            iutil.eintr_retry_call(os.close, w)
 
         return rc
 
@@ -137,7 +137,7 @@ class VncServer:
 
     def openlogfile(self):
         try:
-            fd = os.open(self.log_file, os.O_RDWR | os.O_CREAT)
+            fd = iutil.eintr_retry_call(os.open, self.log_file, os.O_RDWR | os.O_CREAT)
         except OSError as e:
             sys.stderr.write("error opening %s: %s\n", (self.log_file, e))
             fd = None
@@ -148,7 +148,7 @@ class VncServer:
         """Attempt to connect to self.vncconnecthost"""
 
         maxTries = 10
-        self.log.info(_("Attempting to connect to vnc client on host %s...") % (self.vncconnecthost,))
+        self.log.info(_("Attempting to connect to vnc client on host %s..."), self.vncconnecthost)
 
         if self.vncconnectport != "":
             hostarg = self.vncconnecthost + ":" + self.vncconnectport
@@ -173,7 +173,7 @@ class VncServer:
                 sys.exit(1)
         self.log.error(P_("Giving up attempting to connect after %d try!\n",
                           "Giving up attempting to connect after %d tries!\n",
-                          maxTries) % (maxTries,))
+                          maxTries), maxTries)
         return False
 
     def VNCListen(self):
@@ -182,11 +182,11 @@ class VncServer:
         We dont really have to do anything for the server to listen :)
         """
         if self.connxinfo != None:
-            self.log.info(_("Please manually connect your vnc client to %s to begin the install.") % (self.connxinfo,))
+            self.log.info(_("Please manually connect your vnc client to %s to begin the install."), self.connxinfo)
         else:
             self.log.info(_("Please manually connect your vnc client to <IP ADDRESS>:%s "
                             "to begin the install. Switch to the shell (Ctrl-B 2) and "
-                            "run 'ip addr' to find the <IP ADDRESS>.") % (self.display,))
+                            "run 'ip addr' to find the <IP ADDRESS>."), self.display)
 
     def startServer(self):
         self.log.info(_("Starting VNC..."))
@@ -199,7 +199,7 @@ class VncServer:
             stdoutLog.critical("Could not initialize the VNC server: %s", e)
             sys.exit(1)
 
-        if self.password and len(self.password) < 6:
+        if self.password and (len(self.password) < 6 or len(self.password) > 8):
             self.changeVNCPasswdWindow()
 
         if not self.password:
@@ -262,12 +262,12 @@ class VncServer:
     def changeVNCPasswdWindow(self):
         """ Change the password to a sane parameter.
 
-        We ask user to input a password that len(password) > 6
-        or password == ''.
+        We ask user to input a password that (len(password) > 6
+        and len(password) <= 8) or password == ''.
         """
 
-        message = _("VNC password provided was not at least 6 characters long.\n"
-                    "Please enter a new one.  Leave blank for no password.")
+        message = _("VNC password must be six to eight characters long.\n"
+                    "Please enter a new one, or leave blank for no password.")
         app = App("VNC PASSWORD")
         spoke = VNCPassSpoke(app, self.anaconda.ksdata, None, None, None,
                              message)
diff --git a/anaconda/scripts/Makefile.am b/anaconda/scripts/Makefile.am
index 0035373..9bcfdcc 100644
--- a/anaconda/scripts/Makefile.am
+++ b/anaconda/scripts/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 scriptsdir = $(libexecdir)/$(PACKAGE_NAME)
-dist_scripts_SCRIPTS = upd-updates run-anaconda anaconda-yum
+dist_scripts_SCRIPTS = upd-updates run-anaconda anaconda-yum zramswapon zramswapoff zram-stats
 dist_noinst_SCRIPTS  = upd-kernel makeupdates
 
 dist_bin_SCRIPTS = analog anaconda-cleanup instperf
diff --git a/anaconda/scripts/anaconda-yum b/anaconda/scripts/anaconda-yum
index 09d5429..77067c7 100644
--- a/anaconda/scripts/anaconda-yum
+++ b/anaconda/scripts/anaconda-yum
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# pylint: disable=bad-preconf-access
 #
 # Copyright (C) 2013  Red Hat, Inc.
 #
@@ -21,12 +22,16 @@
 import os
 import sys
 import argparse
+import time
 import rpm
 import rpmUtils
 import yum
 from urlgrabber.grabber import URLGrabError
+from pyanaconda.iutil import xprogressive_delay
 
-YUM_PLUGINS = ["blacklist", "whiteout", "fastestmirror", "langpacks"]
+YUM_PLUGINS = ["fastestmirror", "langpacks"]
+
+MAX_DOWNLOAD_RETRIES = 10
 
 def setup_parser():
     """ Setup argparse with supported arguments
@@ -42,12 +47,13 @@ def setup_parser():
     parser.add_argument("-i", "--installroot", help="Path to top directory of installroot", default="/mnt/sysimage")
     parser.add_argument("-T", "--test", action="store_true", help="Test transaction, don't actually install")
     parser.add_argument("-d", "--debug", action="store_true", help="Extra debugging output")
+    parser.add_argument("-m", "--macro", action="append", metavar=('NAME', 'VALUE'), nargs=2, help="Macros to add to the rpm transaction")
 
     return parser
 
 
 def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_log,
-                        testing=False, debug=False):
+                        testing=False, debug=False, macros=None):
     """ Execute a yum transaction loaded from a transaction file
 
         :param release: The release version to use
@@ -64,6 +70,10 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l
         :type script_log: string
         :param testing: True sets RPMTRANS_FLAG_TEST (default is false)
         :type testing: bool
+        :param debug: True set verbosity to "debug"
+        :type debug: bool
+        :param macros: Macros to define in the rpm transaction
+        :type macros: list
         :returns: Nothing
 
         This is used to run the yum transaction in a separate process, preventing
@@ -77,6 +87,11 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l
         if k in os.environ:
             os.environ.pop(k)
 
+    # Initialize the rpm macros
+    if macros:
+        for macro in macros:
+            rpm.addMacro(macro[0], macro[1])
+
     try:
         # Setup the basics, point to the config file and install_root
         yb = yum.YumBase()
@@ -109,18 +124,34 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l
         if rpmUtils and rpmUtils.arch.isMultiLibArch():
             yb.ts.ts.setColor(3)
 
-        print("DEBUG: populate transaction set")
-        try:
-            # uses dsCallback.transactionPopulation
-            yb.populateTs(keepold=0)
-        except RepoError as e:
-            print("ERROR: error populating transaction: %s" % e)
-            print("QUIT:")
+        print("INFO: populate transaction set")
+        xdelay = xprogressive_delay()
+
+        for retry_count in xrange(0, MAX_DOWNLOAD_RETRIES+1):
+            # retry count == 0 -> first attempt
+            # retry count > 0  -> retry
+            if retry_count:
+                # retry after waiting a bit
+                time.sleep(next(xdelay))
+                print("PROGRESS_INSTALL: error populating transaction, retrying (%d/%d)"
+                      % (retry_count, MAX_DOWNLOAD_RETRIES))
+            try:
+                # uses dsCallback.transactionPopulation
+                yb.populateTs(keepold=0)
+                break
+            except RepoError as e:
+                continue
+        else:
+            # else = no break called = no successful attempt
+            print("ERROR: error populating transaction after %d retries: %s"
+                  % (retry_count, e))
+            # we don't need to print "QUIT:" there, the finally clause
+            # of the toplevel try-block will do that for us
             return
 
-        print("DEBUG: check transaction set")
+        print("INFO: check transaction set")
         yb.ts.check()
-        print("DEBUG: order transaction set")
+        print("INFO: order transaction set")
         yb.ts.order()
         yb.ts.clean()
 
@@ -155,8 +186,6 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l
             logfile.close()
     except YumBaseError as e:
         print("ERROR: transaction error: %s" % e)
-    except Exception as e:
-        print("ERROR: unexpected error: %s" % e)
     finally:
         print("QUIT:")
 
@@ -253,12 +282,23 @@ class RPMCallback(object):
 
         try:
             repo = self.yb.repos.getRepo(txmbr.po.repoid)
-        except Exception as e:
+        except yum.Errors.RepoError as e:
             print("ERROR: getRepo failed: %s" % e)
             raise Exception("rpmcallback getRepo failed")
 
         self.package_file = None
-        while self.package_file is None:
+        retry_message = ""
+        error_message = ""
+        exception_message = ""
+        xdelay = xprogressive_delay()
+
+        for retry_count in xrange(0, MAX_DOWNLOAD_RETRIES+1):
+            # retry count == 0 -> first attempt
+            # retry count > 0  -> retry
+            if retry_count and retry_message:
+                time.sleep(next(xdelay))  # wait a bit before retry
+                print("PROGRESS_INSTALL: %s (%d/%d)" % (retry_message, retry_count, MAX_DOWNLOAD_RETRIES))
+
             try:
                 # checkfunc gets passed to yum's use of URLGrabber which
                 # then calls it with the file being fetched. verifyPkg
@@ -274,21 +314,47 @@ class RPMCallback(object):
                 if self.debug:
                     print("DEBUG: getPackage %s" % txmbr.name)
                 package_path = repo.getPackage(txmbr.po, checkfunc=checkfunc)
+                break
             except URLGrabError as e:
-                print("ERROR: URLGrabError: %s" % e)
-                raise Exception("rpmcallback failed")
-            except (yum.Errors.NoMoreMirrorsRepoError, IOError) as e:
-                if os.path.exists(txmbr.po.localPkg()):
-                    os.unlink(txmbr.po.localPkg())
-                    print("DEBUG: retrying download of %s" % txmbr.po)
-                    continue
-                print("ERROR: getPackage error: %s" % e)
-                raise Exception("getPackage failed")
-            except yum.Errors.RepoError as e:
-                print("DEBUG: RepoError: %s" % e)
-                continue
+                if retry_count < MAX_DOWNLOAD_RETRIES:
+                    retry_message = "rpmcallback failed (URLGrabError), retrying"
+                else:
+                    # run out of retries
+                    error_message = "rpmcallback failed (URLGrabError) after %d retries: %s" % \
+                                    (retry_count, e)
+                    exception_message = "rpmcallback failed"
 
-            self.package_file = open(package_path)
+            except (yum.Errors.NoMoreMirrorsRepoError, IOError) as e:
+                # for some reason, this is the exception you will get if
+                # the package file you want to download vanishes, not URLGrabError
+
+                if retry_count < MAX_DOWNLOAD_RETRIES:
+                    retry_message = "retrying download of %s" % txmbr.po
+                    # remove any unfinished downloads of this package
+                    if os.path.exists(txmbr.po.localPkg()):
+                        os.unlink(txmbr.po.localPkg())
+                else:
+                    # run out of retries
+                    error_message = "getPackage error after %d retries: %s" % \
+                                    (retry_count, e)
+                    exception_message = "getPackage failed"
+
+            except yum.Errors.RepoError as e:
+                if retry_count < MAX_DOWNLOAD_RETRIES:
+                    retry_message = "RepoError, retrying: %s" % e
+                else:
+                    # run out of retries
+                    error_message = "RepoError after %d retries: %s" % \
+                                    (retry_count, e)
+                    exception_message = "too many (%d) consecutive repo errors" % \
+                                        retry_count
+
+        else:  # report what went wrong & abort installation
+            print("ERROR: %s" % error_message)
+            raise Exception(exception_message)
+
+        # if we got this far, there should be a package available
+        self.package_file = open(package_path)
 
         if self.debug:
             print("DEBUG: opening package %s" % self.package_file.name)
@@ -334,12 +400,15 @@ class RPMCallback(object):
 
 
 if __name__ == "__main__":
-    arg_parser = setup_parser()
-    args = arg_parser.parse_args()
+    try:
+        arg_parser = setup_parser()
+        args = arg_parser.parse_args()
 
-    # force output to be flushed
-    sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
-
-    run_yum_transaction(args.release, args.arch, args.config, args.installroot,
-                        args.tsfile, args.rpmlog, args.test, args.debug)
+        # force output to be flushed
+        sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
 
+        run_yum_transaction(args.release, args.arch, args.config, args.installroot,
+                            args.tsfile, args.rpmlog, args.test, args.debug, args.macro)
+        # pylint: disable=broad-except
+    except Exception as e:
+        print("ERROR: unexpected error: %s" % e)
diff --git a/anaconda/scripts/githooks/check_commit_msg.sh b/anaconda/scripts/githooks/check_commit_msg.sh
new file mode 100644
index 0000000..a14a390
--- /dev/null
+++ b/anaconda/scripts/githooks/check_commit_msg.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+#
+# Check whether the given commit has a valid BZ ID reference for the given
+# release.
+#
+# $1 -- release number
+# $2 -- commit hash
+#
+
+exec 1>&2
+
+bzcmd="bugzilla"
+release=${1}
+commit=${2}
+msg="$(git show -s --pretty='%s%n%b' ${commit})"
+summary="$(git show -s --pretty='%s%n%b' ${commit}|head -n 1)"
+
+## helper functions ##
+# Check the bz to see if it has an ack for this release. If the branch is
+# a local branch, just warn. If it is the primary branch, block the commit.
+bz_has_ack() {
+    bug=$1
+    flags=$(${bzcmd} query --bug_id=${bug} --outputformat="%{flags}")
+
+    ack_pattern="rhel-${release}\.[[:digit:]]+\.[[:digit:]]+\+"
+    if [[ ! "$flags" =~ $ack_pattern ]]; then
+        echo "*** BZ ${bug} is missing acks: ${flags}"
+
+        return 1
+    fi
+    return 0
+}
+
+echo "${summary}" | grep -i '^new version' > /dev/null
+if [ $? -eq 0 ]; then
+    # "New version" commit doesn't need a BZ ID
+    exit 0
+fi
+
+for word in ${summary} ; do
+    echo "${word}" | grep -q -E "^.*(#[0-9]+).*"
+    if [ $? -eq 0 ]; then
+        bug="$(echo "${word}" | sed -e 's/^(#//g' -e 's/).*$//g')"
+        ${bzcmd} query --bug_id=${bug} --outputformat="%{product}" | grep -q "^Red Hat Enterprise Linux.*"
+        if [ $? -ne 0 ]; then
+            echo "*** BZ ${bug} is not a RHEL bug."
+            exit 1
+        fi
+        bz_has_ack ${bug}
+        exit $?
+    fi
+done
+
+last=$(($(echo "${msg}" |wc -l) - 2))
+if [ ${last} -gt 0 ]; then
+    echo "${msg}" | tail -n ${last} | grep -v "^#" |
+    grep -E "^(Resolves|Related|Conflicts): rhbz#[0-9]+$" |
+    while read line ; do
+        bug="$(echo ${line} | cut -d '#' -f 2)"
+        ${bzcmd} query --bug_id=${bug} --outputformat="%{product}" | grep -q "^Red Hat Enterprise Linux.*"
+        if [ $? -ne 0 ]; then
+            echo "*** BZ ${bug} is not a RHEL bug."
+            exit 1
+        fi
+        bz_has_ack ${bug}
+        # exit from the loop (piping to while creates a subprocess???)
+        exit $?
+    done
+
+    # exit from the script with the code from the loop
+    exit $?
+else
+    # nothing found
+    echo "*** Commit ${commit} doesn't have bugzilla ID specified ***" >&2
+    exit 1
+fi
diff --git a/anaconda/scripts/githooks/pre-commit b/anaconda/scripts/githooks/pre-commit
index ec143f3..c8832ef 100644
--- a/anaconda/scripts/githooks/pre-commit
+++ b/anaconda/scripts/githooks/pre-commit
@@ -25,7 +25,7 @@ def is_python(filename):
 OTHER_MODULES_PATH = ".:../blivet/:../pykickstart/"
 
 if "NOPYLINT" in os.environ:
-    print "Skipping pre-commit pylint run"
+    print("Skipping pre-commit pylint run")
     sys.exit(0)
 
 # run pylint on all the python files changed by this commit
@@ -39,9 +39,15 @@ pylint_files = []
 # The first character is the status in the index (or our side of a merge),
 # the second character is the status in the tree (or their side of a merge).
 for gf in git_files.splitlines():
-    # If the file is being removed or is not in git, ignore it
-    if gf[0] in ('D', '?'):
+    # If the file is being removed, or is not in git, or is not part of this
+    # commit, ignore it
+    if gf[0] in ('D', '?', ' '):
         continue
+    # If the file is being renamed, grab the target filename
+    if gf[0] == 'R':
+        target = gf[3:].split(' -> ')[1]
+        if is_python(target):
+            pylint_files.append(target)
     elif is_python(gf[3:]):
         # If the file is unmerged or changed locally, raise an error
         if gf[0] == 'U' or gf[1] in ('U', 'M'):
@@ -57,11 +63,11 @@ if not pylint_files:
 env = os.environ.copy()
 env["PYTHONPATH"] = OTHER_MODULES_PATH
 
-print "Running pylint on %s" % " ".join(pylint_files)
+print("Running pylint on %s" % " ".join(pylint_files))
 try:
     check_output(["./tests/pylint/runpylint.sh"] + pylint_files, env=env)
 except CalledProcessError as e:
-    print e.output
+    print(e.output)
     sys.exit(1)
 
 sys.exit(0)
diff --git a/anaconda/scripts/githooks/pre-push b/anaconda/scripts/githooks/pre-push
new file mode 100644
index 0000000..db8c8ae
--- /dev/null
+++ b/anaconda/scripts/githooks/pre-push
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# pre-push hook that checks that all commits that are about to be pushed have
+# the bugzilla ID specified and the bug reports have all the necessary acks.
+#
+
+exec 1>&2
+
+# git gives us these on STDIN
+read more_args
+local_ref=$(echo ${more_args}|cut -d' ' -f1)
+
+echo "*** Checking commits that are about to be pushed" >&2
+
+## initialization ##
+remote="${1}"
+ACK_FATAL=0
+branch_name=$(echo "${local_ref}" | cut -d'/' -f3)
+branch_pattern="^rhel([[:digit:]])-(.*)"
+if [[ ! "$branch_name" =~ $branch_pattern ]]; then
+   exit 0
+fi
+release=${BASH_REMATCH[1]}
+
+# Is this a local branch, or the primary branch?
+if [ "${BASH_REMATCH[2]}" == "branch" ]; then
+    # Make a missing ack block the commit
+    ACK_FATAL=0
+else
+    # Missing acks are just warnings
+    ACK_FATAL=1
+fi
+
+if [ -f "${HOME}/.rhbzauth" ]; then
+    . "${HOME}/.rhbzauth"
+fi
+
+bzcmd="bugzilla"
+if [ ! -z "${RHBZ_USER}" ]; then
+   if [ ! -z "${RHBZ_PASSWORD}" ]; then
+       bzcmd_login="${bzcmd} --user=${RHBZ_USER} --password=${RHBZ_PASSWORD} login"
+   else
+       bzcmd_login="${bzcmd} --user=${RHBZ_USER} login"
+   fi
+else
+    bzcmd_login="${bzcmd} login"
+fi
+
+commits=$(git log --pretty='%H' ${remote}/${branch_name}..${branch_name})
+if [ $? != 0 ]; then
+    if [ -n ${NEW_BRANCH} ]; then
+        exit 0
+    else
+        echo "*** Cannot find the remote branch ***"
+        echo 'Set the $NEW_BRANCH variable to an nonempty string to allow this push'
+        exit 1
+    fi
+fi
+
+${bzcmd} >/dev/null 2>&1
+if [ $? -eq 127 ]; then
+    echo "*** 'yum install python-bugzilla' to validate bug references."
+
+    msg="$(mktemp $(pwd)/commit.msg.XXXXXXXXXX)"
+    cp "${1}" "${msg}"
+    echo
+    echo "Aborted commit message written to: $(basename ${msg})"
+    exit 1
+else
+    ${bzcmd_login} >/dev/null
+fi
+
+## main ##
+# fork separate process for every commit, querying bugzilla takes time
+num_commits=$(echo ${commits}|wc -w)
+echo ${commits}|xargs -n1 --max-procs=${num_commits} .git/hooks/check_commit_msg.sh ${release}
+xargs_ret=$?
+if [ ${ACK_FATAL} == "0" ]; then
+    test ${xargs_ret} -eq 0
+    exit $?
+else
+    exit 0
+fi
diff --git a/anaconda/scripts/makeupdates b/anaconda/scripts/makeupdates
index f7ac204..de3c5dd 100755
--- a/anaconda/scripts/makeupdates
+++ b/anaconda/scripts/makeupdates
@@ -39,6 +39,7 @@ except ImportError:
     exit(1)
 
 RPM_FOLDER_NAME = os.path.expanduser("~/.anaconda_updates_rpm_cache")
+RPM_RELEASE_DIR_TEMPLATE = "for_%s"
 KOJI_BASE_URL = "http://kojipkgs.fedoraproject.org//packages/" \
                 "%(toplevel_name)s/%(toplevel_version)s/%(release)s/%(arch)s/%(rpm_name)s"
 
@@ -138,7 +139,7 @@ def get_req_tuple(pkg_tuple, version_request):
     return (name, version_request, (epoch, version, release))
 
 
-def check_package_version(filename, package):
+def check_package_version(filename, package, check_release_id=True):
     """Check if package described by filename complies with the required
     version and the version request operator
 
@@ -155,33 +156,44 @@ def check_package_version(filename, package):
     filename = os.path.basename(filename)
     # split the name into components
     pkg_tuple = get_pkg_tuple(filename)
-    # get release ids for request and the package
-    request_release = package.req_tuple[2][2]
-    package_release = pkg_tuple[4]
-    # rangeCheck actually ignores different release ids,
-    # so we need to do it here
-    if request_release != package_release:
-        return False
-    else:
-        return bool(miscutils.rangeCheck(package.req_tuple, pkg_tuple))
+    if check_release_id:
+        # get release ids for request and the package
+        # and strip it from any build/git garbage
+        request_release = package.req_tuple[2][2].rsplit(".", 1).pop()
+        package_release = pkg_tuple[4].rsplit(".", 1).pop()
+        # rangeCheck actually ignores different release ids,
+        # so we need to do it here
+        if request_release != package_release:
+            return False
+    return bool(miscutils.rangeCheck(package.req_tuple, pkg_tuple))
 
 def doGitDiff(tag, args=None):
     if args is None:
         args=[]
-    proc = subprocess.Popen(['git', 'diff', '--name-status', tag] + args,
+    cmd = ['git', 'diff', '--name-status', tag] + args
+    proc = subprocess.Popen(cmd,
                             stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE).communicate()
+                            stderr=subprocess.PIPE)
+    output = proc.communicate()
 
-    lines = proc[0].split('\n')
+    if proc.returncode:
+        raise RuntimeError("Error running %s: %s" % (" ".join(cmd), output[1]))
+
+    lines = output[0].split('\n')
     return lines
 
 def doGitContentDiff(tag, args=None):
     if args is None:
         args = []
-    proc = subprocess.Popen(['git', 'diff', tag] + args,
+    cmd = ['git', 'diff', tag] + args
+    proc = subprocess.Popen(cmd,
                             stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE).communicate()
-    lines = proc[0].split('\n')
+                            stderr=subprocess.PIPE)
+    output = proc.communicate()
+    if proc.returncode:
+        raise RuntimeError("Error running %s: %s" % (" ".join(cmd), output[1]))
+
+    lines = output[0].split('\n')
     return lines
 
 def download_to_file(url, path):
@@ -190,6 +202,10 @@ def download_to_file(url, path):
     or None if the download fails for some reason
     """
     try:
+        # try to make sure the folder for the download exists
+        download_folder = os.path.split(path)[0]
+        if not os.access(download_folder, os.W_OK):
+            os.makedirs(download_folder)
         result = urllib.urlretrieve(url, path)
         # return the storage path
         return result[0]
@@ -217,7 +233,12 @@ def copyUpdatedFiles(tag, updates, cwd):
     if not tmpupdates.endswith("/run/install/updates"):
         tmpupdates = os.path.join(tmpupdates, "run/install/updates")
 
-    lines = doGitDiff(tag)
+    try:
+        lines = doGitDiff(tag)
+    except RuntimeError as e:
+        print("ERROR: %s" % e)
+        return
+
     for line in lines:
         fields = line.split()
 
@@ -227,15 +248,21 @@ def copyUpdatedFiles(tag, updates, cwd):
         status = fields[0]
         gitfile = fields[1]
 
-        if status == "D":
-            if gitfile.startswith('pyanaconda/'):
+        # R is followed by a number that doesn't matter to us.
+        if status == "D" or status[0] == "R":
+            if gitfile.startswith('pyanaconda/') and gitfile.endswith(".py"):
                 # deleted python module, write out a stub raising RemovedModuleError
                 file_path = os.path.join(tmpupdates, gitfile)
+                if not os.path.exists(os.path.dirname(file_path)):
+                    os.makedirs(os.path.dirname(file_path))
                 with open(file_path, "w") as fobj:
                     fobj.write('from pyanaconda.errors import RemovedModuleError\n')
                     fobj.write('raise RemovedModuleError("This module no longer exists!")\n')
 
-            continue
+            if status == "D":
+                continue
+            elif status[0] == "R":
+                gitfile = fields[2]
 
         if gitfile.endswith('.spec.in') or (gitfile.find('Makefile') != -1) or \
            gitfile.endswith('.c') or gitfile.endswith('.h') or \
@@ -261,26 +288,34 @@ def copyUpdatedFiles(tag, updates, cwd):
             install_to_dir(gitfile, "usr/sbin")
         elif gitfile.endswith('.service') or gitfile.endswith(".target"):
             # same for systemd services
-            install_to_dir(gitfile, "lib/systemd/system")
+            install_to_dir(gitfile, "usr/lib/systemd/system")
         elif gitfile.endswith('/anaconda-generator'):
             # yeah, this should probably be more clever..
-            install_to_dir(gitfile, "lib/systemd/system-generators")
+            install_to_dir(gitfile, "usr/lib/systemd/system-generators")
         elif gitfile == "data/tmux.conf":
             install_to_dir(gitfile, "usr/share/anaconda")
         elif gitfile == "data/anaconda-gtk.css":
-            install_to_dir(gitfile, "usr/share/anaconda")
+            install_to_dir(gitfile, "run/install/updates")
         elif gitfile == "data/interactive-defaults.ks":
             install_to_dir(gitfile, "usr/share/anaconda")
+        elif gitfile == "data/anaconda_options.txt":
+            install_to_dir(gitfile, "usr/share/anaconda")
         elif gitfile == "data/liveinst/liveinst":
             install_to_dir(gitfile, "usr/sbin")
         elif gitfile.startswith("data/pixmaps"):
             install_to_dir(gitfile, "usr/share/anaconda/pixmaps")
+        elif gitfile.startswith("widgets/data/pixmaps"):
+            install_to_dir(gitfile, "usr/share/anaconda/pixmaps")
         elif gitfile.startswith("data/ui/"):
             install_to_dir(gitfile, "usr/share/anaconda/ui")
         elif gitfile.startswith("data/post-scripts/"):
             install_to_dir(gitfile, "usr/share/anaconda/post-scripts")
-        elif gitfile.endswith("anaconda-yum"):
+        elif any(gitfile.endswith(libexec_script) for libexec_script in \
+                 ("anaconda-yum", "zramswapon", "zramswapoff", "zram-stats")):
             install_to_dir(gitfile, "usr/libexec/anaconda")
+        elif gitfile.endswith("AnacondaWidgets.py"):
+            import gi
+            install_to_dir(gitfile, gi._overridesdir[1:])
         elif gitfile.find('/') != -1:
             fields = gitfile.split('/')
             subdir = fields[0]
@@ -296,7 +331,11 @@ def copyUpdatedFiles(tag, updates, cwd):
             install_to_dir(gitfile, tmpupdates)
 
 def _compilableChanged(tag, compilable):
-    lines = doGitDiff(tag, [compilable])
+    try:
+        lines = doGitDiff(tag, [compilable])
+    except RuntimeError as e:
+        print("ERROR: %s" % e)
+        return
 
     for line in lines:
         fields = line.split()
@@ -357,10 +396,10 @@ def copyUpdatedIsys(updates, srcdir, builddir):
 def copyUpdatedWidgets(updates, srcdir, builddir):
     os.chdir(srcdir)
 
-    if os.path.isdir("/lib64"):
-        libdir = "/lib64/"
+    if os.path.isdir("/usr/lib64"):
+        libdir = "/usr/lib64/"
     else:
-        libdir = "/lib/"
+        libdir = "/usr/lib/"
 
     if not os.path.isdir(updates + libdir):
         os.makedirs(updates + libdir)
@@ -372,17 +411,39 @@ def copyUpdatedWidgets(updates, srcdir, builddir):
 
     os.system('make -C %s' % builddir)
 
-    files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.1", "libAnacondaWidgets.so.1.0.0"]
-    for f in files:
-        path = os.path.normpath(builddir + "/widgets/src/.libs/" + f)
+    libglob = os.path.normpath(builddir + "/widgets/src/.libs") + "/libAnacondaWidgets.so*"
+    for path in glob.glob(libglob):
         if os.path.islink(path) and not os.path.exists(updates + libdir + os.path.basename(path)):
             os.symlink(os.readlink(path), updates + libdir + os.path.basename(path))
         elif os.path.isfile(path):
             shutil.copy2(path, updates + libdir)
 
-    typelib = os.path.realpath(builddir + "/widgets/src/AnacondaWidgets-1.0.typelib")
-    if os.path.isfile(typelib):
-        shutil.copy2(typelib, updates + libdir + "girepository-1.0")
+    typeglob = os.path.realpath(builddir + "/widgets/src") + "/AnacondaWidgets-*.typelib"
+    for typelib in glob.glob(typeglob):
+        if os.path.isfile(typelib):
+            shutil.copy2(typelib, updates + libdir + "girepository-1.0")
+
+def copyTranslations(updates, srcdir, builddir):
+    localedir = "/usr/share/locale/"
+
+    # Ensure all the message files are up to date
+    if os.system('make -C %s/po' % builddir) != 0:
+        sys.exit(1)
+
+    # From here gettext puts everything in $srcdir
+    # For each language in LINGUAS, install srcdir/<lang>.gmo as
+    # /usr/share/locale/$language/LC_MESSAGES/anaconda.mo
+    with open(srcdir + '/po/LINGUAS') as linguas:
+        for line in linguas.readlines():
+            if line.startswith('#'):
+                continue
+
+            for lang in line.strip().split(" "):
+                if not os.path.isdir(updates + localedir + lang + "/LC_MESSAGES"):
+                    os.makedirs(updates + localedir + lang + "/LC_MESSAGES")
+
+                shutil.copy2(srcdir + "/po/" + lang + ".gmo",
+                        updates + localedir + lang + "/LC_MESSAGES/anaconda.mo")
 
 def addRpms(updates_path, add_rpms):
     """Add content one or more RPM packages to the updates image
@@ -418,7 +479,12 @@ def check_for_new_packages(tag, arch, added_rpms, specfile_path):
 
     Package = namedtuple("Package", "name version version_request req_tuple")
 
-    diff = doGitContentDiff(tag, ["anaconda.spec.in"])
+    try:
+        diff = doGitContentDiff(tag, ["anaconda.spec.in"])
+    except RuntimeError as e:
+        print("ERROR: %s" % e)
+        return
+
     new_requires = filter(lambda x: x.startswith("+Requires:"), diff)
     new_defines = filter(lambda x: x.startswith("+%define"), diff)
     with open(specfile_path) as f:
@@ -501,6 +567,10 @@ def check_for_new_packages(tag, arch, added_rpms, specfile_path):
         else:
             version = ""
 
+        # skip requires of our own packages
+        if version == "%{version}-%{release}":
+            continue
+
         # handle version variables (%{package-namever})
         if version.startswith("%"):
             # drop the %{ prefix and ver} suffix
@@ -566,9 +636,13 @@ def remove_local_packages(packages, arch, release_id, added_rpms):
     """Remove locally available RPMs from the list of needed packages,
     return locally unavailable packages and paths to relevant locally
     available RPMs for inclusion"""
+    current_release_dir = RPM_RELEASE_DIR_TEMPLATE % release_id
     # list all package names and version for the RPMs already in cache
     folder_glob = os.path.join(RPM_FOLDER_NAME, "*.rpm")
     folder_glob = os.path.abspath(folder_glob)
+    release_folder_glob = os.path.join(RPM_FOLDER_NAME, current_release_dir, "*.rpm")
+    release_folder_glob = os.path.abspath(release_folder_glob)
+
     include_rpms = []
     skipped_packages = []
 
@@ -592,7 +666,11 @@ def remove_local_packages(packages, arch, release_id, added_rpms):
     # currently specified architecture
     allowed = ("noarch.rpm", "%s.rpm" % arch)
     relevant_rpms = [x for x in glob.glob(folder_glob) if x.endswith(allowed)]
-
+    # also add any RPMS from the current release folder
+    # (has RPMs from older releases that were not yet rebuilt
+    # for the current release)
+    relevant_rpms.extend(x for x in glob.glob(release_folder_glob)
+                         if x.endswith(allowed))
     # iterate over all relevant cached RPMs and check if they are needed
     for rpm_path in relevant_rpms:
         proc = subprocess.Popen(['rpm', '-qp', '--queryformat',
@@ -604,10 +682,17 @@ def remove_local_packages(packages, arch, release_id, added_rpms):
             continue
         name, version, release = proc_output[0].split()
         # get the build number and release id
-        build_id, package_release_id = release.split(".", 1)
-        # skip cached RPMs that have different release id
-        if package_release_id != release_id:
-            continue
+        build_id, package_release_id = release.rsplit(".", 1)
+
+        # If a package is stored in the for_<release id>
+        # subfolder, we don't check its release id,
+        # because it is a package that has not been rebuilt
+        # for a new release but it still the latest version.
+        # If a package is not stored in a for_<release id> subfolder,
+        # we check the release id to filter out old cached packages.
+        if not os.path.split(rpm_path)[0].endswith(current_release_dir):
+            if package_release_id != release_id:
+                continue
         # add the build id to the version string
         version_build = "%s-%s" % (version, build_id)
         # check if the package is needed
@@ -687,9 +772,9 @@ def get_rpm_from_Koji_thread(package, fedora_number, arch,
     # if there is a version-request, just get all package version for the given
     # release and filter them afterwards
     if package.version_request:
-        package_glob = "%s-*.fc%d.*.rpm" % (package.name, fedora_number)
+        package_glob = "%s-*.fc*.*.rpm" % (package.name)
     else:
-        package_glob = "%s-%s.fc%d.*.rpm" % (package.name, version, fedora_number)
+        package_glob = "%s-%s.fc*.*.rpm" % (package.name, version)
 
     # get the current thread, so output can be prefixed by thread number
     prefix = "thread %s:" % threading.current_thread().name
@@ -716,11 +801,44 @@ def get_rpm_from_Koji_thread(package, fedora_number, arch,
         filtered_results = []
         for result in results:
             # check if the version complies with the version request
-            if check_package_version(result['name'], package):
+            if check_package_version(result['name'], package,
+                                     check_release_id=False):
                 filtered_results.append(result)
         # replace results with filtered results
         results = filtered_results
 
+    # the response from Koji has multiple release ids;
+    # packages that were not updated in the given release might
+    # have an older release id, but will still be valid for the
+    # given Fedora release
+    # therefore we go back from the current release id,
+    # until we either find a package or run out of release ids
+    # Example:
+    # foo-0.1.fc19.x86_64.rpm could be the latest RPM for
+    # Fedora 19, 20 & 21, if foo was not updated since the 0.1 release
+
+    def is_in_release(result, release_number):
+        pkg_tuple = get_pkg_tuple(result["name"])
+        # there could be stuff like 16.git20131003.fc20,
+        # so we spit by all dots and get the last one
+        release_id = pkg_tuple[4].split(".").pop()
+        return release_id == "fc%d" % release_number
+
+    suitable_results = []
+    release_number_override = None
+    for release_number in range(fedora_number, 0, -1):
+        suitable_results = [x for x in results if is_in_release(x, release_number)]
+        if suitable_results:
+            if release_number != fedora_number:
+                release_number_override = release_number
+            break
+
+    results = suitable_results
+    if results and release_number_override:
+        with print_lock:
+            print("%s %s not found in fc%d, getting package from fc%d" %
+                 (prefix, package.name, fedora_number, release_number_override))
+
     if results:  # any packages left ?
         # as the newest packages are on the bottom of the
         # result list, just pop the last item
@@ -748,8 +866,17 @@ def get_rpm_from_Koji_thread(package, fedora_number, arch,
         url = KOJI_BASE_URL % package_metadata
         # simple, isn't it ? :)
 
-        # append the RPM cache folder to the filename
-        download_path = os.path.join(RPM_FOLDER_NAME, rpm_name)
+        # build RPM storage path
+        release_dir = ""
+        if release_number_override:
+            # Using package from older release, store it in a sub-folder
+            # so that it is not downloaded again each time.
+            release_id = "fc%d" % fedora_number
+            release_dir = RPM_RELEASE_DIR_TEMPLATE % release_id
+        # if a package from and older release is used, the release subfolder is
+        # added to the storage path, otherwise the package is downloaded to the
+        # main folder
+        download_path = os.path.join(RPM_FOLDER_NAME, release_dir, rpm_name)
         # check if the download was successful
         storage_path = download_to_file(url, download_path)
         if storage_path is not None:
@@ -790,6 +917,9 @@ def main():
     parser.add_argument('-o', '--offset', action='store', type=int, default=0,
                         help='make image from (latest_tag - OFFSET) to HEAD')
 
+    parser.add_argument('-p', '--po', action='store_true',
+                        help='update translations')
+
     # -a/--add can be both used multiple times and multiple paths can be
     # passed to a single -a/--add option, all provided paths will be then added
     # to the add_rpm list
@@ -845,6 +975,9 @@ def main():
         if widgetsChanged(args.tag):
             copyUpdatedWidgets(updates, cwd, builddir)
 
+    if args.po:
+        copyTranslations(updates, cwd, builddir)
+
     if args.add_rpms:
         # as using -a or --add mutltiple times
         # adds a new list to the list instead of extending the
diff --git a/anaconda/scripts/zram-stats b/anaconda/scripts/zram-stats
new file mode 100644
index 0000000..8d95c95
--- /dev/null
+++ b/anaconda/scripts/zram-stats
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+##
+# Show stats for all (initialized) zram devices
+# Author: Nitin Gupta
+#
+
+stats=(
+	"disksize"
+	"num_reads"
+	"num_writes"
+	"invalid_io"
+#	"discard"
+	"notify_free"
+	"zero_pages"
+	"orig_data_size"
+	"compr_data_size"
+	"mem_used_total"
+)
+
+function get_stat()
+{
+	local _dev=$1
+	local _stat=$2
+	cat $dev/$_stat
+}
+
+function show_stat()
+{
+	local _name=$1
+	local _val=$2
+	local _unit=$3
+	printf "%-16s %11d %s\n" "$_name:" "$_val" "$_unit"
+}
+
+#for dev in `find /sys/block -name 'zram*'`; do
+find /sys/block -name 'zram*' | while read dev; do
+	orig=0
+	compr=0
+	total=0
+	is_init=$(get_stat $dev initstate)
+
+	# Show stats only for initialized devices
+	[ "$is_init" == 1 ] || continue
+
+	echo "$dev"
+	for stat in "${stats[@]}"; do
+		val=$(get_stat $dev $stat)
+		eval __$stat=$val	# ex: __disksize=$disksize
+		show_stat $stat $val
+	done
+
+	[ "$__orig_data_size" == "0" ] && continue;
+
+	cratio=$(echo "print $__compr_data_size*100/$__orig_data_size" | python | tr -d '\n')
+	show_stat "avg_compr_ratio" $cratio "%"
+
+	# Memory wasted due to fragmentation, metadata overhead etc.
+	ovhd=$(echo "print ($__mem_used_total - $__compr_data_size) * 100 / \
+						$__compr_data_size" | python | tr -d '\n')
+	show_stat "mem_overhead" $ovhd "%"
+	echo
+done
+
diff --git a/anaconda/scripts/zramswapoff b/anaconda/scripts/zramswapoff
new file mode 100644
index 0000000..7dc4d55
--- /dev/null
+++ b/anaconda/scripts/zramswapoff
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# Heavily inspired by zramswapoff script found in the Simone Sclavi's repository
+# at http://software.opensuse.org/package/systemd-zram-service
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+# get the number of CPUs
+num_cpus=$(getconf _NPROCESSORS_ONLN)
+
+# set decremented number of CPUs
+decr_num_cpus=$((num_cpus - 1))
+
+# Switching off swap
+for i in $(seq 0 $decr_num_cpus); do
+    if [ "$(grep /dev/zram$i /proc/swaps)" ]; then
+        swapoff /dev/zram$i
+    fi
+done
+
+rmmod zram
diff --git a/anaconda/scripts/zramswapon b/anaconda/scripts/zramswapon
new file mode 100644
index 0000000..161ea80
--- /dev/null
+++ b/anaconda/scripts/zramswapon
@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# Heavily inspired by zramswapon script found in the Simone Sclavi's repository
+# at http://software.opensuse.org/package/systemd-zram-service
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+set -x
+
+MAX_RAM_ON=2097152
+
+# get the amount of memory in the machine
+mem_total_kb=$(grep MemTotal /proc/meminfo | grep -E --only-matching '[[:digit:]]+')
+mem_total=$((mem_total_kb * 1024))
+
+grep -E 'inst\.zram=(on|1)' /proc/cmdline > /dev/null
+force=$?
+if [ \( $mem_total_kb -gt $MAX_RAM_ON \) -a \( $force != "0" \) ]; then
+    # more than 1 GB of RAM and not forced, do nothing
+    exit 0
+fi
+
+# get the number of CPUs
+num_cpus=$(getconf _NPROCESSORS_ONLN)
+
+# set decremented number of CPUs
+decr_num_cpus=$((num_cpus - 1))
+
+# load dependency modules
+modprobe zram num_devices=$num_cpus
+
+# initialize the devices
+for i in $(seq 0 $decr_num_cpus); do
+    echo $((mem_total / num_cpus)) > /sys/block/zram$i/disksize
+done
+
+# Creating swap filesystems
+for i in $(seq 0 $decr_num_cpus); do
+    mkswap /dev/zram$i
+done
+
+# Switch the swaps on
+for i in $(seq 0 $decr_num_cpus); do
+    swapon -p 100 /dev/zram$i
+done
+
+if [ $mem_total_kb -le "1048576" ]; then
+    # less than 1 GB or RAM -> less than 512 MB /tmp (tmpfs defaults to
+    # 0.5*RAM), bump up the /tmp's size, yum may need it
+    mount -o remount,size=512M /tmp
+fi
diff --git a/anaconda/tests/Makefile.am b/anaconda/tests/Makefile.am
index 3a0fc94..2803481 100644
--- a/anaconda/tests/Makefile.am
+++ b/anaconda/tests/Makefile.am
@@ -36,15 +36,36 @@ TEST_EXTENSIONS = .sh
 dist_check_DATA = pylint/pylint-false-positives
 
 # Test scripts need to be listed both here and in TESTS
-dist_check_SCRIPTS = accelerators/check_accelerators.py \
-		     accelerators/run_check_accelerators.sh \
+dist_check_SCRIPTS = $(srcdir)/glade/*/*.py \
+		     glade/run_glade_tests.sh \
+		     $(srcdir)/lib/*.py \
+		     $(srcdir)/lib/*.sh \
 		     nosetests.sh \
+		     $(srcdir)/pylint/*.py \
 		     pylint/runpylint.sh \
+		     pylint/pylint-one.sh \
+		     cppcheck/runcppcheck.sh \
 		     testenv.sh \
 		     gettext/gettext_warnings.sh \
+		     gettext/gettext_potfiles.py \
+		     storage/run_storage_tests.py \
+		     ostree/run_ostree_tests.sh \
+		     $(srcdir)/gui/*.ks \
+		     $(srcdir)/gui/*.sh \
+		     $(srcdir)/gui/inside/*.py \
+		     $(srcdir)/gui/outside/*.py \
+		     $(srcdir)/storage/cases/*.py \
 		     $(srcdir)/*_tests/*.py
 
 TESTS = nosetests.sh \
 	pylint/runpylint.sh \
+	cppcheck/runcppcheck.sh \
 	gettext/gettext_warnings.sh \
-	accelerators/run_check_accelerators.sh
+	gettext/gettext_potfiles.py \
+	storage/run_storage_tests.py \
+	gui/run_gui_tests.sh \
+	glade/run_glade_tests.sh \
+	ostree/run_ostree_tests.sh
+
+clean-local:
+	-rm -rf pylint/.pylint.d
diff --git a/anaconda/tests/accelerators/run_check_accelerators.sh b/anaconda/tests/accelerators/run_check_accelerators.sh
deleted file mode 100644
index 401f081..0000000
--- a/anaconda/tests/accelerators/run_check_accelerators.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-: "${top_srcdir:=$(dirname "$0")/../..}"
-srcdir="${top_srcdir}/tests/accelerators"
-
-# If --translate was specified but not --podir, add --podir
-i=0
-translate_set=0
-podir_set=0
-for arg in "$@" ; do
-    if [ "$arg" = "--translate" -o "$arg" = "-t" ]; then
-        translate_set=1
-    elif [ "$arg" = "--podir" -o "$arg" = "-p" ]; then
-        podir_set=1
-    fi
-done
-
-if [ "$translate_set" -eq 1 -a "$podir_set" -eq 0 ]; then
-    set -- "$@" --podir "${top_srcdir}/po"
-fi
-
-find "${top_srcdir}" -name '*.glade' -exec "${srcdir}/check_accelerators.py" "$@" {} +
diff --git a/anaconda/tests/cppcheck/runcppcheck.sh b/anaconda/tests/cppcheck/runcppcheck.sh
new file mode 100644
index 0000000..589f604
--- /dev/null
+++ b/anaconda/tests/cppcheck/runcppcheck.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# If $top_srcdir has not been set by automake, import the test environment
+if [ -z "$top_srcdir" ]; then
+    top_srcdir="$(dirname "$0")/../.."
+    . ${top_srcdir}/tests/testenv.sh
+fi
+
+. ${top_srcdir}/tests/lib/testlib.sh
+
+if ! type cppcheck > /dev/null 2>&1 ; then
+    echo "cppcheck must be installed"
+    exit 99
+fi
+
+# If files were specified on the command line, use those. Otherwise, look
+# for all .c files
+filelist=
+if [ "$#" -gt 0 ]; then
+    filelist="$@"
+else
+    filelist=$(findtestfiles -name '*.c')
+fi
+
+# Disable unusedFunction in widgets since everything will show up as unused
+# Specify the path twice so the path works relative to both the top of the
+# tree and from the tests/ directory.
+cppcheck_output="$(echo "$filelist" |
+    xargs cppcheck -q -v --error-exitcode=1 \
+        --template='{id}:{file}:{line}: {message}' \
+        --inline-suppr \
+        --enable=warning,unusedFunction \
+        --suppress=unusedFunction:*/widgets/src/* \
+        --suppress=unusedFunction:widgets/src/* \
+        2>&1 )"
+
+if [ -n "$cppcheck_output" ]; then
+    echo "$cppcheck_output"
+    exit 1
+fi
diff --git a/anaconda/tests/gettext/gettext_potfiles.py b/anaconda/tests/gettext/gettext_potfiles.py
new file mode 100644
index 0000000..5d80308
--- /dev/null
+++ b/anaconda/tests/gettext/gettext_potfiles.py
@@ -0,0 +1,65 @@
+#!/usr/bin/python
+
+import os, sys, subprocess
+
+# The xpath in this file is simple enough that Python's built-in
+# ElementTree can handle it, so we don't need lxml here
+import xml.etree.ElementTree as ET
+
+if "top_srcdir" not in os.environ:
+    sys.stderr.write("$top_srcdir must be defined in the test environment\n")
+    # This return code tells the automake test driver that the test setup failed
+    sys.exit(99)
+
+# Ensure that tests/lib is in sys.path
+testlibpath = os.path.abspath(os.path.join(os.environ["top_srcdir"], "tests/lib"))
+if testlibpath not in sys.path:
+    sys.path.append(testlibpath)
+
+from filelist import testfilelist
+
+success = True
+
+def check_potfile(checkfile, potlist):
+    global success
+
+    potcheckfile = None
+    if checkfile.endswith(".py"):
+        # Check whether the file imports the i18n module
+        if subprocess.call(["grep", "-q", "^from pyanaconda.i18n import", checkfile]) == 0:
+            potcheckfile = checkfile
+    elif checkfile.endswith(".c"):
+        # Check whether the file includes intl.h
+        if subprocess.call(["grep", "-q", "#include .intl\\.h.", checkfile]) == 0:
+            potcheckfile = checkfile
+    elif checkfile.endswith(".glade"):
+        # Look for a "translatable=yes" attribute
+        if ET.parse(checkfile).findall(".//*[@translatable='yes']"):
+            potcheckfile = checkfile
+    elif checkfile.endswith(".desktop.in"):
+        # These are handled by intltool, make sure the .h version is present
+        potcheckfile = checkfile + ".h"
+
+    if not potcheckfile:
+        return
+
+    # Compute the path relative to top_srcdir
+    potcheckfile = os.path.relpath(potcheckfile, os.environ["top_srcdir"])
+
+    if potcheckfile not in potlist:
+        sys.stderr.write("%s not in POTFILES.in\n" % potcheckfile)
+        success = False
+
+# Read in POTFILES.in, skip comments and blank lines
+POTFILES = set()
+with open(os.path.join(os.environ["top_srcdir"], "po", "POTFILES.in")) as f:
+    for line in (line.strip() for line in f):
+        if line and not line.startswith("#"):
+            POTFILES.add(line)
+
+# Walk the source tree and look for files with translatable strings
+for testfile in testfilelist():
+    check_potfile(testfile, POTFILES)
+
+if not success:
+    sys.exit(1)
diff --git a/anaconda/tests/gettext/gettext_warnings.sh b/anaconda/tests/gettext/gettext_warnings.sh
index 5eaffbe..2974e32 100644
--- a/anaconda/tests/gettext/gettext_warnings.sh
+++ b/anaconda/tests/gettext/gettext_warnings.sh
@@ -1,11 +1,23 @@
 #!/bin/sh -e
 
-: "${top_srcdir:=$(dirname "$0")/../..}"
-podir="${top_srcdir}/po"
+if [ -z "$top_srcdir" ]; then
+    top_srcdir="$(dirname "$0")/../.."
+    . "${top_srcdir}/tests/testenv.sh"
+fi
+podir="${top_builddir}/po"
+POTFILES="${podir}/POTFILES"
 
 # Extract XGETTEXT_OPTIONS from po/Makevars
+# Makevars is one of our files, so it's in $srcdir
 XGETTEXT_OPTIONS="$(sed -n 's/^[[:space:]]*XGETTEXT_OPTIONS[[:space:]]*=[[:space:]]*\(.*\)/\1/p' \
-    "${podir}/Makevars")"
+    "${top_srcdir}/po/Makevars")"
+
+# Fail if POTFILES doesn't exist, since set -e doesn't catch this for some
+# dumb reason that I'm sure has a long and storied history
+if [ ! -f "${POTFILES}" ] ; then
+    echo "POTFILES does not exist"
+    exit 1
+fi
 
 status=0
 # For each file in POTFILES, run xgettext and look for warnings
@@ -27,6 +39,6 @@ while read -r potfile ; do
         echo "$xgettext_output"
         status=1
     fi
-done < "${top_srcdir}/po/POTFILES"
+done < "$POTFILES"
 
 exit "$status"
diff --git a/anaconda/tests/accelerators/check_accelerators.py b/anaconda/tests/glade/accelerators/check_accelerators.py
similarity index 70%
rename from anaconda/tests/accelerators/check_accelerators.py
rename to anaconda/tests/glade/accelerators/check_accelerators.py
index 4361c64..75f478a 100644
--- a/anaconda/tests/accelerators/check_accelerators.py
+++ b/anaconda/tests/glade/accelerators/check_accelerators.py
@@ -22,9 +22,16 @@ import argparse
 import re
 import os.path
 import copy
-import collections
 import locale
 
+# Import translation methods if needed
+if ('-t' in sys.argv) or ('--translate' in sys.argv):
+    try:
+        from translatepo import translate_all
+    except ImportError:
+        print("Unable to load po translation module")
+        sys.exit(99)
+
 try:
     from lxml import etree
 except ImportError:
@@ -34,38 +41,16 @@ except ImportError:
 accel_re = re.compile(r'_(?P<accel>.)')
 success = True
 
-# Only used when --translate is requested.
-class PODict(collections.Mapping):
-    def __init__(self, filename):
-        try:
-            import polib
-        except ImportError:
-            print("You need to install the python-polib package to check translations")
-            sys.exit(1)
+def is_exception(node, conflicting_node, language=None):
+    # Check for a comment of the form
+    # <!-- check_accelerators: <conflicting-node-id> -->
+    # The node passed in is the label property of the widget rather than the
+    # <object> node itself, so we actually want the id attribute of the parent node.
+    for comment in node.xpath("./preceding-sibling::comment()[contains(., 'check_accelerators:')]"):
+        if comment.text.split(":")[1].strip() == conflicting_node.getparent().attrib['id']:
+            return True
 
-        self._dict = {}
-
-        pofile = polib.pofile(filename)
-        self.metadata = pofile.metadata
-        for entry in pofile.translated_entries():
-            self._dict[entry.msgid] = entry.msgstr
-
-    def __getitem__(self, key):
-        return self._dict[key]
-
-    def __iter__(self):
-        return self._dict.__iter__()
-
-    def __len__(self):
-        return len(self._dict)
-
-def is_exception(node, language=None):
-    if language:
-        comment_str = "check_accelerators(%s)" % language
-    else:
-        comment_str = "check_accelerators"
-
-    return bool(node.xpath("./parent::*/comment()[contains(., '%s')]" % comment_str))
+    return False
 
 def add_check_accel(glade_filename, accels, label, po_map):
     """Check whether an accelerator conflicts with existing accelerators.
@@ -73,26 +58,46 @@ def add_check_accel(glade_filename, accels, label, po_map):
     """
     global success
 
-    language = None
     if po_map:
-        if label.text not in po_map:
+        try:
+            label_texts = po_map.get(label.text, label.get("context"))
+        except KeyError:
             return
-        label.text = po_map[label.text]
-        language = po_map.metadata['Language']
+
+        # If there is more than one translation (i.e., a plural string), check
+        # that the accelerator is the same for all translations
+        if len(label_texts) > 1:
+            match = accel_re.search(label_texts[0])
+            if match:
+                accel0 = match.group('accel').lower()
+            else:
+                accel0 = None
+
+            for label_text in label_texts[1:]:
+                match = accel_re.search(label_text)
+                if match:
+                    accel = match.group('accel').lower()
+                else:
+                    accel = None
+
+                if accel != accel0:
+                    print("Mismatched accelerator in translations for %s in language %s" % \
+                            (label.text, po_map.metadata['Language']))
+                    success = False
+
+        label.text = label_texts[0]
+        lang_str = " for language %s" % po_map.metadata['Language']
+    else:
+        lang_str = ""
 
     match = accel_re.search(label.text)
     if match:
         accel = match.group('accel').lower()
         if accel in accels:
             # Check for an exception comment
-            if is_exception(label, language):
+            if is_exception(label, accels[accel]):
                 return
 
-            if language:
-                lang_str = " for language %s" % language
-            else:
-                lang_str = ""
-
             print(("Accelerator collision for key %s in %s%s\n    line %d: %s\n    line %d: %s" %\
                     (accel, os.path.normpath(glade_filename), lang_str,
                         accels[accel].sourceline, accels[accel].text,
@@ -100,6 +105,11 @@ def add_check_accel(glade_filename, accels, label, po_map):
             success = False
         else:
             accels[accel] = label
+    else:
+        print(("No accelerator defined for %s in %s%s: line %d" %\
+                (label.text, os.path.normpath(glade_filename), lang_str,
+                    label.sourceline)).encode("utf-8"))
+        success = False
 
 def combine_accels(glade_filename, list_a, list_b, po_map):
     if not list_a:
@@ -211,38 +221,29 @@ def main(argv=None):
     if args.translate:
         import langtable
 
-        with open(os.path.join(args.podir, 'LINGUAS')) as linguas:
-            for line in linguas.readlines():
-                if re.match(r'^#', line):
-                    continue
+        podicts = translate_all(args.podir)
 
-                for lang in line.strip().split(" "):
-                    # Reset the locale to C before parsing the po file because
-                    # polib has erroneous uses of lower().
-                    # See https://bitbucket.org/izi/polib/issue/54/pofile-parsing-crashes-in-turkish-locale
+        for (lang, po_map) in ((key, podicts[key]) for key in podicts.keys()):
+            # Set the locale so that we can use lower() on accelerator keys.
+            # If the language is of the form xx_XX, use that as the
+            # locale name. Otherwise use the first locale that
+            # langtable returns for the language. If that doesn't work,
+            # just use C and hope for the best.
+            if '_' in lang:
+                locale.setlocale(locale.LC_ALL, lang)
+            else:
+                locale_list = langtable.list_locales(languageId=lang)
+                if locale_list:
+                    try:
+                        locale.setlocale(locale.LC_ALL, locale_list[0])
+                    except locale.Error:
+                        print("No such locale %s, using C" % locale_list[0])
+                        locale.setlocale(locale.LC_ALL, 'C')
+                else:
                     locale.setlocale(locale.LC_ALL, 'C')
-                    po_map = PODict(os.path.join(args.podir, lang + ".po"))
 
-                    # Set the locale so that we can use lower() on accelerator keys.
-                    # If the language is of the form xx_XX, use that as the
-                    # locale name. Otherwise use the first locale that
-                    # langtable returns for the language. If that doesn't work,
-                    # just use C and hope for the best.
-                    if '_' in lang:
-                        locale.setlocale(locale.LC_ALL, lang)
-                    else:
-                        locale_list = langtable.list_locales(languageId=lang)
-                        if locale_list:
-                            try:
-                                locale.setlocale(locale.LC_ALL, locale_list[0])
-                            except locale.Error:
-                                print("No such locale %s, using C" % locale_list[0])
-                                locale.setlocale(locale.LC_ALL, 'C')
-                        else:
-                            locale.setlocale(locale.LC_ALL, 'C')
-
-                    for glade_file in args.glade_files:
-                        check_glade(glade_file, po_map)
+            for glade_file in args.glade_files:
+                check_glade(glade_file, po_map)
 
 if __name__ == "__main__":
     main(sys.argv[1:])
diff --git a/anaconda/tests/glade/format_string/check_format_string.py b/anaconda/tests/glade/format_string/check_format_string.py
new file mode 100644
index 0000000..81191e1
--- /dev/null
+++ b/anaconda/tests/glade/format_string/check_format_string.py
@@ -0,0 +1,78 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+#
+
+"""
+Python script to ensure that translatable format strings are not present
+in Glade files.
+
+Since format substitution is language-dependent, gettext is unable to check
+the validity of format string translations for strings within glade. Instead,
+the format string constant, the translation substitution, and the format
+substitution should all happen outside of glade. Untranslated placeholder
+strings are allowable within glade.
+"""
+
+import sys
+import argparse
+import re
+
+try:
+    from lxml import etree
+except ImportError:
+    print("You need to install the python-lxml package to use check_format_string.py")
+    sys.exit(1)
+
+def check_glade_file(glade_file_path):
+    global success
+
+    with open(glade_file_path) as glade_file:
+        # Parse the XML
+        glade_tree = etree.parse(glade_file)
+
+        # Check any property with translatable="yes"
+        for translatable in glade_tree.xpath(".//*[@translatable='yes']"):
+            # Look for % followed by an open parenthesis (indicating %(name)
+            # style substitution), one of the python format conversion flags
+            # (#0- +hlL), or one of the python conversion types 
+            # (diouxXeEfFgGcrs)
+            if re.search(r'%[-(#0 +hlLdiouxXeEfFgGcrs]', translatable.text):
+                print("Translatable format string found in glade at %s:%d" % \
+                        (glade_file_path, translatable.sourceline))
+                success = False
+
+if __name__ == "__main__":
+    success = True
+    parser = argparse.ArgumentParser("Check that password entries have visibility set to False")
+
+    # Ignore translation arguments
+    parser.add_argument("-t", "--translate", action='store_true',
+            help=argparse.SUPPRESS)
+    parser.add_argument("-p", "--podir", action='store', type=str,
+            metavar='PODIR', help=argparse.SUPPRESS, default='./po')
+
+    parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE",
+            help='The glade file to check')
+    args = parser.parse_args(args=sys.argv[1:])
+
+    success = True
+    for file_path in args.glade_files:
+        check_glade_file(file_path)
+
+    sys.exit(0 if success else 1)
diff --git a/anaconda/tests/glade/icons/check_icons.py b/anaconda/tests/glade/icons/check_icons.py
new file mode 100644
index 0000000..e338ea2
--- /dev/null
+++ b/anaconda/tests/glade/icons/check_icons.py
@@ -0,0 +1,72 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+#
+"""
+Check that all icons referenced from glade files are valid in the gnome icon theme.
+"""
+
+import argparse
+import sys
+
+try:
+    from lxml import etree
+except ImportError:
+    print("You need to install the python-lxml package to use check_pw_visibility.py")
+    sys.exit(1)
+
+from iconcheck import icon_exists
+
+def check_glade_file(glade_file_path):
+    glade_success = True
+    with open(glade_file_path) as glade_file:
+        # Parse the XML
+        glade_tree = etree.parse(glade_file)
+
+        # Stock image names are deprecated
+        for element in glade_tree.xpath("//property[@name='stock' or @name='stock_id']"):
+            glade_success = False
+            print("Deprecated stock icon found at %s:%d" % (glade_file_path, element.sourceline))
+
+        # Check whether named icons exist
+        for element in glade_tree.xpath("//property[@name='icon_name']"):
+            if not icon_exists(element.text):
+                glade_success = False
+                print("Invalid icon name %s found at %s:%d" % (element.text, glade_file_path, element.sourceline))
+
+    return glade_success
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Check that password entries have visibility set to False")
+
+    # Ignore translation arguments
+    parser.add_argument("-t", "--translate", action='store_true',
+            help=argparse.SUPPRESS)
+    parser.add_argument("-p", "--podir", action='store', type=str,
+            metavar='PODIR', help=argparse.SUPPRESS, default='./po')
+
+    parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE",
+            help='The glade file to check')
+    args = parser.parse_args(args=sys.argv[1:])
+
+    success = True
+    for file_path in args.glade_files:
+        if not check_glade_file(file_path):
+            success = False
+
+    sys.exit(0 if success else 1)
diff --git a/anaconda/tests/glade/markup/check_markup.py b/anaconda/tests/glade/markup/check_markup.py
new file mode 100644
index 0000000..f90e15e
--- /dev/null
+++ b/anaconda/tests/glade/markup/check_markup.py
@@ -0,0 +1,135 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+#
+
+"""
+Python script to check that properties in glade using Pango markup contain
+valid markup.
+"""
+
+import sys
+import argparse
+
+# Import translation methods if needed
+if ('-t' in sys.argv) or ('--translate' in sys.argv):
+    try:
+        from translatepo import translate_all
+    except ImportError:
+        print("Unable to load po translation module")
+        sys.exit(99)
+
+from pangocheck import markup_nodes, markup_match, markup_necessary
+
+try:
+    from lxml import etree
+except ImportError:
+    print("You need to install the python-lxml package to use check_markup.py")
+    sys.exit(99)
+
+class PangoElementException(Exception):
+    def __init__(self, element):
+        Exception.__init__(self)
+        self.element = element
+
+    def __str__(self):
+        return "Invalid element %s" % self.element
+
+def _validate_pango_markup(root):
+    """Validate parsed pango markup.
+
+       :param etree.ElementTree root: The pango markup parsed as an XML ElementTree
+       :raises PangoElementException: If the pango markup contains unknown elements
+    """
+    if root.tag not in markup_nodes:
+        raise PangoElementException(root.tag)
+
+    for child in root:
+        _validate_pango_markup(child)
+
+def check_glade_file(glade_file_path, po_map=None):
+    glade_success = True
+    with open(glade_file_path) as glade_file:
+        # Parse the XML
+        glade_tree = etree.parse(glade_file)
+
+        # Search for label properties on objects that have use_markup set to True
+        for label in glade_tree.xpath(".//property[@name='label' and ../property[@name='use_markup']/text() = 'True']"):
+            if po_map:
+                try:
+                    label_texts = po_map.get(label.text, label.get("context"))
+                except KeyError:
+                    continue
+                lang_str = " for language %s" % po_map.metadata['Language']
+            else:
+                label_texts = (label.text,)
+                lang_str = ""
+
+            # Wrap the label text in <markup> tags and parse the tree
+            for label_text in label_texts:
+                try:
+                    # pylint: disable=unescaped-markup
+                    pango_tree = etree.fromstring("<markup>%s</markup>" % label_text)
+                    _validate_pango_markup(pango_tree)
+
+                    # Check if the markup is necessary
+                    if not markup_necessary(pango_tree):
+                        print("Markup could be expressed as attributes at %s%s:%d" % \
+                                (glade_file_path, lang_str, label.sourceline))
+                        glade_success = False
+                except etree.XMLSyntaxError:
+                    print("Unable to parse pango markup at %s%s:%d" % \
+                            (glade_file_path, lang_str, label.sourceline))
+                    glade_success = False
+                except PangoElementException as px:
+                    print("Invalid pango element %s at %s%s:%d" % \
+                            (px.element, glade_file_path, lang_str, label.sourceline))
+                    glade_success = False
+                else:
+                    if po_map:
+                        # Check that translated markup has the same elements and attributes
+                        if not markup_match(label.text, label_text):
+                            print("Translated markup does not contain the same elements and attributes at %s%s:%d" % \
+                                    (glade_file_path, lang_str, label.sourceline))
+                            glade_success = False
+    return glade_success
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Check Pango markup validity")
+    parser.add_argument("-t", "--translate", action='store_true',
+            help="Check translated strings")
+    parser.add_argument("-p", "--podir", action='store', type=str,
+            metavar='PODIR', help='Directory containing po files', default='./po')
+    parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE",
+            help='The glade file to check')
+    args = parser.parse_args(args=sys.argv[1:])
+
+    success = True
+    for file_path in args.glade_files:
+        if not check_glade_file(file_path):
+            success = False
+
+    # Now loop over all of the translations
+    if args.translate:
+        podicts = translate_all(args.podir)
+        for po_dict in podicts.values():
+            for file_path in args.glade_files:
+                if not check_glade_file(file_path, po_dict):
+                    success = False
+
+    sys.exit(0 if success else 1)
diff --git a/anaconda/tests/glade/pw_visibility/check_pw_visibility.py b/anaconda/tests/glade/pw_visibility/check_pw_visibility.py
new file mode 100644
index 0000000..0e9a99f
--- /dev/null
+++ b/anaconda/tests/glade/pw_visibility/check_pw_visibility.py
@@ -0,0 +1,90 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Vratislav Podzimek <vpodzime@redhat.com>
+#
+
+"""
+Simple python script checking that password GtkEntries in the given .glade files
+have the visibility set to False.
+
+"""
+
+import argparse
+import sys
+
+try:
+    from lxml import etree
+except ImportError:
+    print("You need to install the python-lxml package to use check_pw_visibility.py")
+    sys.exit(1)
+
+PW_ID_INDICATORS = ("pw", "password", "passwd", "passphrase")
+
+def check_glade_file(glade_file_path):
+    def check_entry(entry, fpath):
+        succ = True
+
+        entry_id = entry.attrib.get("id", "UNKNOWN ID")
+        visibility_props = entry.xpath("./property[@name='visibility']")
+
+        # no entry should have visibility specified multiple times
+        if len(visibility_props) > 1:
+            print("Visibility specified multiple times for the entry %s (%s)" % (entry_id, fpath))
+            succ = False
+
+        # password entry should have visibility set to False
+        if any(ind in entry_id.lower() for ind in PW_ID_INDICATORS):
+            if not visibility_props:
+                print("Visibility not specified for the password entry %s (%s)" % (entry_id, fpath))
+                succ = False
+            elif visibility_props[0].text.strip() != "False":
+                print("Visibility not set properly for the password entry %s (%s)" % (entry_id, fpath))
+                succ = False
+        # only password entries should have the visibility set to False
+        elif visibility_props and visibility_props[0].text.strip() == "False":
+            print("Non-password entry %s (%s) has the visibility set to False (bad id?)" % (entry_id, fpath))
+            succ = False
+
+        return succ
+
+    succ = True
+    with open(glade_file_path, "r") as glade_file:
+        tree = etree.parse(glade_file)
+        for entry in tree.xpath("//object[@class='GtkEntry']"):
+            succ = succ and check_entry(entry, glade_file_path)
+
+        return succ
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Check that password entries have visibility set to False")
+
+    # Ignore translation arguments
+    parser.add_argument("-t", "--translate", action='store_true',
+            help=argparse.SUPPRESS)
+    parser.add_argument("-p", "--podir", action='store', type=str,
+            metavar='PODIR', help=argparse.SUPPRESS, default='./po')
+
+    parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE",
+            help='The glade file to check')
+    args = parser.parse_args(args=sys.argv[1:])
+
+    success = True
+    for file_path in args.glade_files:
+        success = success and check_glade_file(file_path)
+
+    sys.exit(0 if success else 1)
diff --git a/anaconda/tests/glade/run_glade_tests.sh b/anaconda/tests/glade/run_glade_tests.sh
new file mode 100644
index 0000000..e197180
--- /dev/null
+++ b/anaconda/tests/glade/run_glade_tests.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+: "${top_srcdir:=$(dirname "$0")/../..}"
+. "${top_srcdir}/tests/testenv.sh"
+srcdir="${top_srcdir}/tests/glade"
+. "${top_srcdir}/tests/lib/testlib.sh"
+
+# If --translated was specified but not --podir, add --podir
+translate_set=0
+podir_set=0
+for arg in "$@" ; do
+    if [ "$arg" = "--translate" -o "$arg" = "-t" ]; then
+        translate_set=1
+    elif echo "$arg" | grep -q '^--podir\(=.*\)\?$' || [ "$arg" = "-p" ]; then
+        podir_set=1
+    fi
+done
+
+if [ "$translate_set" -eq 1 -a "$podir_set" -eq 0 ]; then
+    set -- "$@" --podir "${top_srcdir}/po"
+fi
+
+status=0
+for check in ${srcdir}/*/check_*.py ; do
+    findtestfiles -name '*.glade' | xargs "${check}" "$@"
+    if [ "$?" -ne 0 ]; then
+        status=1
+    fi
+done
+
+exit $status
diff --git a/anaconda/tests/glade/validity/check_glade_validity.py b/anaconda/tests/glade/validity/check_glade_validity.py
new file mode 100644
index 0000000..9a2c179
--- /dev/null
+++ b/anaconda/tests/glade/validity/check_glade_validity.py
@@ -0,0 +1,88 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+
+import sys
+import argparse
+
+from collections import Counter
+
+try:
+    from lxml import etree
+except ImportError:
+    print("You need to install the python-lxml package to run the glade checks")
+    sys.exit(99)
+
+success = True
+
+def main(argv):
+    global success
+
+    for glade_file in argv:
+        # Parse the glade file to ensure it's well-formed
+        try:
+            glade_tree = etree.parse(glade_file)
+        except etree.XMLSyntaxError:
+            print("%s is not a valid XML file" % glade_file)
+            success = False
+            continue
+
+        # Check for duplicate IDs
+        # Build a Counter from a list of all ids, extracts the ones with count > 1
+        # Fun fact: glade uses <col id="<number>"> in GtkListStore data, so ids
+        # aren't actually unique and getting an object with a particular ID
+        # isn't as simple as document.getElementById. Only check the IDs on objects.
+        for glade_id in [c for c in Counter(glade_tree.xpath(".//object/@id")).most_common() \
+                if c[1] > 1]:
+            print("%s: ID %s appears %d times" % (glade_file, glade_id[0], glade_id[1]))
+            success = False
+
+        # Check for ID references
+        # mnemonic_widget properties and action-widget elements need to refer to
+        # valid object ids.
+        for mnemonic_widget in glade_tree.xpath(".//property[@name='mnemonic_widget']"):
+            if not glade_tree.xpath(".//object[@id='%s']" % mnemonic_widget.text):
+                print("mnemonic_widget reference to invalid ID %s at line %d of %s" % \
+                        (mnemonic_widget.text, mnemonic_widget.sourceline, glade_file))
+                success = False
+
+        for action_widget in glade_tree.xpath(".//action-widget"):
+            if not glade_tree.xpath(".//object[@id='%s']" % action_widget.text):
+                print("action-widget reference to invalid ID %s at line %d of %s" % \
+                        (action_widget.text, action_widget.sourceline, glade_file))
+                success = False
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Check glade file validity")
+
+    # Ignore translation arguments
+    parser.add_argument("-t", "--translate", action='store_true',
+            help=argparse.SUPPRESS)
+    parser.add_argument("-p", "--podir", action='store', type=str,
+            metavar='PODIR', help=argparse.SUPPRESS, default='./po')
+
+    parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE",
+            help='The glade file to check')
+    args = parser.parse_args(args=sys.argv[1:])
+
+    main(args.glade_files)
+
+    if success:
+        sys.exit(0)
+    else:
+        sys.exit(1)
diff --git a/anaconda/tests/glade/viewport/check_viewport.py b/anaconda/tests/glade/viewport/check_viewport.py
new file mode 100644
index 0000000..fd75a1d
--- /dev/null
+++ b/anaconda/tests/glade/viewport/check_viewport.py
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+#
+
+"""
+Check that widgets that implement GtkScrollable are not placed within a
+GtkViewport. If a widget knows how to scroll itself we probably don't want
+to add an extra layer.
+"""
+
+import argparse
+import sys
+
+try:
+    from lxml import etree
+except ImportError:
+    print("You need to install the python-lxml package to use check_pw_visibility.py")
+    sys.exit(1)
+
+# I guess we could look at the introspected classes and see if they implement the Scrollable
+# interface but that sounds like kind of a pain
+SCROLLABLES = ["GtkIconView", "GtkLayout", "GtkTextView", "GtkToolPalette",
+               "GtkTreeView", "GtkViewport"]
+
+def check_glade_file(glade_file_path):
+    glade_success = True
+    with open(glade_file_path) as glade_file:
+        # Parse the XML
+        glade_tree = etree.parse(glade_file)
+
+        # Look for something like:
+        # <object class="GtkViewport">
+        #   <child>
+        #      <object class="GtkTreeView">
+        for scrollable in SCROLLABLES:
+            for element in glade_tree.xpath(".//object[@class='GtkViewport']/child/object[@class='%s']" % scrollable):
+                glade_success = False
+                print("%s contained in GtkViewport at %s:%d" % (scrollable, glade_file_path,
+                                                                element.sourceline))
+    return glade_success
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Check that password entries have visibility set to False")
+
+    # Ignore translation arguments
+    parser.add_argument("-t", "--translate", action='store_true',
+            help=argparse.SUPPRESS)
+    parser.add_argument("-p", "--podir", action='store', type=str,
+            metavar='PODIR', help=argparse.SUPPRESS, default='./po')
+
+    parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE",
+            help='The glade file to check')
+    args = parser.parse_args(args=sys.argv[1:])
+
+    success = True
+    for file_path in args.glade_files:
+        if not check_glade_file(file_path):
+            success = False
+
+    sys.exit(0 if success else 1)
diff --git a/anaconda/tests/gui/anaconda-autogui-testing.ks b/anaconda/tests/gui/anaconda-autogui-testing.ks
new file mode 100644
index 0000000..e54e711
--- /dev/null
+++ b/anaconda/tests/gui/anaconda-autogui-testing.ks
@@ -0,0 +1,45 @@
+%include /usr/share/spin-kickstarts/fedora-livecd-desktop.ks
+
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=x86_64
+
+shutdown
+network --bootproto=dhcp --activate --device=link
+rootpw qweqwe
+
+# Override dumb values from the spin-kickstarts.
+bootloader --location=mbr
+zerombr
+clearpart --all
+part / --fstype="ext4" --size=4400
+
+%post
+cat >> /etc/rc.d/init.d/livesys << EOF
+# Mount the attached disk containing test suite information.
+mkdir /mnt/anactest
+mount -L ANACTEST /mnt/anactest
+chown -R liveuser.liveuser /mnt/anactest
+
+if [ -f /usr/share/applications/anaconda.desktop ]; then
+    # Make anaconda start automatically.
+    if [ -f ~liveuser/.config/autostart/fedora-welcome.desktop ]; then
+        rm ~liveuser/.config/autostart/fedora-welcome.desktop
+    fi
+
+    cp /usr/share/applications/anaconda.desktop ~liveuser/.config/autostart/
+    sed -i -e '/Exec=/ s|/usr/bin/liveinst|python /mnt/anactest/suite.py|' ~liveuser/.config/autostart/anaconda.desktop
+
+    # Enable accessibility needed for testing.
+    cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.interface.gschema.override << FOE
+[org.gnome.desktop.interface]
+toolkit-accessibility=true
+FOE
+fi
+
+EOF
+%end
+
+%packages
+dogtail
+-@libreoffice
+-java*
+%end
diff --git a/anaconda/tests/gui/inside/__init__.py b/anaconda/tests/gui/inside/__init__.py
new file mode 100644
index 0000000..cf4cf90
--- /dev/null
+++ b/anaconda/tests/gui/inside/__init__.py
@@ -0,0 +1,182 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+from dogtail.config import config
+from dogtail.predicate import GenericPredicate
+from dogtail.tree import SearchError, root
+from dogtail.utils import doDelay, screenshot
+
+import glob
+import os
+import unittest
+
+class UITestCase(unittest.TestCase):
+    """A UITestCase is a class that incorporates all the test functions for a
+       single anaconda Hub or Spoke window.  Moving to the window, and dealing
+       with what happens after we move away is left up to whatever wraps up
+       all the test cases.  A single Hub or Spoke may have multiple instances
+       of this class - one may test the assumption that everything works as it
+       should, while another may test that a specific initial setup fails in
+       an expected way, and another may attempt fuzz testing on all entries on
+       the screen.  However, a single TestSuite will only have one instance
+       for each anaconda window.
+
+       Some basic assumptions about the existence of UI elements are made in
+       UITestCase subclasses.  If an element is required to be there (for
+       instance, a button we are going to click) we simply grab the element
+       with the exception-raising dogtail functions and call click on it.
+       If the element does not exist, the exception will be propagated up and
+       fail the test.  If we are testing for the existence of some element
+       (for instance, that a dialog was displayed after a button was clicked)
+       then we use UITestCase.find and the unittest.assert* functions.
+
+       This is kind of subtle, but look at existing test cases for examples.
+
+       Due to the unusual nature of running such a large program as anaconda
+       in a test suite, combined with the special environment, tests are
+       organized inside a UITestCase as follows:
+
+       * Testing one little piece of the window is handled by a check_*
+         function.  These are explicitly not named test_* as that is special
+         to unittest.
+
+       * Multiple check_* functions are called linearly in the _run method,
+         which is used instead of runTest for error handling purposes.
+    """
+
+    ###
+    ### OVERRIDES OF THINGS FROM TestCase
+    ###
+
+    def runTest(self):
+        """A version of TestCase.runTest that attempts to take a screenshot of
+           anaconda should a test fail.  Subclasses should not override this.
+           See the documentation for _run.
+        """
+        config.load({"scratchDir": "/mnt/anactest/result/"})
+
+        try:
+            self._run()
+        except (AssertionError, SearchError):
+            # Try to take a screenshot of whatever screen anaconda's on, so
+            # we can attempt to figure out what went wrong.
+            screenshot()
+            raise
+
+    def _run(self):
+        """Do all the tests for this test case.  This is like the TestCase.runTest
+           method, but we've overridden that to do more specialized error handling.
+           Thus, all testing should be done in this method.
+        """
+        pass
+
+    def setUp(self):
+        self.ana = root.application("anaconda")
+
+    ###
+    ### METHODS FOR FINDING WIDGETS
+    ###
+
+    def find(self, name, roleName=None):
+        """Wrap findChild, returning None if no widget is found instead of
+           raising an exception.  This method also allows for checking if
+           anaconda has hit a traceback and if so, fails the test
+           immediately.
+        """
+        if len(glob.glob("/tmp/anaconda-tb-*")) > 0:
+            self.fail("anaconda encountered a traceback")
+
+        try:
+            return self.ana.child(name=name, roleName=roleName)
+        except SearchError:
+            return None
+
+    ###
+    ### METHODS FOR CHECKING A SINGLE WIDGET
+    ###
+
+    def check_window_displayed(self, name):
+        """Verify that a window (such as a hub or spoke) given by the
+           provided name is currently displayed on the screen.  If not,
+           the current test case will be failed.
+        """
+        w = self.find(name)
+        self.assertIsNotNone(w, msg="%s not found" % name)
+        self.assertTrue(w.showing, msg="%s is not displayed" % name)
+
+    def check_dialog_displayed(self, name):
+        """Verify that a dialog given by the provided name is currently
+           displayed on the screen.  If not, the current test case will
+           be failed.
+        """
+        w = self.find(name, "dialog")
+        self.assertIsNotNone(w, msg="%s not found" % name)
+        self.assertTrue(w.showing, msg="%s is not displayed" % name)
+
+    def check_keyboard_layout_indicator(self, layout):
+        """Verify that the keyboard layout indicator is present and that
+           the currently enabled layout is what we expect.  If not, the
+           current test case will be failed.
+        """
+        indicator = self.find("Keyboard Layout")
+        self.assertIsNotNone(indicator, msg="keyboard layout indicator not found")
+        self.assertEqual(indicator.description, layout,
+                         msg="keyboard layout indicator not set to %s" % layout)
+
+    def check_no_warning_bar(self):
+        """Verify that the warning bar is not currently displayed."""
+        self.assertIsNone(self.find("Warning"), msg="Warning bar should not be displayed")
+
+    def check_warning_bar(self, msg=None):
+        """Verify that the warning bar is currently displayed.  If msg is given,
+           verify that it is contained in whatever message the warning bar is
+           showing.
+        """
+        bar = self.find("Warning")
+        self.assertTrue(bar.showing, msg="Warning bar should be displayed")
+        if msg:
+            self.assertIn(msg, bar.child(roleName="label").text)
+
+    def click_button(self, name):
+        """Verify that a button with the given name exists and is sensitive,
+           and then click it.
+        """
+        b = self.find(name, "push button")
+        self.assertIsNotNone(b, msg="%s button not found" % name)
+        self.assertTrue(b.sensitive, msg="%s button should be sensitive" % name)
+        b.click()
+
+    def enter_spoke(self, spokeSelectorName):
+        """Click on the spoke selector for the given spoke, then wait a moment
+           to make sure it has appeared.
+        """
+        selector = self.find(spokeSelectorName, "spoke selector")
+        self.assertIsNotNone(selector, msg="Selector %s not found" % spokeSelectorName)
+        selector.click()
+
+    def exit_spoke(self, hubName="INSTALLATION SUMMARY"):
+        """Leave a spoke by clicking the Done button in the upper left corner,
+           then verify we have returned to the proper hub.  Since most spokes
+           are off the summary hub, that's the default.  If we are not back
+           on the hub, the current test case will be failed.
+        """
+        button = self.find("_Done", "push button")
+        self.assertIsNotNone(button, msg="Done button not found")
+        button.click()
+        doDelay(5)
+        self.check_window_displayed(hubName)
diff --git a/anaconda/tests/gui/inside/date_time.py b/anaconda/tests/gui/inside/date_time.py
new file mode 100644
index 0000000..b7cc72e
--- /dev/null
+++ b/anaconda/tests/gui/inside/date_time.py
@@ -0,0 +1,59 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from . import UITestCase
+
+class LiveCDDateTimeTestCase(UITestCase):
+    def check_region_city(self):
+        # FIXME:  This encodes default information.
+        entry = self.find("Region", "text")
+        self.assertIsNotNone(entry, "Region entry does not exist")
+        self.assertEqual(entry.text, "Americas", msg="Region should be set to default")
+
+        entry = self.find("City", "text")
+        self.assertIsNotNone(entry, "City entry does not exist")
+        self.assertEqual(entry.text, "New York", msg="City should be set to default")
+
+    def check_ntp(self):
+        # NTP should be enabled given that we started up with networking.
+        # FIXME:  This encodes default information.
+        button = self.find("Use Network Time", "toggle button")
+        self.assertIsNotNone(button, msg="Use Network Time button not found")
+        self.assertTrue(button.checked, msg="NTP should be enabled")
+
+        button = self.find("Configure NTP", "push button")
+        self.assertIsNotNone(button, msg="Configure NTP button not found")
+        self.assertTrue(button.sensitive, msg="Configure NTP button should be sensitive")
+
+        area = self.find("Set Date & Time")
+        self.assertIsNotNone(area, msg="Set Date & Time not found")
+        self.assertFalse(area.sensitive, msg="Date & Time region should not be sensitive")
+
+    def _run(self):
+        # First, we need to click on the network spoke selector.
+        self.enter_spoke("DATE & TIME")
+
+        # Now verify we are on the right screen.
+        self.check_window_displayed("DATE & TIME")
+
+        # And now we can check everything else on the screen.
+        self.check_region_city()
+        self.check_ntp()
+
+        # And then we click the Done button to go back to the hub, verifying
+        # that's where we ended up.
+        self.exit_spoke()
diff --git a/anaconda/tests/gui/inside/keyboard.py b/anaconda/tests/gui/inside/keyboard.py
new file mode 100644
index 0000000..b57773b
--- /dev/null
+++ b/anaconda/tests/gui/inside/keyboard.py
@@ -0,0 +1,127 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from dogtail.predicate import GenericPredicate
+
+from . import UITestCase
+
+class BasicKeyboardTestCase(UITestCase):
+    def _get_enabled_layouts(self, view):
+        return [child.text for child in view.findChildren(GenericPredicate(roleName="table cell"))]
+
+    def check_options_dialog(self):
+        # Click the options button.
+        self.click_button("Options")
+        self.check_dialog_displayed("Layout Options")
+        self.click_button("Cancel")
+
+    def check_num_layouts(self):
+        # There ought to be only one layout enabled right now.
+        # FIXME:  This encodes default information.
+        view = self.find("Selected Layouts")
+        self.assertIsNotNone(view, "Selected Layouts view not found")
+        self.assertEqual(len(self._get_enabled_layouts(view)), 1, msg="An unexpected number of keyboard layouts are enabled")
+
+    def check_layout_buttons_initial(self):
+        button = self.find("Add layout", "push button")
+        self.assertIsNotNone(button, msg="Add layout button not found")
+        self.assertTrue(button.sensitive, msg="Add layout button should be sensitive")
+
+        # When no layouts are selected in the view, none of these buttons mean anything.
+        button = self.find("Remove layout", "push button")
+        self.assertIsNotNone(button, msg="Remove layout button not found")
+        self.assertFalse(button.sensitive, msg="Remove layout button should not be sensitive")
+
+        button = self.find("Move selected layout up", "push button")
+        self.assertIsNotNone(button, msg="Move layout up button not found")
+        self.assertFalse(button.sensitive, msg="Move layout up button should not be sensitive")
+
+        button = self.find("Move selected layout down", "push button")
+        self.assertIsNotNone(button, msg="Move layout down button not found")
+        self.assertFalse(button.sensitive, msg="Move layout down button should not be sensitive")
+
+        button = self.find("Preview layout", "push button")
+        self.assertIsNotNone(button, msg="Preview layout button not found")
+        self.assertFalse(button.sensitive, msg="Preview layout button should not be sensitive")
+
+    def check_add_layout_dialog(self):
+        self.click_button("Add layout")
+        self.check_dialog_displayed("Add Layout")
+        self.click_button("Cancel")
+
+    def check_layout_buttons_after_click(self):
+        # Click on the first (and only) layout shown in the view.  This
+        # ensures buttons change sensitivity.
+        # FIXME:  This encodes default information.
+        view = self.find("Selected Layouts")
+        self.assertIsNotNone(view, msg="Selected Layouts view not found")
+        view.children[1].click()
+
+        button = self.find("Add layout", "push button")
+        self.assertIsNotNone(button, msg="Add layout button not found")
+        self.assertTrue(button.sensitive, msg="Add layout button should be sensitive")
+
+        button = self.find("Remove layout", "push button")
+        self.assertIsNotNone(button, msg="Remove layout button not found")
+        self.assertTrue(button.sensitive, msg="Remove layout button should be sensitive")
+
+        # These two should still not be sensitive - we've only got one layout.
+        # We ensured that with check_num_layouts.
+        # FIXME:  This encodes default information.
+        button = self.find("Move selected layout up", "push button")
+        self.assertIsNotNone(button, msg="Move layout up button not found")
+        self.assertFalse(button.sensitive, msg="Move layout up button should not be sensitive")
+
+        button = self.find("Move selected layout down", "push button")
+        self.assertIsNotNone(button, msg="Move layout down button not found")
+        self.assertFalse(button.sensitive, msg="Move layout down button should not be sensitive")
+
+        button = self.find("Preview layout", "push button")
+        self.assertIsNotNone(button, msg="Preview layout button not found")
+        self.assertTrue(button.sensitive, msg="Preview layout button should be sensitive")
+
+    def check_preview_dialog(self):
+        self.click_button("Preview layout")
+
+        # Verify the preview dialog is displayed.  The dialog out to be titled
+        # with the name of the current layout.  We happen to know that - it's
+        # the default.
+        # FIXME:  This encodes default information.
+        self.check_dialog_displayed("English (US)")
+
+        self.click_button("Close")
+
+    def _run(self):
+        # First, we need to click on the network spoke selector.
+        self.enter_spoke("KEYBOARD")
+
+        # Now verify we are on the right screen.
+        self.check_window_displayed("KEYBOARD")
+
+        # And now we can check everything else on the screen.
+        self.check_options_dialog()
+        self.check_num_layouts()
+        self.check_layout_buttons_initial()
+        self.check_add_layout_dialog()
+
+        # Once a layout has been selected in the view, we can test these other buttons.
+        self.check_layout_buttons_after_click()
+        self.check_preview_dialog()
+
+        # And then we click the Done button to go back to the hub, verifying
+        # that's where we ended up.
+        self.exit_spoke()
diff --git a/anaconda/tests/gui/inside/network.py b/anaconda/tests/gui/inside/network.py
new file mode 100644
index 0000000..6398230
--- /dev/null
+++ b/anaconda/tests/gui/inside/network.py
@@ -0,0 +1,49 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from . import UITestCase
+
+class LiveCDNetworkTestCase(UITestCase):
+    def check_hostname_entry(self):
+        # Only the live install hint and hostname box should be visible.
+        self.assertTrue(self.find("Please use the live desktop environment's tools for customizing your network configuration.  You can set the hostname here.").showing)
+
+        box = self.find("Network Config Box")
+        self.assertIsNotNone(box, "Network Config box not found")
+        self.assertFalse(box.showing, msg="Network Config box should not be displayed")
+
+        box = self.find("More Network Config Box")
+        self.assertIsNotNone(box, "More Network Config box not found")
+        self.assertFalse(box.showing, msg="More Network Config box should not be displayed")
+
+        entry = self.find("Hostname", "text")
+        self.assertIsNotNone(entry , "Hostname entry not found")
+        self.assertTrue(entry.showing, msg="Hostname entry should be displayed")
+
+    def _run(self):
+        # First, we need to click on the network spoke selector.
+        self.enter_spoke("NETWORK & HOSTNAME")
+
+        # Now verify we are on the right screen.
+        self.check_window_displayed("NETWORK & HOSTNAME")
+
+        # And now we can check everything else on the screen.
+        self.check_hostname_entry()
+
+        # And then we click the Done button to go back to the hub, verifying
+        # that's where we ended up.
+        self.exit_spoke()
diff --git a/anaconda/tests/gui/inside/progress.py b/anaconda/tests/gui/inside/progress.py
new file mode 100644
index 0000000..5d9976b
--- /dev/null
+++ b/anaconda/tests/gui/inside/progress.py
@@ -0,0 +1,122 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+import signal
+
+from dogtail.predicate import GenericPredicate
+from dogtail.utils import doDelay
+from . import UITestCase
+
+class LiveCDProgressTestCase(UITestCase):
+    def check_begin_installation_button(self):
+        button = self.find("Begin Installation", "push button")
+        self.assertIsNotNone(button, msg="Begin Installation button does not exist")
+        self.assertTrue(button.sensitive, msg="Begin Installation button should be sensitive")
+
+    def check_shown_spoke_selectors(self):
+        # FIXME:  This forces English.
+        validSelectors = ["ROOT PASSWORD", "USER CREATION"]
+        selectors = self.ana.findChildren(GenericPredicate(roleName="spoke selector"))
+
+        self.assertEqual(len(selectors), len(validSelectors), msg="Incorrect number of spoke selectors shown")
+
+        # Validate that only the spoke selectors we expect are shown.  At the same time,
+        # we can also validate the status of each selector.  This only validates the
+        # initial state of everything.  Once we start clicking on spokes, things are
+        # going to change.
+        # FIXME:  This encodes default information.
+        for selector in selectors:
+            if selector.name == "ROOT PASSWORD":
+                self.assertEqual(selector.description, "Root password is not set")
+            elif selector.name == "USER CREATION":
+                self.assertEqual(selector.description, "No user will be created")
+            else:
+                self.fail("Invalid spoke selector shown on livecd: %s" % selector.name)
+
+    def _timer_expired(self, signum, frame):
+        self.fail("anaconda did not finish in 30 minutes")
+
+    def _run(self):
+        # Before doing anything, verify we are still on the summary hub.
+        self.check_window_displayed("INSTALLATION SUMMARY")
+        # All spokes should have been visited and satisfied now.
+        self.check_no_warning_bar()
+        self.check_begin_installation_button()
+
+        # Click the begin installation button, wait a moment, and now we should
+        # be on the progress hub.
+        self.click_button("Begin Installation")
+        self.check_window_displayed("CONFIGURATION")
+
+        self.check_shown_spoke_selectors()
+        self.check_warning_bar()
+
+        # Now we need to wait for installation to finish.  We're doing that two ways:
+        # (1) Set a 30 minute timeout.  Should we hit that, anaconda's clearly not
+        #     going to finish (or is hung or something) and we should fail.
+        # (2) Poll the UI waiting for the "Complete!" message to pop up.  Once
+        #     that happens, we know it's time to test the user settings stuff and
+        #     the end of the UI.
+        signal.signal(signal.SIGALRM, self._timer_expired)
+        signal.alarm(30*60)
+
+        while True:
+            label = self.find("Complete!")
+            if label:
+                signal.alarm(0)
+                break
+
+            doDelay(20)
+
+        # If we got here, installation completed successfully.  Since we've not
+        # done a password or created a user yet, we still have to do that.  The
+        # finish configuration button should still be insensitive.
+        button = self.find("Finish configuration", "push button")
+        self.assertIsNotNone(button, msg="Finish configuration button not found")
+        self.assertFalse(button.sensitive, msg="Finish Configuration button should not be sensitive")
+
+class LiveCDFinishTestCase(UITestCase):
+    def check_finish_config_button(self):
+        # Click the Finish Configuration button.
+        self.click_button("Finish configuration")
+
+    def _timer_expired(self, signum, frame):
+        self.fail("anaconda did not finish in 5 minutes")
+
+    def _run(self):
+        # Before doing anything, verify we are still on the progress hub.
+        self.check_window_displayed("CONFIGURATION")
+
+        self.check_finish_config_button()
+        # We've completed configuration, so the warning bar should be gone.
+        self.check_no_warning_bar()
+
+        # And now we wait for configuration to finish.  Then we check the
+        # reboot button, but don't click it.  The end of the test case shuts
+        # down the system for us.
+        signal.signal(signal.SIGALRM, self._timer_expired)
+        signal.alarm(5*60)
+
+        while True:
+            button = self.find("Quit", "push button")
+            if button:
+                signal.alarm(0)
+                break
+
+            doDelay(20)
+
+        self.click_button("Quit")
diff --git a/anaconda/tests/gui/inside/rootpassword.py b/anaconda/tests/gui/inside/rootpassword.py
new file mode 100644
index 0000000..c703e8a
--- /dev/null
+++ b/anaconda/tests/gui/inside/rootpassword.py
@@ -0,0 +1,66 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from dogtail.utils import doDelay
+
+from . import UITestCase
+
+class BasicRootPasswordTestCase(UITestCase):
+    def check_enter_password(self):
+        # The warning bar starts off telling us there's no password set.
+        self.check_warning_bar("The password is empty")
+
+        entry = self.find("Password", "text")
+        self.assertIsNotNone(entry, msg="Password entry should be displayed")
+        entry.grabFocus()
+        entry.text = "asdfasdf"
+
+        # That wasn't a very good password and we haven't confirmed it, so the
+        # bar is still displayed at the bottom.
+        doDelay(1)
+        self.check_warning_bar("it does not contain enough DIFFERENT characters")
+
+        # Let's confirm that terrible password.
+        entry = self.find("Confirm Password", "text")
+        self.assertIsNotNone(entry, msg="Confirm password should be displayed")
+        entry.grabFocus()
+        entry.text = "asdfasdf"
+
+        # But of course it's still a terrible password, so the bar is still
+        # displayed at the bottom.
+        doDelay(1)
+        self.check_warning_bar("it does not contain enough DIFFERENT characters")
+
+    def check_click_done(self):
+        # Press the Done button once, which won't take us anywhere but will change the
+        # warning label at the bottom.
+        self.click_button("_Done")
+        self.check_warning_bar("Press Done again")
+
+        # Pressing Done again should take us back to the progress hub.
+        self.exit_spoke(hubName="CONFIGURATION")
+
+    def _run(self):
+        # First, we need to click on the spoke selector.
+        self.enter_spoke("ROOT PASSWORD")
+
+        # Now, verify we are on the right screen.
+        self.check_window_displayed("ROOT PASSWORD")
+
+        # And now we can check everything else on the screen.
+        self.check_enter_password()
+        self.check_click_done()
diff --git a/anaconda/tests/gui/inside/storage.py b/anaconda/tests/gui/inside/storage.py
new file mode 100644
index 0000000..28768dd
--- /dev/null
+++ b/anaconda/tests/gui/inside/storage.py
@@ -0,0 +1,101 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from dogtail.predicate import GenericPredicate
+
+from . import UITestCase
+
+class BasicStorageTestCase(UITestCase):
+    def check_select_disks(self):
+        # FIXME:  This is a really roundabout way of determining whether a disk is
+        # selected or not.  For some reason when a DiskOverview is selected, its icon
+        # loses the name "Hard Disk".  For now, we can use this to check.
+        def _selected(do):
+            return len(do.findChildren(GenericPredicate(name="Hard Disk"))) == 0
+
+        # A real disk is any disk attached to the VM that's not the special 10 MB
+        # one used for communicating in and out of the VM.  Therefore, scan all
+        # children of the DiskOverview looking for one whose name contains that
+        # size.
+        def _real_disk(do):
+            for child in do.findChildren(GenericPredicate()):
+                if child.name.startswith("10."):
+                    return False
+
+            return True
+
+        # There should be some disks displayed on the screen.
+        overviews = self.ana.findChildren(GenericPredicate(roleName="disk overview"))
+        self.assertGreater(len(overviews), 0, msg="No disks are displayed")
+
+        if len(overviews) == 1:
+            # Only one disk was given to this test case, so anaconda selected it
+            # by default.  Verify.  Not sure how this would happen with how
+            # testing is currently done, but it's good to be prepared.
+            self.assertTrue(_selected(overviews[0]))
+        else:
+            # More than one disk was provided, so anaconda did not select any.
+            # Let's select all disks and proceed.
+            for overview in filter(_real_disk, overviews):
+                self.assertFalse(_selected(overview))
+                overview.click()
+                self.assertTrue(_selected(overview))
+
+    def check_shopping_cart(self):
+        pass
+
+    def check_storage_options(self):
+        button = self.find("Automatically configure partitioning.", "radio button")
+        self.assertIsNotNone(button, msg="Autopart button not found")
+        self.assertTrue(button.checked, msg="Autopart should be selected")
+
+        button = self.find("I would like to make additional space available.", "check box")
+        self.assertIsNotNone(button, msg="Reclaim button not found")
+        self.assertFalse(button.checked, msg="Reclaim button should not be selected")
+
+        button = self.find("Encrypt my data.", "check box")
+        self.assertIsNotNone(button, msg="Encrypt button not found")
+        self.assertFalse(button.checked, msg="Encrypt button should not be selected")
+
+    def _run(self):
+        # First, we need to click on the network spoke selector.
+        self.enter_spoke("INSTALLATION DESTINATION")
+
+        # Now verify we are on the right screen.
+        self.check_window_displayed("INSTALLATION DESTINATION")
+
+        # Given that we attach a second disk to the system (for storing the test
+        # suite and results), anaconda will not select disks by default.  Thus,
+        # the storage options panel should currently be insensitive.
+        area = self.find("Storage Options")
+        self.assertIsNotNone(area, "Storage Options not found")
+        self.assertFalse(area.sensitive, msg="Storage options should be insensitive")
+
+        # Select disk overviews.  In the basic case, this means uninitialized
+        # disks that we're going to do autopart on.
+        self.check_select_disks()
+
+        # And now with disks selected, the storage options should be sensitive.
+        self.assertTrue(area.sensitive, msg="Storage options should be sensitive")
+
+        self.check_shopping_cart()
+        self.check_storage_options()
+
+        # And then we click the Done button which should take the user right back to
+        # the hub.  There's no need to display any other dialogs given that this is
+        # an install against empty disks and no other options were checked.
+        self.exit_spoke()
diff --git a/anaconda/tests/gui/inside/summary.py b/anaconda/tests/gui/inside/summary.py
new file mode 100644
index 0000000..46c25ab
--- /dev/null
+++ b/anaconda/tests/gui/inside/summary.py
@@ -0,0 +1,81 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+from dogtail.predicate import GenericPredicate
+from dogtail.utils import doDelay
+
+from . import UITestCase
+
+# This test case handles the livecd case on the summary hub where everything
+# works as intended.  On this spoke, we are testing the following:
+#
+# * Clicking the Quit button brings up a dialog asking if you're sure, though
+#   we're not going to test that confirming actually quits.
+# * The Begin Installation button is insensitive, since no disks have yet
+#   been selected.
+# * Only the Date & Time, Keyboard, Installation Destination, and Network Config
+#   spoke selectors are visible.
+
+class LiveCDSummaryTestCase(UITestCase):
+    def check_quit_button(self):
+        self.click_button("Quit")
+        self.check_dialog_displayed("Quit")
+        self.click_button("No")
+
+    def check_begin_installation_button(self):
+        button = self.find("Begin Installation", "push button")
+        self.assertIsNotNone(button, msg="Begin Installation button not found")
+        self.assertTrue(button.showing, msg="Begin Installation button should be displayed")
+        self.assertFalse(button.sensitive, msg="Begin Installation button should not be sensitive")
+
+    def check_shown_spoke_selectors(self):
+        # FIXME:  This forces English.
+        validSelectors = ["DATE & TIME", "KEYBOARD", "INSTALLATION DESTINATION", "NETWORK & HOSTNAME"]
+        selectors = self.ana.findChildren(GenericPredicate(roleName="spoke selector"))
+
+        self.assertEqual(len(selectors), len(validSelectors), msg="Incorrect number of spoke selectors shown")
+
+        # Validate that only the spoke selectors we expect are shown.  At the same time,
+        # we can also validate the status of each selector.  This only validates the
+        # initial state of everything.  Once we start clicking on spokes, things are
+        # going to change.
+        # FIXME:  This encodes default information.
+        for selector in selectors:
+            if selector.name == "DATE & TIME":
+                self.assertEqual(selector.description, "Americas/New York timezone")
+            elif selector.name == "KEYBOARD":
+                self.assertEqual(selector.description, "English (US)")
+            elif selector.name == "INSTALLATION DESTINATION":
+                # We don't know how many disks are going to be involved - if there's
+                # just one, anaconda selects it by default.  If there's more than
+                # one, it selects none.
+                self.assertIn(selector.description, ["Automatic partitioning selected",
+                                                     "No disks selected"])
+            elif selector.name == "NETWORK & HOSTNAME":
+                self.assertRegexpMatches(selector.description, "Wired (.+) connected")
+            else:
+                self.fail("Invalid spoke selector shown on livecd: %s" % selector.name)
+
+    def _run(self):
+        # Before doing anything, verify we are on the right screen.
+        doDelay(5)
+        self.check_window_displayed("INSTALLATION SUMMARY")
+
+        # And now we can check everything else on the screen.
+        self.check_quit_button()
+        self.check_begin_installation_button()
+        self.check_shown_spoke_selectors()
+        self.check_warning_bar()
diff --git a/anaconda/tests/gui/inside/user.py b/anaconda/tests/gui/inside/user.py
new file mode 100644
index 0000000..137ed90
--- /dev/null
+++ b/anaconda/tests/gui/inside/user.py
@@ -0,0 +1,74 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from . import UITestCase
+
+class BasicUserTestCase(UITestCase):
+    def check_enter_name(self):
+        entry = self.find("Full Name", "text")
+        self.assertIsNotNone(entry, msg="Full name entry not found")
+        entry.grabFocus()
+        entry.text = "Bobby Good User"
+
+        # We base the username on the full name entered
+        entry = self.find("Username", "text")
+        self.assertIsNotNone(entry, msg="Username entry not found")
+        self.assertEqual(entry.text, "buser", msg="Generated username does not match expectation")
+
+    def check_enter_password(self):
+        # The warning bar starts off telling us there's no password set.
+        self.check_warning_bar("The password is empty")
+
+        entry = self.find("Password", "text")
+        self.assertIsNotNone(entry, msg="Password entry should be displayed")
+        entry.grabFocus()
+        entry.text = "asdfasdf"
+
+        # That wasn't a very good password and we haven't confirmed it, so the
+        # bar is still displayed at the bottom.
+        self.check_warning_bar("it does not contain enough DIFFERENT characters")
+
+        # Let's confirm that terrible password.
+        entry = self.find("Confirm Password", "text")
+        self.assertIsNotNone(entry, msg="Confirm password should be displayed")
+        entry.grabFocus()
+        entry.text = "asdfasdf"
+
+        # But of course it's still a terrible password, so the bar is still
+        # displayed at the bottom.
+        self.check_warning_bar("it does not contain enough DIFFERENT characters")
+
+    def check_click_done(self):
+        # Press the Done button once, which won't take us anywhere but will change the
+        # warning label at the bottom.
+        self.click_button("_Done")
+        self.check_warning_bar("Press Done again")
+
+        # Pressing Done again should take us back to the progress hub.
+        self.exit_spoke(hubName="CONFIGURATION")
+
+    def _run(self):
+        # First, we need to click on the spoke selector.
+        self.enter_spoke("USER CREATION")
+
+        # Now, verify we are on the right screen.
+        self.check_window_displayed("CREATE USER")
+
+        # And now we can check everything else on the screen.
+        self.check_enter_name()
+        self.check_enter_password()
+        self.check_click_done()
diff --git a/anaconda/tests/gui/inside/welcome.py b/anaconda/tests/gui/inside/welcome.py
new file mode 100644
index 0000000..86dae38
--- /dev/null
+++ b/anaconda/tests/gui/inside/welcome.py
@@ -0,0 +1,64 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from . import UITestCase
+
+# This test case handles the basic case on the welcome language spoke where
+# everything works as intended.  On this spoke, we are testing the following:
+#
+#   * The default language and locale are selected and displayed at the top
+#     of their views.
+#   * Clicking the Quit button brings up a dialog asking if you're sure, though
+#     we're not going to test that confirming actually quits.
+#   * Clicking the Continue button brings up the betanag dialog, though we're
+#     not going to test the quit button there either.
+#
+# TODO:
+#   * Entering text into the search box should result in narrowing down the
+#     contents of the left hand view.
+
+class BasicWelcomeTestCase(UITestCase):
+    def check_lang_locale_views(self):
+        # FIXME:  This encodes default information.
+#        lang = "English"
+#        locale = "English (United States)"
+
+        return
+#        self.assertEqual(ldtp.verifytablecell("frmWelcome", "tblLanguages", 0, 0, lang), 1,
+#                         msg="Default language (%s) is not selected" % lang)
+#        self.assertEqual(ldtp.verifytablecell("frmWelcome", "tblLocales", 0, 0, locale), 1,
+#                         msg="Default locale (%s) is not selected")
+
+    def check_quit_button(self):
+        self.click_button("_Quit")
+        self.check_dialog_displayed("Quit")
+        self.click_button("No")
+
+    def check_continue_button(self):
+        self.click_button("_Continue")
+        self.check_dialog_displayed("Beta Warn")
+        self.click_button("I accept my fate.")
+
+    def _run(self):
+        # Before doing anything, verify we are on the right screen.
+        self.check_window_displayed("WELCOME")
+
+        # And now we can check everything else on the screen.
+        self.check_keyboard_layout_indicator("us")
+        self.check_lang_locale_views()
+        self.check_quit_button()
+        self.check_continue_button()
diff --git a/anaconda/tests/gui/make_livecd.sh b/anaconda/tests/gui/make_livecd.sh
new file mode 100644
index 0000000..0709a11
--- /dev/null
+++ b/anaconda/tests/gui/make_livecd.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens@redhat.com>
+
+if [[ $# != 3 ]]; then
+    echo "usage: $0 <boot.iso> <resultdir> <repo URL>"
+    exit 1
+fi
+
+if [ ! -f "$1" ]; then
+    echo "Required boot.iso does not exist."
+    exit 2
+fi
+
+if [ -d "$2" ]; then
+    echo "results dir should not already exist."
+    exit 3
+fi
+
+if [ ! -e /usr/share/lorax ]; then
+    echo "Required lorax templates do not exist.  Install the lorax package?"
+    exit 4
+fi
+
+if [ ! -e anaconda-autogui-testing.ks ]; then
+    echo "anaconda-autogui-testing.ks not found."
+    exit 5
+fi
+
+ISO="$1"
+RESULTSDIR="$2"
+REPO="$3"
+
+# While we can remove a lot of the dumb defaults we inherit from the spin
+# kickstart files by overriding them with other kickstart commands, some
+# things we can't.  The following sed lines take care of these:
+#
+# (1) Remove the first two / partitions we inherit.
+# (2) Remove rawhide as a repo because it's already the installation source.
+# (3) Don't remove /boot/initramfs*.  Do what now?
+ksflatten -c anaconda-autogui-testing.ks | sed -e '\|part /.*--size=3.*|,+1 d' \
+                                               -e '/repo --name="rawhide"/ d' \
+                                               -e '/^# save a little/,+1 d' > livecd.ks
+
+# Add a repo location for the updated anaconda RPMs.
+echo -e "\nrepo --name=updated-anaconda --baseurl=${REPO}\n" >> livecd.ks
+
+# And then we want to use our own lorax template files in order to adjust
+# the boot configuration:
+#
+# (1) Shorten the timeout by a bunch.
+# (2) Change the default boot target away from media check.
+TEMPLATES=$(mktemp -d)
+cp -r /usr/share/lorax/* ${TEMPLATES}
+sed -i -e 's/timeout 600/timeout 60/' \
+       -e '/label linux/ a\
+  menu default' \
+       -e '/menu default/ d' ${TEMPLATES}/live/config_files/x86/isolinux.cfg
+
+livemedia-creator --make-iso \
+                  --iso "${ISO}" \
+                  --title Fedora \
+                  --project Fedora \
+                  --releasever 21 \
+                  --tmp /var/tmp \
+                  --resultdir "${RESULTSDIR}" \
+                  --ks livecd.ks \
+                  --vnc vnc \
+                  --lorax-templates ${TEMPLATES} \
+                  --ram 2048 \
+                  --vcpus 2
+rm livecd.ks
+rm -r ${TEMPLATES}
diff --git a/anaconda/tests/gui/outside/__init__.py b/anaconda/tests/gui/outside/__init__.py
new file mode 100644
index 0000000..4a1d9fc
--- /dev/null
+++ b/anaconda/tests/gui/outside/__init__.py
@@ -0,0 +1,294 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+__all__ = ["Creator", "OutsideMixin"]
+
+import blivet
+
+from contextlib import contextmanager
+import os
+import shutil
+import subprocess
+import tempfile
+import unittest
+import errno
+
+# Copied from python's subprocess.py
+def eintr_retry_call(func, *args):
+    """Retry an interruptible system call if interrupted."""
+    while True:
+        try:
+            return func(*args)
+        except (OSError, IOError) as e:
+            if e.errno == errno.EINTR:
+                continue
+            raise
+
+class Creator(object):
+    """A Creator subclass defines all the parameters for making a VM to run a
+       test against as well as handles creating and running that VM, inspecting
+       results, and managing temporary data.
+
+       Most Creator subclasses will only need to define the following four
+       attributes:
+
+       drives       -- A list of tuples describing disk images to create.  Each
+                       tuple is the name and size, in GB.
+       environ      -- A dictionary of environment variables that should be added
+                       to the environment the test suite will run under.
+       name         -- A unique string that names a Creator.  This name will
+                       be used in creating the results directory (and perhaps
+                       other places in the future) so make sure it doesn't
+                       conflict with another object.
+       reqMemory    -- The amount of memory this VM needs, in MB.  The default
+                       is 2048, which seems to be the minimum required to
+                       make things run quickly.  Redefine if you need more.
+       tests        -- A list of tuples describing which test cases make up
+                       this test.  Each tuple is the name of the module
+                       containing the test case (minus the leading "inside."
+                       and the name of the test case class.  Tests will be
+                       run in the order provided.
+    """
+    drives = []
+    environ = {}
+    name = "Creator"
+    reqMemory = 2048
+    tests = []
+
+    def __init__(self):
+        self._drivePaths = {}
+        self._mountpoint = None
+        self._proc = None
+        self._tempdir = None
+
+    def archive(self):
+        """Copy all log files and other test results to a subdirectory of the
+           given resultsdir.  If logs are no longer available, this method
+           does nothing.  It is up to the caller to make sure logs are available
+           beforehand and clean up afterwards.
+        """
+        from testconfig import config
+
+        if not os.path.ismount(self.mountpoint):
+            return
+
+        shutil.copytree(self.mountpoint + "/result", config["resultsdir"] + "/" + self.name)
+
+    def cleanup(self):
+        """Remove all disk images used during this test case and the temporary
+           directory they were stored in.
+        """
+        shutil.rmtree(self.tempdir, ignore_errors=True)
+        os.unlink(self._drivePaths["suite"])
+
+    def die(self):
+        """Kill any running qemu process previously started by this test."""
+        if self._proc:
+            self._proc.kill()
+            self._proc = None
+
+    def makeDrives(self):
+        """Create all hard drive images associated with this test.  Images
+           must be listed in Creator.drives and will be stored in a temporary
+           directory this method creates.  It is up to the caller to remove
+           everything later by calling Creator.cleanup.
+        """
+        for (drive, size) in self.drives:
+            (fd, diskimage) = tempfile.mkstemp(dir=self.tempdir)
+            eintr_retry_call(os.close, fd)
+
+            subprocess.call(["/usr/bin/qemu-img", "create", "-f", "qcow2", diskimage, "%sG" % size],
+                            stdout=open("/dev/null", "w"))
+            self._drivePaths[drive] = diskimage
+
+    @property
+    def template(self):
+        with open("outside/template.py", "r") as f:
+            return f.read()
+
+    def makeSuite(self):
+        """The suite is a small disk image attached to every test VM automatically
+           by the test framework.  It includes all the inside/ stuff, a special
+           suite.py file that will be automatically run by the live CD (and is
+           what actually runs the test), and a directory structure for reporting
+           results.
+
+           It is mounted under Creator.mountpoint as needed.
+
+           This method creates the suite image and adds it to the internal list of
+           images associated with this test.
+
+           Note that because this image is attached to the VM, anaconda will always
+           see two hard drives and thus will never automatically select disks.
+           Note also that this means tests must be careful to not select this
+           disk.
+        """
+        from testconfig import config
+
+        # First, create a disk image and put a filesystem on it.
+        b = blivet.Blivet()
+
+        # pylint: disable=undefined-variable
+        disk1_path = blivet.util.create_sparse_tempfile("suite", blivet.size.Size("11 MB"))
+        b.config.diskImages["suite"] = disk1_path
+
+        b.reset()
+
+        try:
+            disk1 = b.devicetree.getDeviceByName("suite")
+            b.initializeDisk(disk1)
+
+            part = b.newPartition(size=blivet.size.Size("10 MB"), parents=[disk1])
+            b.createDevice(part)
+
+            fmt = blivet.formats.getFormat("ext4", label="ANACTEST", mountpoint=self.mountpoint)
+            b.formatDevice(part, fmt)
+
+            blivet.partitioning.doPartitioning(b)
+            b.doIt()
+
+            fmt.mount()
+
+            # Create the directory structure needed for storing results.
+            os.makedirs(self.mountpoint + "/result/anaconda")
+
+            # Copy all the inside stuff into the mountpoint.
+            shutil.copytree("inside", self.mountpoint + "/inside")
+
+            # Create the suite file, which contains all the test cases to run and is how
+            # the VM will figure out what to run.
+            with open(self.mountpoint + "/suite.py", "w") as f:
+                imports = map(lambda (path, cls): "    from inside.%s import %s" % (path, cls), self.tests)
+                addtests = map(lambda (path, cls): "    s.addTest(%s())" % cls, self.tests)
+
+                f.write(self.template % {"environ": "    os.environ.update(%s)" % self.environ,
+                                         "imports": "\n".join(imports),
+                                         "addtests": "\n".join(addtests),
+                                         "anacondaArgs": config.get("anacondaArgs", "").strip('"')})
+        finally:
+            # pylint: disable=undefined-variable
+            b.devicetree.teardownDiskImages()
+            shutil.rmtree(self.mountpoint)
+
+        # This ensures it gets passed to qemu-kvm as a disk arg.
+        self._drivePaths["suite"] = disk1_path
+
+    @contextmanager
+    def suiteMounted(self):
+        """This context manager allows for wrapping code that needs to access the
+           suite.  It mounts the disk image beforehand and unmounts it afterwards.
+        """
+        if self._drivePaths.get("suite", "") == "":
+            return
+
+        b = blivet.Blivet()
+        b.config.diskImages["suite"] = self._drivePaths["suite"]
+        b.reset()
+
+        disk = b.devicetree.getDeviceByName("suite")
+        part = b.devicetree.getChildren(disk)[0]
+        part.format.mountpoint = self.mountpoint
+        part.format.mount()
+
+        try:
+            yield
+        except:
+            raise
+        finally:
+            part.format.unmount()
+            # pylint: disable=undefined-variable
+            b.devicetree.teardownDiskImages()
+
+    def run(self):
+        """Given disk images previously created by Creator.makeDrives and
+           Creator.makeSuite, start qemu and wait for it to terminate.
+        """
+        from testconfig import config
+
+        args = ["/usr/bin/qemu-kvm",
+                "-vnc", "localhost:2",
+                "-m", str(self.reqMemory),
+                "-boot", "d",
+                "-drive", "file=%s,media=cdrom" % config["liveImage"]]
+
+        for drive in self._drivePaths.values():
+            args += ["-drive", "file=%s,media=disk" % drive]
+
+        # Save a reference to the running qemu process so we can later kill
+        # it if necessary.  For now, the only reason we'd want to kill it is
+        # an expired timer.
+        self._proc = subprocess.Popen(args)
+        self._proc.wait()
+        self._proc = None
+
+    @property
+    def mountpoint(self):
+        """The directory where the suite is mounted.  This is a subdirectory of
+           Creator.tempdir, and it is assumed the mountpoint directory (though not
+           the mount itself) exists throughout this test.
+        """
+        if not self._mountpoint:
+            self._mountpoint = tempfile.mkdtemp(dir=self.tempdir)
+
+        return self._mountpoint
+
+    @property
+    def tempdir(self):
+        """The temporary directory used to store disk images and other data
+           this test requires.  This directory will be removed by Creator.cleanup.
+           It is up to the caller to call that method, though.
+        """
+        if not self._tempdir:
+            self._tempdir = tempfile.mkdtemp(prefix="%s-" % self.name, dir="/var/tmp")
+
+        return self._tempdir
+
+class OutsideMixin(object):
+    """A BaseOutsideTestCase subclass is the interface between the unittest framework
+       and a running VM.  It interfaces with an associated Creator object to create
+       devices and fire up a VM, and also handles actually reporting a result that
+       unittest knows how to process.
+
+       Each subclass will likely only want to define a single attribute:
+
+       creatorClass -- A Creator subclass that goes with this test.
+    """
+    creatorClass = None
+
+    def archive(self):
+        self.creator.archive()
+
+    def runTest(self):
+        self.creator.run()
+
+        with self.creator.suiteMounted():
+            self.assertTrue(os.path.exists(self.creator.mountpoint + "/result"),
+                            msg="results directory does not exist")
+            self.archive()
+            self.assertFalse(os.path.exists(self.creator.mountpoint + "/result/unittest-failures"),
+                             msg="automated UI test %s failed" % self.creator.name)
+
+    def setUp(self):
+        # pylint: disable=not-callable
+        self.creator = self.creatorClass()
+        self.creator.makeDrives()
+        self.creator.makeSuite()
+
+    def tearDown(self):
+        self.creator.cleanup()
diff --git a/anaconda/tests/gui/outside/template.py b/anaconda/tests/gui/outside/template.py
new file mode 100644
index 0000000..9ef47b3
--- /dev/null
+++ b/anaconda/tests/gui/outside/template.py
@@ -0,0 +1,77 @@
+# pylint: skip-file
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+# This code template ends up being the special suite.py file referred to in the
+# Creator.makeSuite documentation.  It lives in the suite disk image and is
+# automatically started by the live CD on boot (see the kickstart file for where
+# this happens).  Basically, this is responsible for doing everything inside the
+# VM - it runs the test suite, figures out whether it failed or not, puts results
+# in place, and reboots.
+
+from dogtail import utils
+utils.enableA11y()
+
+import glob
+import os
+import shlex
+import shutil
+import traceback
+import unittest
+
+class UITestSuite(unittest.TestSuite):
+    def run(self, *args, **kwargs):
+        utils.run("liveinst %(anacondaArgs)s")
+        unittest.TestSuite.run(self, *args, **kwargs)
+
+def suite():
+%(imports)s
+
+    s = UITestSuite()
+%(addtests)s
+    return s
+
+if __name__ == "__main__":
+%(environ)s
+
+    s = suite()
+    result = unittest.TextTestRunner(verbosity=2, failfast=True).run(s)
+
+    try:
+        if not result.wasSuccessful():
+            with open("/mnt/anactest/result/unittest-failures", "w") as f:
+                for (where, what) in result.errors + result.failures:
+                    f.write(str(where) + "\n" + str(what) + "\n")
+
+                f.close()
+
+        for log in glob.glob("/tmp/*.log"):
+            shutil.copy(log, "/mnt/anactest/result/anaconda/")
+
+        # anaconda writes out traceback files with restricted permissions, so
+        # we have to go out of our way to grab them.
+        for tb in glob.glob("/tmp/anaconda-tb-*"):
+            os.system("sudo cp " + tb + " /mnt/anactest/result/anaconda/")
+    except:
+        # If anything went wrong with the above, log it and quit.  We need
+        # this VM to always turn off so we can inspect what happened.
+        with open("/mnt/anactest/result/unittest-failures", "w+") as f:
+            traceback.print_exc(file=f)
+            f.close()
+
+    os.system("poweroff")
diff --git a/anaconda/tests/gui/outside/test_simplelivecd.py b/anaconda/tests/gui/outside/test_simplelivecd.py
new file mode 100644
index 0000000..7f9c485
--- /dev/null
+++ b/anaconda/tests/gui/outside/test_simplelivecd.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+__all__ = ["SimpleLiveCDCreator", "SimpleLiveCD_OutsideTest"]
+
+from . import Creator, OutsideMixin
+import unittest
+
+class SimpleLiveCDCreator(Creator):
+    drives = [("one", 8)]
+    name = "simplelivecd"
+    tests = [("welcome", "BasicWelcomeTestCase"),
+             ("summary", "LiveCDSummaryTestCase"),
+             ("date_time", "LiveCDDateTimeTestCase"),
+             ("keyboard", "BasicKeyboardTestCase"),
+             ("storage", "BasicStorageTestCase"),
+             ("network", "LiveCDNetworkTestCase"),
+             ("progress", "LiveCDProgressTestCase"),
+             ("rootpassword", "BasicRootPasswordTestCase"),
+             ("progress", "LiveCDFinishTestCase")]
+
+class SimpleLiveCD_OutsideTest(OutsideMixin, unittest.TestCase):
+    creatorClass = SimpleLiveCDCreator
diff --git a/anaconda/tests/gui/run_gui_tests.sh b/anaconda/tests/gui/run_gui_tests.sh
new file mode 100644
index 0000000..b170f4b
--- /dev/null
+++ b/anaconda/tests/gui/run_gui_tests.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens@redhat.com>
+
+function doit() {
+    ARGS="-s \
+          -v \
+          --nologcapture \
+          --tc=resultsdir:$(mktemp -d --tmpdir=$(pwd) autogui-results-XXXXXX) \
+          --tc=liveImage:$1"
+
+    if [ -z "$2" ]; then
+        nosetests ${ARGS} outside
+    else
+        nosetests ${ARGS} "${2}" outside
+    fi
+}
+
+# We require the test_config plugin for nose, which is not currently packaged
+# but is installable via pip.
+if [ -z "$(nosetests -p | grep test_config)" ]; then
+    exit 99
+fi
+
+# Have to be root to run this test, as it requires creating disk iamges.
+if [ ${EUID} != 0 ]; then
+   exit 77
+fi
+
+# The livecd location can come from one of two different places:
+# (1) $TEST_LIVECD, if this script is being called from "make check"
+# (2) The command line, if this script is being called directly.
+if [[ "${TEST_LIVECD}" != "" ]]; then
+    LIVECD=${TEST_LIVECD}
+elif [[ $# != 0 ]]; then
+    LIVECD=$1
+    shift
+else
+    echo "usage: $0 <livecd.iso> [anaconda args...]"
+    exit 1
+fi
+
+if [ ! -e "${LIVECD}" ]; then
+    echo "Required live CD image does not exist."
+    exit 2
+fi
+
+if [[ "${TEST_ANACONDA_ARGS}" != "" ]]; then
+    EXTRA="--tc=anacondaArgs:\"${TEST_ANACONDA_ARGS}\""
+elif [[ $# != 0 ]]; then
+    EXTRA="--tc=anacondaArgs:\"$*\""
+else
+    EXTRA=""
+fi
+
+# If we're being called from "make check", we will be outside the gui test directory.
+# Unfortunately, everything is written assuming that's where we will be.  So cd there.
+if [ -d gui ]; then
+    ( cd gui && doit ${LIVECD} "${EXTRA}" )
+elif [ -d outside ]; then
+    doit ${LIVECD} "${EXTRA}"
+else
+    echo "Could not find test contents"
+    exit 3
+fi
diff --git a/anaconda/tests/kickstart_tests/version_test.py b/anaconda/tests/kickstart_tests/version_test.py
index c3650f8..84fa384 100644
--- a/anaconda/tests/kickstart_tests/version_test.py
+++ b/anaconda/tests/kickstart_tests/version_test.py
@@ -18,6 +18,7 @@
 # Author: Chris Lumens <clumens@redhat.com>
 from mock import Mock
 import unittest
+import os
 
 class BaseTestCase(unittest.TestCase):
     def setUp(self):
@@ -38,6 +39,7 @@ class BaseTestCase(unittest.TestCase):
 # F10 version of a command, make sure anaconda >= F10 uses the F10 version.
 class CommandVersionTestCase(BaseTestCase):
     def commands_test(self):
+        """Test that anaconda uses the right versions of kickstart commands"""
         for (commandName, commandObj) in self._commandMap.iteritems():
             pykickstartClass = self.handler.commands[commandName].__class__
             self.assertIsInstance(commandObj(), pykickstartClass)
@@ -45,8 +47,33 @@ class CommandVersionTestCase(BaseTestCase):
 # Do the same thing as CommandVersionTestCase, but for data objects.
 class DataVersionTestCase(BaseTestCase):
     def data_test(self):
+        """Test that anaconda uses the right versions of kickstart data"""
         for (dataName, dataObj) in self._dataMap.iteritems():
             # pykickstart does not expose data objects as a mapping the way
             # it does command objects.
             pykickstartClass = eval("self.handler.%s" % dataName)
             self.assertIsInstance(dataObj(), pykickstartClass)
+
+# Copy the commands tests but with the command map from dracut/parse-kickstart
+class DracutCommandVersionTestCase(CommandVersionTestCase):
+    def setUp(self):
+        CommandVersionTestCase.setUp(self)
+
+        # top_srcdir should have been set by nosetests.sh. If it wasn't, the KeyError
+        # will fail the test.
+        parse_kickstart_path = os.path.join(os.environ['top_srcdir'], 'dracut', 'parse-kickstart')
+
+        import tempfile
+        with tempfile.NamedTemporaryFile() as parse_temp:
+            # Compile the file manually to a tempfile so that the import doesn't automatically
+            # crud up the source directory with parse-kickstartc
+            import py_compile
+            parse_temp = tempfile.NamedTemporaryFile()
+            py_compile.compile(parse_kickstart_path, parse_temp.name)
+
+            # Use imp to pretend that hyphens are ok for module names
+            import imp
+            parse_module = imp.load_module('parse_kickstart', parse_temp.file,
+                    parse_temp.name, ('', 'r', imp.PY_COMPILED))
+
+        self._commandMap = parse_module.dracutCmds
diff --git a/anaconda/tests/lib/filelist.py b/anaconda/tests/lib/filelist.py
new file mode 100644
index 0000000..9da5fce
--- /dev/null
+++ b/anaconda/tests/lib/filelist.py
@@ -0,0 +1,49 @@
+#
+# filelist.py: method for determining which files to check
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+
+import os
+import subprocess
+
+def testfilelist(filterfunc=None):
+    """A generator function for the list of file names to check.
+
+       If the check is run from a git work tree, the method returns a list
+       of files known to git. Otherwise, it returns a list of every file
+       beneath $top_srcdir.
+
+       top_srcdir must be set in the environment.
+
+       filterfunc, if provided, is a function that takes a filename as an
+       argument and returns True for files that should be included in the
+       file list. For example, something like lambda x: fnmatch(x, '*.py')
+       could be used to match only filenames that end in .py.
+    """
+
+    if os.path.isdir(os.path.join(os.environ["top_srcdir"], ".git")):
+        output = subprocess.check_output(["git", "ls-files", "-c", os.environ["top_srcdir"]])
+        filelist = output.split("\n")
+    else:
+        filelist = (os.path.join(path, testfile) \
+                        for path, _dirs, files in os.walk(os.environ["top_srcdir"]) \
+                        for testfile in files)
+
+    for f in filelist:
+        if not filterfunc or filterfunc(f):
+            yield f
diff --git a/anaconda/tests/lib/iconcheck.py b/anaconda/tests/lib/iconcheck.py
new file mode 100644
index 0000000..1e1118e
--- /dev/null
+++ b/anaconda/tests/lib/iconcheck.py
@@ -0,0 +1,41 @@
+#
+# iconcheck.py: Gtk icon testing
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+
+import os
+
+ICON_PATH = "/usr/share/icons/gnome"
+ICON_EXTS = ("png", "jpg", "svg")
+
+# This method depends on gnome-icon-theme being installed. gnome-icon-theme-legacy
+# may be installed, but the icons in it will not be considered.
+def icon_exists(icon_name):
+    for dirpath, _dirs, files in os.walk(ICON_PATH):
+        for icon in (icon_name + "." + ext for ext in ICON_EXTS):
+            if icon in files:
+                icon_path = os.path.join(dirpath, icon)
+
+                # If the file is a symbolic link, it's a legacy icon; reject it
+                if os.path.islink(icon_path):
+                    return False
+                else:
+                    return True
+
+    # Nothing found
+    return False
diff --git a/anaconda/tests/lib/pangocheck.py b/anaconda/tests/lib/pangocheck.py
new file mode 100644
index 0000000..6944974
--- /dev/null
+++ b/anaconda/tests/lib/pangocheck.py
@@ -0,0 +1,126 @@
+#
+# pangocheck.py: data and methods for checking pango markup strings
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+
+import re
+from collections import Counter
+
+__all__ = ["markup_nodes", "is_markup", "markup_match"]
+
+# "a" isn't actually pango markup, but GtkLabel uses it
+markup_nodes = ["markup", "a", "b", "big", "i", "s", "span", "sub", "sup", "small", "tt", "u"]
+
+# Check to see if a string looks like Pango markup, no validation
+def is_markup(test_string):
+    return any(re.search(r'<\s*%s(\s|>)' % node_type, test_string)
+            for node_type in markup_nodes)
+
+# Verify that the translation of a markup string looks more or less like the original
+def markup_match(orig_markup, xlated_markup):
+    # Look for tags. Create a count of each kind of tag and a list of attributes.
+    # "Don't parse XML with regular expressions" I can hear you saying, but we're
+    # not trying to match elements, just pull tag-like substrings out of the string.
+    # Figuring out if tags are closed or in the right order is someone else's job.
+    def _parse_markup(markup_string):
+        name_count = Counter()
+        attr_count = Counter()
+
+        for tag in re.findall(r'<[^>]*>', markup_string):
+            # Treat everything up to the first space, / or > as the element name
+            (name, rest) = re.match(r'<([^\s/>]*)(.*)>', tag).groups()
+            name_count[name] += 1
+
+            # Strip the / from the rest of the tag, if present
+            if rest.endswith('/'):
+                rest = rest[:-1]
+
+            # Make a list of attributes that need to be contained in the other string
+            attr_count.update(rest.split())
+
+        return (name_count, attr_count)
+
+    (name_count1, attr_count1) = _parse_markup(orig_markup)
+    (name_count2, attr_count2) = _parse_markup(xlated_markup)
+
+    name_list1 = sorted(name_count1.elements())
+    name_list2 = sorted(name_count2.elements())
+    attr_list1 = sorted(attr_count1.elements())
+    attr_list2 = sorted(attr_count2.elements())
+
+    return (name_list1 == name_list2) and (attr_list1 == attr_list2)
+
+# Check that the markup is needed at all.
+# The input is a parsed ElementTree of the string '<markup>pango markup goes here</markup>'
+# The markup is unnecessary if the only markup in the string surrounds the entire rest of
+# the string, meaning that the pango attributes apply to the entire string, and thus
+# could be expressed using attribute lists. For example, strings like:
+#   <b>Bold text</b>
+# or
+#   <span foreground="grey"><i>colorful</i></span>
+# but not strings like:
+#   <span size="small">This string contains <b>internal</b> markup</span>
+# that contain markup that must be passed to the translators.
+#
+# This function returns True if the markup is necessary and False if the markup
+# can be discarded and expressed as attribute lists.
+def markup_necessary(markup_tree):
+    # If the element has no children at all, there is no markup inside and the
+    # markup is unnecessary.
+    if not len(markup_tree):
+        return False
+
+    # If there is more than one child, the markup is necessary
+    if len(markup_tree) > 1:
+        return True
+
+    # QUICK NOTE FOR PEOPLE EXPECTING ElementTree TO ACT KINDA LIKE DOM 'CUZ LOL
+    # ElementTree is kind of weird with respect to handling multiple text children
+    # of an Element node. element.text is the text leading up to the first element
+    # child, and element[child_idx].tail is the text following the child node that
+    # is actually a child of element but isn't a property of element because Python
+    # is crazy.
+    #
+    # A string like "<markup>word1<i>word2</i>word3<empty/>word4</markup>" will result in
+    #   tree == <Element 'markup' ...>
+    #   tree.text == 'word1'
+    #   tree[0] == <Element 'i' ...>
+    #   tree[0].text == 'word2'
+    #   tree[0].tail == 'word3'
+    #   tree[1] == <Element 'empty' ...>
+    #   tree[1].text == None
+    #   tree[1].text == 'word4'
+    #
+    # So elements that contain text before a child markup element will have
+    # element.text is not None. Elements that have text after a child element
+    # will have .tail on that child set to not None.
+
+    # If .text is set, there is text before the child node, as in
+    # <span>text <b>child</b></span>
+    # and the markup is necessary
+    if markup_tree.text:
+        return True
+
+    # If the child (we already know there's only one) has .tail set, then
+    # there is text between the close of the child and the end of the element
+    # and the markup is necessary
+    if markup_tree[0].tail:
+        return True
+
+    # Recurse on the child node
+    return markup_necessary(markup_tree[0])
diff --git a/anaconda/tests/lib/testlib.sh b/anaconda/tests/lib/testlib.sh
new file mode 100644
index 0000000..896d884
--- /dev/null
+++ b/anaconda/tests/lib/testlib.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Shell functions for use by anaconda tests
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+
+# Print a list of files to test on stdout
+# Takes filter arguments identical to the find utility, for example
+# findtestfiles -name '*.py'. Note that pruning directories will not
+# work since find is passed a list of filenames as the path arguments.
+findtestfiles()
+{
+    # If the test is being run from a git work tree, use a list of all files
+    # known to git
+    if [ -d "${top_srcdir}/.git" ]; then
+        findpath=$(git ls-files -c "${top_srcdir}")
+    # Otherwise list everything under $top_srcdir
+    else
+        findpath="${top_srcdir} -type f"
+    fi
+
+    find $findpath "$@"
+}
diff --git a/anaconda/tests/lib/translatepo.py b/anaconda/tests/lib/translatepo.py
new file mode 100644
index 0000000..f431618
--- /dev/null
+++ b/anaconda/tests/lib/translatepo.py
@@ -0,0 +1,82 @@
+#
+# translatepo.py: translate strings from data in .po files
+#
+# Copyright (C) 2013-2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Shea <dshea@redhat.com>
+
+# This module is helpful for testing translated data. The input is the .po files
+# in the po directory, so no gettext compilation or LC_MESSAGES directories are
+# necessary.
+
+import os
+import locale
+import re
+
+try:
+    import polib
+except ImportError:
+    print("You need to install the python-polib package to read translations")
+    raise
+
+class PODict(object):
+    def __init__(self, filename):
+        """Create a new dictionary of translations from a po file."""
+
+        self._dict = {}
+        self._dict[None] = {}
+
+        pofile = polib.pofile(filename)
+        self.metadata = pofile.metadata
+
+        # Rearrange the entries in the pofile to make it easier to look up contexts.
+        # _dict will be layed out _dict[msgctxt][msgid] = (translated1, translated2, ...)
+        # There may be multiple translations because of plurals
+        for entry in pofile.translated_entries():
+            if (entry.msgctxt is not None) and (entry.msgctxt not in self._dict):
+                self._dict[entry.msgctxt] = {}
+
+            # If this is a plural entry, add entries for both the singular and
+            # plural forms so that either can be used for a lookup
+            if entry.msgstr_plural:
+                xlist = [entry.msgstr_plural[key] for key in entry.msgstr_plural.keys()]
+                self._dict[entry.msgctxt][entry.msgid] = xlist
+                self._dict[entry.msgctxt][entry.msgid_plural] = xlist
+            else:
+                self._dict[entry.msgctxt][entry.msgid] = (entry.msgstr,)
+
+    def get(self, key, context=None):
+        return self._dict[context][key]
+
+# Return a dictionary of PODict objects for each language in a po directory
+def translate_all(podir):
+    # Reset the locale to C before parsing the po file because
+    # polib has erroneous uses of lower()
+    saved_locale = locale.setlocale(locale.LC_ALL, None)
+    locale.setlocale(locale.LC_CTYPE, 'C')
+
+    podicts = {}
+
+    with open(os.path.join(podir, 'LINGUAS')) as linguas:
+        for line in linguas.readlines():
+            if re.match(r'^#', line):
+                continue
+
+            for lang in line.strip().split(" "):
+                podicts[lang] = PODict(os.path.join(podir, lang + ".po"))
+
+    locale.setlocale(locale.LC_CTYPE, saved_locale)
+    return podicts
diff --git a/anaconda/tests/ostree/basic.ks b/anaconda/tests/ostree/basic.ks
new file mode 100644
index 0000000..3767366
--- /dev/null
+++ b/anaconda/tests/ostree/basic.ks
@@ -0,0 +1,36 @@
+# Substitute something in for REPO or this will all come crashing down.
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=REPO --ref=fedora-atomic/rawhide/x86_64/base/core
+
+bootloader --timeout=1 --extlinux
+zerombr
+clearpart --all
+part --fstype=ext4 --size=4400 /
+part --fstype=ext4 --size=500 /boot
+part --fstype=swap --size=500 swap
+
+keyboard us
+timezone America/New_York
+rootpw qweqwe
+shutdown
+
+%post
+cat <<EOF > /etc/systemd/system/default.target.wants/run-test.service
+[Unit]
+Description=Run a test to see if anaconda+ostree worked
+After=basic.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/run-test.sh
+EOF
+
+cat <<EOF > /usr/bin/run-test.sh
+#!/bin/bash
+
+# For now, just the fact that we rebooted is good enough.
+echo SUCCESS > /root/RESULT
+shutdown -h now
+EOF
+
+chmod +x /usr/bin/run-test.sh
+%end
diff --git a/anaconda/tests/ostree/run_ostree_tests.sh b/anaconda/tests/ostree/run_ostree_tests.sh
new file mode 100644
index 0000000..b2d57eb
--- /dev/null
+++ b/anaconda/tests/ostree/run_ostree_tests.sh
@@ -0,0 +1,120 @@
+#!/bin/bash
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens@redhat.com>
+
+# Have to be root to run this test, as it requires creating disk iamges.
+if [ ${EUID} != 0 ]; then
+   exit 77
+fi
+
+# The boot.iso location can come from one of two different places:
+# (1) $TEST_BOOT_ISO, if this script is being called from "make check"
+# (2) The command line, if this script is being called directly.
+if [[ "${TEST_BOOT_ISO}" != "" ]]; then
+    IMAGE=${TEST_BOOT_ISO}
+elif [[ $# != 0 ]]; then
+    IMAGE=$1
+    shift
+fi
+
+# The same with the ostree repo.
+if [[ "${TEST_OSTREE_REPO}" != "" ]]; then
+    REPO=${TEST_OSTREE_REPO}
+elif [[ $# != 0 ]]; then
+    REPO=$1
+    shift
+else
+    echo "usage: $0 <boot.iso> <ostree repo>"
+    exit 1
+fi
+
+if [ ! -e "${IMAGE}" ]; then
+    echo "Required boot.iso does not exist."
+    exit 2
+fi
+
+logdir=$(mktemp -d)
+
+status=0
+for ks in ostree/*ks; do
+    # Substitute in the location of an ostree repo here.  This could be one
+    # publically accessible, or a very local and private one that happens
+    # to be fast.
+    ksfile=$(mktemp)
+    sed -e "/ostreesetup/ s|REPO|${REPO}|" ${ks} > ${ksfile}
+
+    echo ${ks}
+    echo ====================
+
+    livemedia-creator --make-disk \
+                      --iso "${IMAGE}" \
+                      --ks ${ksfile} \
+                      --tmp /var/tmp \
+                      --logfile ${logdir}/livemedia.log \
+                      --title Fedora \
+                      --project Fedora \
+                      --releasever 21 \
+                      --ram 2048 \
+                      --vcpus 2 \
+                      --vnc vnc
+    if [ $? != 0 ]; then
+        status=1
+        echo $(grep CRIT ${logdir}/virt-install.log)
+    fi
+
+    rm ${ksfile}
+
+    if [ -f ostree/run_ostree_tests.log ]; then
+        img=$(grep disk_img ostree/run_ostree_tests.log | cut -d= -f2)
+        trimmed=${img## }
+
+        if [ ! -f ${trimmed} ]; then
+            status=1
+            echo Disk image ${trimmed} does not exist.
+            continue
+        fi
+
+        # Now attempt to boot the resulting VM and see if the install
+        # actually worked.  The VM will shut itself down so there's no
+        # need to worry with that here.
+        /usr/bin/qemu-kvm -m 2048 \
+                          -smp 2 \
+                          -hda ${trimmed}
+
+        # There should be a /root/RESULT file with results in it.  Check
+        # its contents and decide whether the test finally succeeded or
+        # not.
+        result=$(virt-cat -a ${trimmed} -m /dev/sda2 /ostree/deploy/fedora-atomic/var/roothome/RESULT)
+        if [ $? != 0 ]; then
+            status=1
+            echo /root/RESULT does not exist in VM image.
+        elif [ "${result}" != "SUCCESS" ]; then
+            status=1
+            echo ${result}
+        fi
+    fi
+
+    # Clean it up for the next go around.
+    if [ -f ${trimmed} ]; then
+        rm ${trimmed}
+    fi
+done
+
+rm -r ${logdir}
+exit $status
diff --git a/anaconda/tests/pyanaconda_tests/dataholder_test.py b/anaconda/tests/pyanaconda_tests/dataholder_test.py
new file mode 100644
index 0000000..3806861
--- /dev/null
+++ b/anaconda/tests/pyanaconda_tests/dataholder_test.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Brian C. Lane <bcl@redhat.com>
+
+from pyanaconda.iutil import DataHolder
+import unittest
+
+class DataHolderTests(unittest.TestCase):
+    def dataholder_test(self):
+        """Test the DataHolder class"""
+
+        source = {"name": "Minion", "color": "Yellow", "size": 3}
+        data = DataHolder(**source)
+
+        # test that init keywords show up as attrs
+        self.assertTrue(all([getattr(data, s) == source[s] for s in source]))
+
+        # test that init keywords show as keys
+        self.assertTrue(all([data[s] == source[s] for s in source]))
+
+        # test that adding an attr shows as a key
+        data.master = "Gru"
+        self.assertEquals(data["master"], "Gru")
+
+        # test that adding a key shows as an attr
+        data["sibling"] = "More Minions"
+        self.assertEquals(data.sibling, "More Minions")
+
+        # test that a copy results in the same key/values
+        data_copy = data.copy()
+        self.assertEquals(data, data_copy)
diff --git a/anaconda/tests/pyanaconda_tests/grub_raid_test.py b/anaconda/tests/pyanaconda_tests/grub_raid_test.py
new file mode 100644
index 0000000..6690073
--- /dev/null
+++ b/anaconda/tests/pyanaconda_tests/grub_raid_test.py
@@ -0,0 +1,127 @@
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dshea@redhat.com>
+
+# Test that grub installs involving raid work correctly
+# These tests do not write anything to the disk and do not require root
+
+from blivet.devices import DiskDevice, PartitionDevice, MDRaidArrayDevice
+from blivet.formats import getFormat
+from blivet.size import Size
+
+from pyanaconda.bootloader import GRUB
+
+import unittest
+
+class GRUBRaidSimpleTest(unittest.TestCase):
+    def setUp(self):
+        """Create some device objects to test with.
+
+            This sets up two disks (sda, sdb). The first partition of each
+            is a biosboot partition. The second partitions comprise a RAID1
+            array formatted as /boot.
+
+            sda additionally contains a third partition formatted as ext4.
+        """
+
+        super(GRUBRaidSimpleTest, self).setUp()
+
+        # Make some disks
+        self.sda = DiskDevice(name="sda", size=Size("100 GiB"))
+        self.sda.format = getFormat("disklabel")
+        self.sdb = DiskDevice(name="sdb", size=Size("100 GiB"))
+        self.sdb.format = getFormat("disklabel")
+
+        # Set up biosboot partitions and an array for /boot on sda + sdb.
+        # Start with the partitions
+        self.sda1 = PartitionDevice(name="sda1", parents=[self.sda], size=Size("1 MiB"))
+        self.sda1.format = getFormat("biosboot")
+        self.sda2 = PartitionDevice(name="sda2", parents=[self.sda], size=Size("500 MiB"))
+        self.sda2.format = getFormat("mdmember")
+
+        self.sdb1 = PartitionDevice(name="sdb1", parents=[self.sdb], size=Size("1 MiB"))
+        self.sdb1.format = getFormat("biosboot")
+        self.sdb2 = PartitionDevice(name="sdb2", parents=[self.sdb], size=Size("500 MiB"))
+        self.sdb2.format = getFormat("mdmember")
+
+        # Add an extra partition for /boot on not-RAID
+        self.sda3 = PartitionDevice(name="sda3", parents=[self.sda], size=Size("500 MiB"))
+        self.sda3.format = getFormat("ext4", mountpoint="/boot")
+
+        # Pretend that the partitions are real with real parent disks
+        for part in (self.sda1, self.sda2, self.sdb1, self.sdb2):
+            part.parents = part.req_disks
+
+        self.boot_md = MDRaidArrayDevice(name="md1", parents=[self.sda2, self.sdb2], level=1)
+        self.boot_md.format = getFormat("ext4", mountpoint="/boot")
+
+        self.grub = GRUB()
+
+    def grub_mbr_partition_test(self):
+        """Test installing GRUB to a MBR stage1 and partition stage2"""
+
+        # Test stage1 on sda (MBR), stage2 on sda3.
+        # install_targets shouldn't do anything weird because there's no RAID
+        self.grub.stage1_device = self.sda
+        self.grub.stage2_device = self.sda3
+
+        # Convert install_targets to a set so the order doesn't matter
+        install_targets = set(self.grub.install_targets)
+        expected_targets = set([(self.sda, self.sda3)])
+
+        self.assertEquals(install_targets, expected_targets)
+
+    def grub_partition_partition_test(self):
+        """Test installing GRUB to a partition stage1 and partition stage2"""
+
+        # Test stage1 on sda1 (biosboot), stage2 on sda3.
+        # again, what goes in is what should come out
+        self.grub.stage1_device = self.sda1
+        self.grub.stage2_device = self.sda3
+
+        install_targets = set(self.grub.install_targets)
+        expected_targets = set([(self.sda1, self.sda3)])
+
+        self.assertEquals(install_targets, expected_targets)
+
+    def grub_mbr_raid1_test(self):
+        """Test installing GRUB to a MBR stage1 and RAID1 stage2"""
+
+        # Test stage1 on sda (MBR), stage2 on /boot RAID
+        # install_targets should return two grub installs, one for each disk
+        # in the raid. stage1 will be the disk, stage2 will be the partition.
+        self.grub.stage1_device = self.sda
+        self.grub.stage2_device = self.boot_md
+
+        install_targets = set(self.grub.install_targets)
+        expected_targets = set([(self.sda, self.sda2), (self.sdb, self.sdb2)])
+
+        self.assertEquals(install_targets, expected_targets)
+
+    def grub_partition_raid1_test(self):
+        """Test installing GRUB to a partition stage1 and MBR stage2"""
+
+        # Test stage1 on sda1 (biosboot), stage2 on /boot RAID
+        # since stage1 is a non-raid partition, install_targets should return
+        # the original (stage1, stage2) and not add any targets.
+        self.grub.stage1_device = self.sda1
+        self.grub.stage2_device = self.boot_md
+
+        install_targets = set(self.grub.install_targets)
+        expected_targets = set([(self.sda1, self.boot_md)])
+
+        self.assertEquals(install_targets, expected_targets)
diff --git a/anaconda/tests/pyanaconda_tests/iutil_test.py b/anaconda/tests/pyanaconda_tests/iutil_test.py
index 692671c..957cd16 100644
--- a/anaconda/tests/pyanaconda_tests/iutil_test.py
+++ b/anaconda/tests/pyanaconda_tests/iutil_test.py
@@ -174,33 +174,6 @@ class RunProgramTests(unittest.TestCase):
         # at least check if a bool is returned
         self.assertIsInstance(iutil.isConsoleOnVirtualTerminal(), bool)
 
-    def strip_markup_test(self):
-        """Test strip_markup."""
-
-        # list of tuples representing a markup and its correct parsing
-        markups = [
-            ("", ""),
-            ("a", "a"),
-            ("č", "č"),
-            ("<č>", ""),
-            ("<a>", ""),
-            ("<a><a>", ""),
-            ("<a></a>", ""),
-            ("<a>abc</a>", "abc"),
-            ("<abc", ""),  # unclosed tag
-            ("a>bc", "a>bc"),  # not a valid tag
-            ("<i><b>bold</b></i>", "bold"),  # nesting
-            ("<p><b>bold</b> <i>italic</i></p>", "bold italic"),
-            ("  <a>text</a>", "  text"),
-            (" <a> </a> ", "   "),
-            ('<span color="blue">text</span>', 'text'),
-            ("<<<<<<<<<<<<<<<", ""),
-        ]
-
-        # check if markup is parsed properly
-        for markup, output in markups:
-            self.assertEqual(iutil.strip_markup(markup), output)
-
     def parse_nfs_url_test(self):
         """Test parseNfsUrl."""
 
@@ -241,7 +214,7 @@ class RunProgramTests(unittest.TestCase):
     def vt_activate_test(self):
         """Test vtActivate."""
 
-        # pylint: disable-msg=E1101
+        # pylint: disable=no-member
 
         def raise_os_error(*args, **kwargs):
             raise OSError
@@ -255,7 +228,7 @@ class RunProgramTests(unittest.TestCase):
     def get_deep_attr_test(self):
         """Test getdeepattr."""
 
-        # pylint: disable-msg=W0201
+        # pylint: disable=attribute-defined-outside-init
 
         class O(object):
             pass
@@ -280,8 +253,8 @@ class RunProgramTests(unittest.TestCase):
     def set_deep_attr_test(self):
         """Test setdeepattr."""
 
-        # pylint: disable-msg=W0201
-        # pylint: disable-msg=E1101
+        # pylint: disable=attribute-defined-outside-init
+        # pylint: disable=no-member
 
         class O(object):
             pass
@@ -353,7 +326,7 @@ class RunProgramTests(unittest.TestCase):
     def cmp_obj_attrs_test(self):
         """Test cmp_obj_attrs."""
 
-        # pylint: disable-msg=W0201
+        # pylint: disable=attribute-defined-outside-init
 
         class O(object):
             pass
@@ -439,3 +412,29 @@ class RunProgramTests(unittest.TestCase):
         _out = "heiz\xc3\xb6lr\xc3\xbccksto\xc3\x9fabd\xc3\xa4mpfung"
         self.assertEqual(iutil.lowerASCII("Heizölrückstoßabdämpfung"), _out)
 
+    def have_word_match_test(self):
+        """Test have_word_match."""
+
+        self.assertTrue(iutil.have_word_match("word1 word2", "word1 word2 word3"))
+        self.assertTrue(iutil.have_word_match("word1 word2", "word2 word1 word3"))
+        self.assertTrue(iutil.have_word_match("word2 word1", "word3 word1 word2"))
+        self.assertTrue(iutil.have_word_match("word1", "word1 word2"))
+        self.assertTrue(iutil.have_word_match("word1 word2", "word2word1 word3"))
+        self.assertTrue(iutil.have_word_match("word2 word1", "word3 word1word2"))
+        self.assertTrue(iutil.have_word_match("word1", "word1word2"))
+        self.assertTrue(iutil.have_word_match("", "word1"))
+
+        self.assertFalse(iutil.have_word_match("word3 word1", "word1"))
+        self.assertFalse(iutil.have_word_match("word1 word3", "word1 word2"))
+        self.assertFalse(iutil.have_word_match("word3 word2", "word1 word2"))
+        self.assertFalse(iutil.have_word_match("word1word2", "word1 word2 word3"))
+        self.assertFalse(iutil.have_word_match("word1", ""))
+        self.assertFalse(iutil.have_word_match("word1", None))
+        self.assertFalse(iutil.have_word_match(None, "word1"))
+        self.assertFalse(iutil.have_word_match("", None))
+        self.assertFalse(iutil.have_word_match(None, ""))
+        self.assertFalse(iutil.have_word_match(None, None))
+
+        # Compare unicode and str and make sure nothing crashes
+        self.assertTrue(iutil.have_word_match("fête", u"fête champêtre"))
+        self.assertTrue(iutil.have_word_match(u"fête", "fête champêtre"))
diff --git a/anaconda/tests/pyanaconda_tests/keyboard_test.py b/anaconda/tests/pyanaconda_tests/keyboard_test.py
index 8bad3f6..167ba8b 100644
--- a/anaconda/tests/pyanaconda_tests/keyboard_test.py
+++ b/anaconda/tests/pyanaconda_tests/keyboard_test.py
@@ -59,11 +59,11 @@ class ParsingAndJoiningTests(unittest.TestCase):
         """Should correctly join keyboard layout and variant to a string spec."""
 
         # both layout and variant specified
-        self.assertEqual(keyboard._join_layout_variant("cz", "qwerty"),
+        self.assertEqual(keyboard.join_layout_variant("cz", "qwerty"),
                          "cz (qwerty)")
 
         # no variant specified
-        self.assertEqual(keyboard._join_layout_variant("cz"), "cz")
+        self.assertEqual(keyboard.join_layout_variant("cz"), "cz")
 
     def layout_variant_parse_join_test(self):
         """Parsing and joining valid layout and variant spec should have no effect."""
@@ -71,7 +71,7 @@ class ParsingAndJoiningTests(unittest.TestCase):
         specs = ("cz", "cz (qwerty)")
         for spec in specs:
             (layout, variant) = keyboard.parse_layout_variant(spec)
-            self.assertEqual(spec, keyboard._join_layout_variant(layout, variant))
+            self.assertEqual(spec, keyboard.join_layout_variant(layout, variant))
 
     def layout_variant_normalize_test(self):
         """Normalizing layout and variant strings should work as expected."""
diff --git a/anaconda/tests/pyanaconda_tests/localization_test.py b/anaconda/tests/pyanaconda_tests/localization_test.py
index 00ff31d..521fb4a 100644
--- a/anaconda/tests/pyanaconda_tests/localization_test.py
+++ b/anaconda/tests/pyanaconda_tests/localization_test.py
@@ -19,6 +19,8 @@
 #
 
 from pyanaconda import localization
+from pyanaconda.iutil import execReadlines
+import locale as locale_mod
 import unittest
 
 class ParsingTests(unittest.TestCase):
@@ -139,3 +141,18 @@ class LangcodeLocaleMatchingTests(unittest.TestCase):
         # no matches
         self.assertIsNone(localization.find_best_locale_match("pt_BR", ["en_BR", "en"]))
         self.assertIsNone(localization.find_best_locale_match("cs_CZ.UTF-8", ["en", "en.UTF-8"]))
+
+    def resolve_date_format_test(self):
+        """All locales' date formats should be properly resolved."""
+
+        locales = (line.strip() for line in execReadlines("locale", ["-a"]))
+        for locale in locales:
+            try:
+                locale_mod.setlocale(locale_mod.LC_ALL, locale)
+            except locale_mod.Error:
+                # cannot set locale (a bug in the locale module?)
+                continue
+
+            (order, formats) = localization.resolve_date_format(1, 2, 3, fail_safe=False)
+            for i in (1, 2, 3):
+                self.assertIn(i, order)
diff --git a/anaconda/tests/pyanaconda_tests/network_test.py b/anaconda/tests/pyanaconda_tests/network_test.py
new file mode 100644
index 0000000..7822a1f
--- /dev/null
+++ b/anaconda/tests/pyanaconda_tests/network_test.py
@@ -0,0 +1,336 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Radek Vykydal <rvykydal@redhat.com>
+
+from pyanaconda import network
+import unittest
+import mock
+from mock import patch
+
+class NetworkTests(unittest.TestCase):
+
+    def default_ks_vlan_interface_name_test(self):
+        self.assertEqual(network.default_ks_vlan_interface_name("em1", "171"),
+                         "em1.171")
+
+    def bond_options_ksdata_to_dbus_test(self):
+        cases = [("mode=802.3ad,miimon=100,xmit_hash_policy=layer2+3,lacp_rate=fast",
+                  {"mode":"802.3ad",
+                     "miimon":"100",
+                     "xmit_hash_policy":"layer2+3",
+                     "lacp_rate":"fast"}),
+                 ("mode=balance-alb,arp_interval=100,arp_ip_target=192.168.122.1",
+                  {"mode":"balance-alb",
+                   "arp_interval":"100",
+                   "arp_ip_target":"192.168.122.1"}),
+                 ("mode=active-backup,primary=eth1,miimon=100,fail_over_mac=2",
+                  {"mode":"active-backup",
+                   "primary":"eth1",
+                   "miimon":"100",
+                   "fail_over_mac":"2"}),
+                 ("option1=value1,value2;option2=value3",
+                  {"option1":"value1,value2",
+                   "option2":"value3"}),
+                ]
+        for bondopts, dbus_dict in cases:
+            self.assertEqual(network.bond_options_ksdata_to_dbus(bondopts), dbus_dict)
+
+    def sanityCheckHostname_test(self):
+
+        self.assertFalse(network.sanityCheckHostname("")[0])
+        self.assertFalse(network.sanityCheckHostname(None)[0])
+
+        # section length < 64
+        self.assertTrue(network.sanityCheckHostname("h"*63)[0])
+        self.assertFalse(network.sanityCheckHostname("h"*64)[0])
+
+        # length < 256
+        self.assertTrue(network.sanityCheckHostname("section." * 31+"section")[0])
+        self.assertFalse(network.sanityCheckHostname("section." * 31+"sectionx")[0])
+
+        self.assertFalse(network.sanityCheckHostname(
+            "section.must.be..nonempty.")[0])
+        self.assertFalse(network.sanityCheckHostname(
+            ".section.must.be.nonempty.")[0])
+        self.assertTrue(network.sanityCheckHostname(
+            "section.can.contain.only.alphanums.012.or.hyp-hens")[0])
+        self.assertFalse(network.sanityCheckHostname(
+            "section.can.contain.only.alphanums.012.or.hyp-hens!!!")[0])
+        self.assertFalse(network.sanityCheckHostname(
+            "section.may.not.start.with.-hyphen")[0])
+        self.assertFalse(network.sanityCheckHostname(
+            "section.may.not.end.with.hyphen-")[0])
+
+        self.assertTrue(network.sanityCheckHostname("0-0.")[0])
+        self.assertTrue(network.sanityCheckHostname("0.")[0])
+
+        self.assertFalse(network.sanityCheckHostname("Lennart's Laptop")[0])
+
+    def prefix2netmask2prefix_test(self):
+        lore = [
+                (0, "0.0.0.0"),
+                (1, "128.0.0.0"),
+                (2, "192.0.0.0"),
+                (3, "224.0.0.0"),
+                (4, "240.0.0.0"),
+                (5, "248.0.0.0"),
+                (6, "252.0.0.0"),
+                (7, "254.0.0.0"),
+                (8, "255.0.0.0"),
+                (9, "255.128.0.0"),
+                (10, "255.192.0.0"),
+                (11, "255.224.0.0"),
+                (12, "255.240.0.0"),
+                (13, "255.248.0.0"),
+                (14, "255.252.0.0"),
+                (15, "255.254.0.0"),
+                (16, "255.255.0.0"),
+                (17, "255.255.128.0"),
+                (18, "255.255.192.0"),
+                (19, "255.255.224.0"),
+                (20, "255.255.240.0"),
+                (21, "255.255.248.0"),
+                (22, "255.255.252.0"),
+                (23, "255.255.254.0"),
+                (24, "255.255.255.0"),
+                (25, "255.255.255.128"),
+                (26, "255.255.255.192"),
+                (27, "255.255.255.224"),
+                (28, "255.255.255.240"),
+                (29, "255.255.255.248"),
+                (30, "255.255.255.252"),
+                (31, "255.255.255.254"),
+                (32, "255.255.255.255"),
+               ]
+        for prefix, netmask in lore:
+            self.assertEqual(network.prefix2netmask(prefix), netmask)
+            self.assertEqual(network.netmask2prefix(netmask), prefix)
+
+        self.assertEqual(network.prefix2netmask(33), "255.255.255.255")
+
+    @patch("pyanaconda.network.flags.cmdline",
+           {"BOOTIF":"01-11-11-11-11-11-11"})
+    @patch("pyanaconda.nm.nm_device_perm_hwaddress")
+    @patch("pyanaconda.nm.nm_device_carrier",
+            lambda dev: dev == "eth1")
+    @patch("pyanaconda.nm.nm_devices",
+            lambda: ["eth0", "eth1"])
+    def nm_ks_spec_to_device_name_test(self, nm_hwaddr_mock):
+        def hwaddr_mock(dev):
+            h = {"eth0" : "00:00:00:00:00:00",
+                 "eth1" : "11:11:11:11:11:11"}
+            try:
+                mac = h[dev]
+            except KeyError:
+                raise ValueError
+            return mac
+
+        nm_hwaddr_mock.side_effect = hwaddr_mock
+        self.assertEqual(network.ks_spec_to_device_name("eth0"), "eth0")
+        self.assertEqual(network.ks_spec_to_device_name("eth1"), "eth1")
+        self.assertEqual(network.ks_spec_to_device_name("nonexisting"), "nonexisting")
+        self.assertEqual(network.ks_spec_to_device_name("link"), "eth1")
+        self.assertNotEqual(network.ks_spec_to_device_name("link"), "eth0")
+        self.assertEqual(network.ks_spec_to_device_name("00:00:00:00:00:00"), "eth0")
+        self.assertNotEqual(network.ks_spec_to_device_name("00:00:00:00:00:00"), "eth1")
+        self.assertEqual(network.ks_spec_to_device_name("bootif"), "eth1")
+        self.assertNotEqual(network.ks_spec_to_device_name("bootif"), "eth0")
+
+class NetworkKSDataTests(unittest.TestCase):
+
+    def setUp(self):
+        self.ksdata_mock = mock.Mock()
+        self.ksdata_mock.network = mock.Mock()
+
+    def update_hostname_data_test(self):
+        from pyanaconda.kickstart import AnacondaKSHandler
+        handler = AnacondaKSHandler()
+        ksdata = self.ksdata_mock
+
+        # network --hostname oldhostname
+        # pylint: disable=no-member
+        nd = handler.NetworkData(hostname="oldhostname", bootProto="")
+        ksdata.network.network = [nd]
+        network.update_hostname_data(ksdata, "newhostname")
+        # network --hostname newhostname
+        self.assertEqual(ksdata.network.network[0].hostname, "newhostname")
+
+        # no network in ks
+        ksdata.network.network = []
+        network.update_hostname_data(ksdata, "newhostname")
+        # network --hostname newhostname
+        self.assertEqual(ksdata.network.network[0].hostname, "newhostname")
+
+        # network --bootproto dhcp --onboot no --device em1 --hostname oldhostname
+        # pylint: disable=no-member
+        nd = handler.NetworkData(bootProto="dhcp", onboot="no", device="em1", hostname="oldhostname")
+        ksdata.network.network = [nd]
+        network.update_hostname_data(ksdata, "newhostname")
+        # network --bootproto dhcp --onboot no --device em1 --hostname newhostname
+        self.assertEqual(ksdata.network.network[0].hostname, "newhostname")
+        self.assertEqual(len(ksdata.network.network), 1)
+
+        # network --bootproto dhcp --onboot no --device em1
+        # pylint: disable=no-member
+        nd = handler.NetworkData(bootProto="dhcp", onboot="no", device="em1")
+        ksdata.network.network = [nd]
+        network.update_hostname_data(ksdata, "newhostname")
+        # network --bootproto dhcp --onboot no --device em1
+        # network --hostname newhostname
+        self.assertEqual(ksdata.network.network[0].hostname, "")
+        self.assertEqual(ksdata.network.network[1].hostname, "newhostname")
+
+        # network --bootproto dhcp --onboot no --device em1
+        # network --hostname oldhostname
+        # pylint: disable=no-member
+        nd1 = handler.NetworkData(bootProto="dhcp", onboot="no", device="em1")
+        # pylint: disable=no-member
+        nd2 = handler.NetworkData(hostname="oldhostname", bootProto="")
+        ksdata.network.network = [nd1, nd2]
+        network.update_hostname_data(ksdata, "newhostname")
+        # network --bootproto dhcp --onboot no --device em1
+        # network --hostname newhostname
+        self.assertEquals(ksdata.network.network[0].hostname, "")
+        self.assertEquals(ksdata.network.network[1].hostname, "newhostname")
+
+class NetworkIfcfgTests(unittest.TestCase):
+    def ifcfg_mock(self, settings):
+        def get(value):
+            return settings.get(value.upper(), "")
+        m = mock.Mock()
+        m.get = get
+        return m
+
+    def dracutBootArguments_test(self):
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "ibft"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, ""),
+                set(["ip=ibft"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "ibft",
+                                 "HWADDR": "00:00:00:00:00:00"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, ""),
+                set(["ip=ibft"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "dhcp"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77"),
+                set(["ip=em1:dhcp"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "dhcp",
+                                 "HWADDR": "00:00:00:00:00:00"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77"),
+                set(["ip=em1:dhcp", "ifname=em1:00:00:00:00:00:00"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "static",
+                                 "IPADDR": "10.34.102.233",
+                                 "GATEWAY": "10.34.102.254",
+                                 "NETMASK": "255.255.255.0",
+                                 "HWADDR": "00:00:00:00:00:00"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77"),
+                set(["ip=10.34.102.233::10.34.102.254:255.255.255.0::em1:none", "ifname=em1:00:00:00:00:00:00"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "static",
+                                 "IPADDR": "10.34.102.233",
+                                 "GATEWAY": "10.34.102.254",
+                                 "NETMASK": "255.255.255.0"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77"),
+                set(["ip=10.34.102.233::10.34.102.254:255.255.255.0::em1:none"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "static",
+                                 "IPADDR": "10.34.102.233",
+                                 "GATEWAY": "10.34.102.254",
+                                 "PREFIX": "24"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77"),
+                set(["ip=10.34.102.233::10.34.102.254:255.255.255.0::em1:none"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "static",
+                                 "IPADDR": "10.34.102.233",
+                                 "NETMASK": "255.255.255.0"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77"),
+                set(["ip=10.34.102.233:::255.255.255.0::em1:none"]))
+
+        ifcfg = self.ifcfg_mock({"BOOTPROTO": "static",
+                                 "IPADDR": "10.34.102.233",
+                                 "GATEWAY": "10.34.102.254",
+                                 "NETMASK": "255.255.255.0"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "10.34.102.77", hostname="node1"),
+                set(["ip=10.34.102.233::10.34.102.254:255.255.255.0:node1:em1:none"]))
+
+        ifcfg = self.ifcfg_mock({"DHCPV6C": "yes",
+                                 "IPV6_AUTOCONF": "yes"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "2001::1"),
+                set(["ip=em1:dhcp6"]))
+
+        ifcfg = self.ifcfg_mock({"IPV6_AUTOCONF": "yes"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "2001::1"),
+                set(["ip=em1:auto6"]))
+
+        ifcfg = self.ifcfg_mock({"IPV6_AUTOCONF": "yes",
+                                 "HWADDR": "00:00:00:00:00:00"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "2001::1"),
+                set(["ip=em1:auto6", "ifname=em1:00:00:00:00:00:00"]))
+
+        ifcfg = self.ifcfg_mock({"IPV6ADDR": "2001::4"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "2001::1"),
+                set(["ip=[2001::4]:::::em1:none"]))
+
+        ifcfg = self.ifcfg_mock({"IPV6ADDR": "2001::4"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "2001::1", hostname="node1"),
+                set(["ip=[2001::4]::::node1:em1:none"]))
+
+        ifcfg = self.ifcfg_mock({"IPV6ADDR": "2001::4",
+                                 "IPV6_DEFAULTGW": "2001::a"})
+        self.assertEqual(
+                network.dracutBootArguments("em1", ifcfg, "2001::1"),
+                set(["ip=[2001::4]::[2001::a]:::em1:none"]))
+
+    @patch("blivet.arch.isS390", lambda: True)
+    def dracutBootArguments_s390_test(self):
+        ifcfg = self.ifcfg_mock({"NETTYPE": "qeth",
+                                 "SUBCHANNELS": "0.0.f5f0,0.0.f5f1,0.0.f5f2",
+                                 "OPTIONS": '"layer2=1 portname=OSAPORT"'})
+        self.assertEqual(
+                network.dracutBootArguments("eth0", ifcfg, ""),
+                set(["rd.znet=qeth,0.0.f5f0,0.0.f5f1,0.0.f5f2,layer2=1,portname=OSAPORT"]))
+
+        ifcfg = self.ifcfg_mock({"NETTYPE": "qeth",
+                                 "SUBCHANNELS": "0.0.f5f0,0.0.f5f1,0.0.f5f2",
+                                 "OPTIONS": '"layer2=1 portname=OSAPORT"',
+                                 "BOOTPROTO": "static",
+                                 "IPADDR": "10.34.102.233",
+                                 "GATEWAY": "10.34.102.254",
+                                 "NETMASK": "255.255.255.0"})
+        self.assertEqual(
+                network.dracutBootArguments("eth0", ifcfg, "10.34.102.77"),
+                set(["rd.znet=qeth,0.0.f5f0,0.0.f5f1,0.0.f5f2,layer2=1,portname=OSAPORT",
+                     "ip=10.34.102.233::10.34.102.254:255.255.255.0::eth0:none"]))
+
diff --git a/anaconda/tests/pyanaconda_tests/nm_test.py b/anaconda/tests/pyanaconda_tests/nm_test.py
new file mode 100644
index 0000000..26614a1
--- /dev/null
+++ b/anaconda/tests/pyanaconda_tests/nm_test.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Radek Vykydal <rvykydal@redhat.com>
+
+from pyanaconda import nm
+import unittest
+import socket
+
+class UtilityFunctionsTests(unittest.TestCase):
+
+    def ipv6_address_convert_test(self):
+        addresses = ["::",
+                     "ef:ef:eeef:ef:ef:eeef:efff:ef"]
+        for address in addresses:
+            self.assertEqual(nm.nm_dbus_ay_to_ipv6(nm.nm_ipv6_to_dbus_ay(address)),
+                            address)
+
+        self.assertEqual(nm.nm_ipv6_to_dbus_ay("ef:ef:eeef:ef:ef:eeef:efff:ef"),
+                         [0, 239, 0, 239, 238, 239, 0, 239, 0, 239, 238, 239, 239, 255, 0, 239])
+
+    def ipv4_address_convert_test(self):
+        addresses = ["192.168.102.1"]
+        for address in addresses:
+            self.assertEqual(nm.nm_dbus_int_to_ipv4(nm.nm_ipv4_to_dbus_int(address)),
+                            address)
+
+        # The result will be 23505088 little-endian or 3232261633 big-endian
+        self.assertEqual(nm.nm_ipv4_to_dbus_int("192.168.102.1"),
+                         socket.ntohl(3232261633))
+
diff --git a/anaconda/tests/pyanaconda_tests/simpleconfig_test.py b/anaconda/tests/pyanaconda_tests/simpleconfig_test.py
new file mode 100644
index 0000000..3719ec1
--- /dev/null
+++ b/anaconda/tests/pyanaconda_tests/simpleconfig_test.py
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Brian C. Lane <bcl@redhat.com>
+
+from pyanaconda.simpleconfig import SimpleConfigFile
+from pyanaconda import simpleconfig
+import unittest
+import tempfile
+
+class SimpleConfigTests(unittest.TestCase):
+    TEST_CONFIG = """ESSID="Example Network #1"
+ESSID2="Network #2" # With a comment
+COMMENT="Save this string" # Strip this comment
+#SKIP=Skip this commented line
+BOOT=always
+KEY=VALUE # Comment "with quotes"
+KEY2="A single ' inside" # And comment "with quotes"
+"""
+
+    def comment_test(self):
+        with tempfile.NamedTemporaryFile() as testconfig:
+            testconfig.write(self.TEST_CONFIG)
+            testconfig.flush()
+
+            config = SimpleConfigFile(testconfig.name)
+            config.read()
+            self.assertEqual(config.get("ESSID"), "Example Network #1")
+            self.assertEqual(config.get("ESSID2"), "Network #2")
+            self.assertEqual(config.get("COMMENT"), "Save this string")
+            self.assertEqual(str(config), self.TEST_CONFIG)
+
+    def unquote_test(self):
+        self.assertEqual(simpleconfig.unquote("plain string"), "plain string")
+        self.assertEqual(simpleconfig.unquote('"double quote"'), "double quote")
+        self.assertEqual(simpleconfig.unquote("'single quote'"), "single quote")
+
+    def quote_test(self):
+        self.assertEqual(simpleconfig.quote("nospaces"), "nospaces")
+        self.assertEqual(simpleconfig.quote("plain string"), '"plain string"')
+        self.assertEqual(simpleconfig.quote("alwaysquote", always=True), '"alwaysquote"')
+
+    def set_and_get_test(self):
+        """Setting and getting values"""
+        scf = SimpleConfigFile()
+        scf.set(('key1', 'value1'))
+        self.assertEqual(scf.get('key1'), 'value1')
+        scf.set(('KEY2', 'value2'))
+        self.assertEqual(scf.get('key2'), 'value2')
+        scf.set(('KEY3', 'value3'))
+        self.assertEqual(scf.get('KEY3'), 'value3')
+        scf.set(('key4', 'value4'))
+        self.assertEqual(scf.get('KEY4'), 'value4')
+
+    def unset_test(self):
+        scf = SimpleConfigFile()
+        scf.set(('key1', 'value1'))
+        scf.unset(('key1'))
+        self.assertEqual(scf.get('key1'), '')
+
+    def write_test(self):
+        with tempfile.NamedTemporaryFile() as testconfig:
+            scf = SimpleConfigFile()
+            scf.set(('key1', 'value1'))
+            scf.write(testconfig.name)
+            testconfig.flush()
+            self.assertEqual(open(testconfig.name).read(), 'KEY1=value1\n')
+
+    def read_test(self):
+        with tempfile.NamedTemporaryFile() as testconfig:
+            scf = SimpleConfigFile()
+            open(testconfig.name, 'w').write('KEY1="value1"\n')
+            testconfig.flush()
+            scf.read(testconfig.name)
+            self.assertEqual(scf.get('key1'), 'value1')
+
+    def read_write_test(self):
+        with tempfile.NamedTemporaryFile() as testconfig:
+            testconfig.write(self.TEST_CONFIG)
+            testconfig.flush()
+
+            scf = SimpleConfigFile()
+            scf.read(testconfig.name)
+            scf.write(testconfig.name)
+            testconfig.flush()
+            self.assertEqual(open(testconfig.name).read(), self.TEST_CONFIG)
+
+    def write_new_keys_test(self):
+        with tempfile.NamedTemporaryFile() as testconfig:
+            testconfig.write(self.TEST_CONFIG)
+            testconfig.flush()
+
+            scf = SimpleConfigFile()
+            scf.read(testconfig.name)
+            scf.set(("key1", "value1"))
+            scf.write(testconfig.name)
+            testconfig.flush()
+
+            self.assertEqual(open(testconfig.name).read(),
+                             self.TEST_CONFIG+"KEY1=value1\n")
+
+    def remove_key_test(self):
+        with tempfile.NamedTemporaryFile() as testconfig:
+            testconfig.write(self.TEST_CONFIG)
+            testconfig.flush()
+
+            scf = SimpleConfigFile()
+            scf.read(testconfig.name)
+            self.assertEqual(scf.get("BOOT"), "always")
+            scf.unset("BOOT")
+            scf.write(testconfig.name)
+            testconfig.flush()
+            scf.reset()
+            scf.read(testconfig.name)
+            self.assertEqual(scf.get("BOOT"), "")
diff --git a/anaconda/tests/pyanaconda_tests/timezone_test.py b/anaconda/tests/pyanaconda_tests/timezone_test.py
index 62ff2cd..26084d5 100644
--- a/anaconda/tests/pyanaconda_tests/timezone_test.py
+++ b/anaconda/tests/pyanaconda_tests/timezone_test.py
@@ -56,9 +56,9 @@ class s390HWclock(unittest.TestCase):
         self.arch_mock.isS390.return_value = True
         self.iutil_mock = mock.Mock()
 
-        # pylint: disable-msg=E1101
+        # pylint: disable=no-member
         timezone.save_hw_clock.func_globals["arch"] = self.arch_mock
-        # pylint: disable-msg=E1101
+        # pylint: disable=no-member
         timezone.save_hw_clock.func_globals["iutil"] = self.iutil_mock
 
     def s390_save_hw_clock_test(self):
@@ -67,7 +67,7 @@ class s390HWclock(unittest.TestCase):
         timezone.save_hw_clock(mock.Mock())
         self.assertFalse(self.iutil_mock.execWithRedirect.called)
 
-    def s390_time_initalize_test(self):
+    def s390_time_initialize_test(self):
         """Check that time_initialize doesn't call hwclock on s390."""
 
         timezone.time_initialize(mock.Mock(), mock.Mock(), mock.Mock())
diff --git a/anaconda/tests/pylint/eintr.py b/anaconda/tests/pylint/eintr.py
new file mode 100644
index 0000000..8fae96c
--- /dev/null
+++ b/anaconda/tests/pylint/eintr.py
@@ -0,0 +1,65 @@
+# Interuptible system call pylint module
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dhsea@redhat.com>
+#
+
+import astroid
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import check_messages, safe_infer
+from pylint.interfaces import IAstroidChecker
+
+import os
+
+# These are all of the system calls exposed through the os module that are
+# documented in SUSv4 as *may* set EINTR. Some of them probably don't in Linux,
+# but who knows.  lchmod, wait3 and wait4 aren't documented much anywhere but
+# are here just in case.
+interruptible = ("tmpfile", "close", "dup2", "fchmod", "fchown", "fstatvfs",
+                 "fsync", "ftruncate", "open", "read", "write", "fchdir",
+                 "chmod", "chown", "lchmod", "lchown", "statvfs", "wait",
+                 "waitpid", "wait3", "wait4")
+
+class EintrChecker(BaseChecker):
+    __implements__ = (IAstroidChecker,)
+    name = "retry-interruptible"
+    msgs = {"W9930" : ("Found interruptible system call %s",
+                       "interruptible-system-call",
+                       "A system call that may raise EINTR is not wrapped in eintr_retry_call"),
+           }
+
+    @check_messages("interruptible-system-call")
+    def visit_callfunc(self, node):
+        if not isinstance(node, astroid.CallFunc):
+            return
+
+        # Skip anything not a function or not in os.  os redirects most of its
+        # content to an OS-dependent module, named in os.name, so check that
+        # one too.
+        function_node = safe_infer(node.func)
+        if not isinstance(function_node, astroid.Function) or \
+                function_node.root().name not in ("os", os.name):
+            return
+
+        if function_node.name in interruptible:
+            self.add_message("interruptible-system-call", node=node, args=function_node.name)
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(EintrChecker(linter))
diff --git a/anaconda/tests/pylint/intl.py b/anaconda/tests/pylint/intl.py
new file mode 100644
index 0000000..4a2a84d
--- /dev/null
+++ b/anaconda/tests/pylint/intl.py
@@ -0,0 +1,150 @@
+# I18N-related pylint module
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens@redhat.com>
+#
+
+import astroid
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.strings import StringFormatChecker
+from pylint.checkers.logging import LoggingChecker
+from pylint.checkers.utils import check_messages
+from pylint.interfaces import IAstroidChecker
+
+from copy import copy
+
+translationMethods = frozenset(["_", "N_", "P_", "C_", "CN_", "CP_"])
+
+# Returns a list of the message strings for a given translation method call
+def _get_message_strings(node):
+    msgstrs = []
+
+    if node.func.name in ("_", "N_") and len(node.args) >= 1:
+        if isinstance(node.args[0], astroid.Const):
+            msgstrs.append(node.args[0].value)
+    elif node.func.name in ("C_", "CN_") and len(node.args) >= 2:
+        if isinstance(node.args[1], astroid.Const):
+            msgstrs.append(node.args[1].value)
+    elif node.func.name == "P_" and len(node.args) >= 2:
+        if isinstance(node.args[0], astroid.Const):
+            msgstrs.append(node.args[0].value)
+        if isinstance(node.args[1], astroid.Const):
+            msgstrs.append(node.args[1].value)
+    elif node.func.name == "CP_" and len(node.args) >= 3:
+        if isinstance(node.args[1], astroid.Const):
+            msgstrs.append(node.args[1].value)
+        if isinstance(node.args[2], astroid.Const):
+            msgstrs.append(node.args[2].value)
+
+    return msgstrs
+
+class IntlChecker(BaseChecker):
+    __implements__ = (IAstroidChecker, )
+    name = "internationalization"
+    msgs = {"W9901": ("Found % in a call to a _() method",
+                      "found-percent-in-_",
+                      "% in a call to one of the _() methods results in incorrect translations"),
+            "W9902": ("Found _ call at module/class level",
+                      "found-_-in-module-class",
+                      "Calling _ at the module or class level results in translations to the wrong language")
+           }
+
+    @check_messages("found-percent-in-_")
+    def visit_binop(self, node):
+        if node.op != "%":
+            return
+
+        curr = node
+        while curr.parent:
+            if isinstance(curr.parent, astroid.CallFunc) and getattr(curr.parent.func, "name", "") in translationMethods:
+                self.add_message("W9901", node=node)
+                break
+
+            curr = curr.parent
+
+    @check_messages("found-_-in-module-class")
+    def visit_callfunc(self, node):
+        # The first test skips internal functions like getattr.
+        if isinstance(node.func, astroid.Name) and node.func.name == "_":
+            if isinstance(node.scope(), astroid.Module) or isinstance(node.scope(), astroid.Class):
+                self.add_message("W9902", node=node)
+
+# Extend LoggingChecker to check translated logging strings
+class IntlLoggingChecker(LoggingChecker):
+    __implements__ = (IAstroidChecker,)
+
+    name = 'intl-logging'
+    msgs = {'W9903': ("Fake message for translated E/W120* checks",
+                      "translated-log",
+                      "This message is not emitted itself, but can be used to control the display of \
+                       logging format messages extended for translated strings")
+           }
+
+    options = ()
+
+    @check_messages('translated-log')
+    def visit_callfunc(self, node):
+        if len(node.args) >= 1 and isinstance(node.args[0], astroid.CallFunc) and \
+                getattr(node.args[0].func, "name", "") in translationMethods:
+            for formatstr in _get_message_strings(node.args[0]):
+                # Both the node and the args need to be copied so we don't replace args
+                # on the original node.
+                copynode = copy(node)
+                copyargs = copy(node.args)
+                copyargs[0] = astroid.Const(formatstr)
+                copynode.args = copyargs
+                LoggingChecker.visit_callfunc(self, copynode)
+
+    def __init__(self, *args, **kwargs):
+        LoggingChecker.__init__(self, *args, **kwargs)
+
+        # Just set logging_modules to 'logging', instead of trying to take a parameter
+        # like LoggingChecker
+        self.config.logging_modules = ('logging',)
+
+# Extend StringFormatChecker to check translated format strings
+class IntlStringFormatChecker(StringFormatChecker):
+    __implements__ = (IAstroidChecker,)
+
+    name = 'intl-string'
+    msgs = {'W9904': ("Fake message for translated E/W130* checks",
+                      "translated-format",
+                      "This message is not emitted itself, but can be used to control the display of \
+                       string format messages extended for translated strings")
+           }
+
+    options = ()
+
+    @check_messages('translated-format')
+    def visit_binop(self, node):
+        if node.op != '%':
+            return
+
+        if isinstance(node.left, astroid.CallFunc) and getattr(node.left.func, "name", "") in translationMethods:
+            for formatstr in _get_message_strings(node.left):
+                # Create a copy of the node with just the message string as the format
+                copynode = copy(node)
+                copynode.left = astroid.Const(formatstr)
+                StringFormatChecker.visit_binop(self, copynode)
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(IntlChecker(linter))
+    linter.register_checker(IntlLoggingChecker(linter))
+    linter.register_checker(IntlStringFormatChecker(linter))
diff --git a/anaconda/tests/pylint/markup.py b/anaconda/tests/pylint/markup.py
new file mode 100644
index 0000000..690eb13
--- /dev/null
+++ b/anaconda/tests/pylint/markup.py
@@ -0,0 +1,199 @@
+# Pango markup pylint module
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dhsea@redhat.com>
+#
+
+import astroid
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import check_messages
+from pylint.interfaces import IAstroidChecker
+
+import types
+import sys
+import os
+
+import xml.etree.ElementTree as ET
+
+# markup_necessary not used yet
+from pangocheck import markup_nodes, is_markup, markup_match #, markup_necessary
+
+markupMethods = ["set_markup"]
+escapeMethods = ["escape_markup"]
+
+# Used for checking translations
+podicts = None
+
+i18n_funcs = ["_", "N_", "P_", "C_", "CN_", "CP_"]
+i18n_ctxt_funcs = ["C_", "CN_", "CP_"]
+
+class MarkupChecker(BaseChecker):
+    __implements__ = (IAstroidChecker,)
+    name = "pango-markup"
+    msgs = {"W9920" : ("Found invalid pango markup",
+                       "invalid-markup",
+                       "Pango markup could not be parsed"),
+            "W9921" : ("Found pango markup with invalid element %s",
+                       "invalid-markup-element",
+                       "Pango markup contains invalid elements"),
+            "W9922" : ("Found % in markup with unescaped parameters",
+                       "unescaped-markup",
+                       "Parameters passed to % in markup not escaped"),
+            "W9923" : ("Found invalid pango markup in %s translation",
+                       "invalid-translated-markup",
+                       "Translated Pango markup could not be parsed"),
+            "W9924" : ("Found pango markup with invalid element %s in %s translation",
+                       "invalid-translated-markup-element",
+                       "Translated pango markup contains invalid elements"),
+            "W9925" : ("Found mis-translated pango markup for language %s",
+                       "invalid-pango-translation",
+                       "The elements or attributes do not match between a pango markup string and its translation"),
+            "W9926" : ("Found unnecessary pango markup",
+                       "unnecessary-markup",
+                       "Pango markup could be expressed as attribute list"),
+           }
+
+    options = (('translate-markup',
+                {'default': False, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                 'help' : "Check translations of markup strings"
+                }),
+              )
+
+    # Check a parsed markup string for invalid tags
+    def _validate_pango_markup(self, node, root, lang=None):
+        if root.tag not in markup_nodes:
+            if lang:
+                self.add_message("W9924", node=node, args=(root.tag, lang))
+            else:
+                self.add_message("W9921", node=node, args=(root.tag,))
+        else:
+            for child in root:
+                self._validate_pango_markup(node, child)
+
+    # Attempt to parse a markup string as XML
+    def _validate_pango_markup_string(self, node, string, lang=None):
+        try:
+            # QUIS CUSTODIET IPSOS CUSTODES
+            # pylint: disable=unescaped-markup
+            tree = ET.fromstring("<markup>%s</markup>" % string)
+
+            # Check if the markup is necessary
+            # TODO: Turn this on after it's possible to actually do
+            # anything about it. See https://bugzilla.gnome.org/show_bug.cgi?id=725681
+            #if not markup_necessary(tree):
+            #    self.add_message("W9926", node=node)
+        except ET.ParseError:
+            if lang:
+                self.add_message("W9923", node=node, args=(lang,))
+            else:
+                self.add_message("W9920", node=node)
+        else:
+            # Check that all of the elements are valid for pango
+            self._validate_pango_markup(node, tree)
+
+    def __init__(self, linter=None):
+        BaseChecker.__init__(self, linter)
+
+    @check_messages("invalid-markup", "invalid-markup-element", "unescaped-markup", "invalid-translated-markup", "invalid-translated-markup-element", "invalid-pango-translation", "unnecessary-markup")
+    def visit_const(self, node):
+        if type(node.value) not in (types.StringType, types.UnicodeType):
+            return
+
+        if not is_markup(node.value):
+            return
+
+        self._validate_pango_markup_string(node, node.value)
+
+        # Check translated versions of the string if requested
+        if self.config.translate_markup:
+            global podicts
+
+            # Check if this is a translatable string
+            curr = node
+            i18nFunc = None
+            while curr.parent:
+                if isinstance(curr.parent, astroid.CallFunc) and \
+                        getattr(curr.parent.func, "name", "") in i18n_funcs:
+                    i18nFunc = curr.parent
+                    break
+                curr = curr.parent
+
+            if i18nFunc:
+                # If not done already, import polib and read the translations
+                if not podicts:
+                    try:
+                        from translatepo import translate_all
+                    except ImportError:
+                        print("Unable to load po translation module")
+                        sys.exit(99)
+                    else:
+                        podicts = translate_all(os.path.join(os.environ.get('top_srcdir', '.'), 'po'))
+
+                if i18nFunc.func.name in i18n_ctxt_funcs:
+                    msgctxt = i18nFunc.args[0].value
+                else:
+                    msgctxt = None
+
+                # Loop over all translations for the string
+                for podict in podicts.values():
+                    try:
+                        node_values = podict.get(node.value, msgctxt)
+                    except KeyError:
+                        continue
+
+                    for value in node_values:
+                        self._validate_pango_markup_string(node, value, podict.metadata['Language'])
+
+                        # Check that the markup matches, roughly
+                        if not markup_match(node.value, value):
+                            self.add_message("W9925", node=node, args=(podict.metadata['Language'],))
+
+        # Check if this the left side of a % operation
+        curr = node
+        formatOp = None
+        while curr.parent:
+            if isinstance(curr.parent, astroid.BinOp) and curr.parent.op == "%" and \
+                    curr.parent.left == curr:
+                formatOp = curr.parent
+                break
+            curr = curr.parent
+
+        # Check whether the right side of the % operation is escaped
+        if formatOp:
+            if isinstance(formatOp.right, astroid.CallFunc):
+                if getattr(formatOp.right.func, "name", "") not in escapeMethods:
+                    self.add_message("W9922", node=formatOp.right)
+            # If a tuple, each item in the tuple must be escaped
+            elif isinstance(formatOp.right, astroid.Tuple):
+                for elt in formatOp.right.elts:
+                    if not isinstance(elt, astroid.CallFunc) or\
+                            getattr(elt.func, "name", "") not in escapeMethods:
+                        self.add_message("W9922", node=elt)
+            # If a dictionary, each value must be escaped
+            elif isinstance(formatOp.right, astroid.Dict):
+                for item in formatOp.right.items:
+                    if not isinstance(item[1], astroid.CallFunc) or\
+                            getattr(item[1].func, "name", "") not in escapeMethods:
+                        self.add_message("W9922", node=item[1])
+            else:
+                self.add_message("W9922", node=formatOp)
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(MarkupChecker(linter))
diff --git a/anaconda/tests/pylint/preconf.py b/anaconda/tests/pylint/preconf.py
new file mode 100644
index 0000000..809db76
--- /dev/null
+++ b/anaconda/tests/pylint/preconf.py
@@ -0,0 +1,44 @@
+# yum preconf pylint module
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens@redhat.com>
+#
+
+import astroid
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import check_messages
+from pylint.interfaces import IAstroidChecker
+
+class PreconfChecker(BaseChecker):
+    __implements__ = (IAstroidChecker, )
+    name = "Yum preconf"
+    msgs = {"W9910": ("Accessing yum.preconf outside of _resetYum",
+                      "bad-preconf-access",
+                      "Accessing yum.preconf outside of _resetYum will cause tracebacks"),
+           }
+
+    @check_messages("bad-preconf-access")
+    def visit_getattr(self, node):
+        if node.attrname == "preconf":
+            if not isinstance(node.scope(), astroid.Function) or not node.scope().name == "_resetYum":
+                self.add_message("W9910", node=node)
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(PreconfChecker(linter))
diff --git a/anaconda/tests/pylint/pylint-false-positives b/anaconda/tests/pylint/pylint-false-positives
index 59e10b2..bc020fd 100644
--- a/anaconda/tests/pylint/pylint-false-positives
+++ b/anaconda/tests/pylint/pylint-false-positives
@@ -1,15 +1,9 @@
-^F0401:[ 0-9]*,[0-9]*: : Unable to import 'gi.repository.AnacondaWidgets'
-^E0611:[ 0-9]*,[0-9]*: No name '.*' in module 'gi.repository'$
-^E0611:[ 0-9]*,[0-9]*:.*: No name '.*' in module 'gi.repository'$
-^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'add' member$
-^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'remove' member$
-^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'set_.*' member$
-^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'show_all' member$
-^W0402:[ 0-9]*,[0-9]*: Uses of a deprecated module 'string'$
-^W0402:[ 0-9]*,[0-9]*:.*: Uses of a deprecated module 'string'$
+^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'get_property' member$
+^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'set_property' member$
+^E0611:[ 0-9]*,[0-9]*: No name 'GLib' in module 'gi.repository'$
+^E0611:[ 0-9]*,[0-9]*:.*: No name 'GLib' in module 'gi.repository'$
 ^E0611:[ 0-9]*,[0-9]*: No name '_isys' in module 'pyanaconda'$
 ^E0611:[ 0-9]*,[0-9]*:.*: No name '_isys' in module 'pyanaconda'$
-^E1101:[ 0-9]*,[0-9]*:.*: Instance of '.*' has no 'anaconda' member$
-^E1101:[ 0-9]*,[0-9]*:Anaconda\.backend: Instance of 'DefaultInstall' has no 'getBackend' member$
-^dm.c: [ 0-9]*,[0-9]*: not running as root returning empty list$
-Note this last line must never end with a newline
\ No newline at end of file
+^E0712:[ 0-9]*,[0-9]*:.*: Catching an exception which doesn't inherit from BaseException: GError$
+gi/module.py:[0-9]*: Warning: g_hash_table_insert_internal: assertion 'hash_table != NULL' failed$
+^  g_type = info\.get_g_type\(\)$
diff --git a/anaconda/tests/pylint/pylint-one.sh b/anaconda/tests/pylint/pylint-one.sh
new file mode 100644
index 0000000..4b155b8
--- /dev/null
+++ b/anaconda/tests/pylint/pylint-one.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# $1 -- python source to run pylint on
+#
+
+if [ $# -lt 1 ]; then
+    # no source, just exit
+    exit 1
+fi
+
+if grep -q '# pylint: skip-file' $1; then
+    exit 0
+fi
+
+file_suffix="$(eval echo \$$#|sed s?/?_?g)"
+
+pylint_output="$(pylint \
+    --msg-template='{msg_id}:{line:3d},{column}: {obj}: {msg}' \
+    -r n --disable=C,R --rcfile=/dev/null \
+    --dummy-variables-rgx=_ \
+    --ignored-classes=DefaultInstall,Popen,QueueFactory,TransactionSet \
+    --defining-attr-methods=__init__,_grabObjects,initialize,reset,start,setUp \
+    --load-plugins=intl,preconf,markup,eintr \
+    --init-hook=\
+'import gi.overrides, os;
+gi.overrides.__path__[0:0] = (os.environ["ANACONDA_WIDGETS_OVERRIDES"].split(":") if "ANACONDA_WIDGETS_OVERRIDES" in os.environ else [])' \
+    $DISABLED_WARN_OPTIONS \
+    $DISABLED_ERR_OPTIONS \
+    $NON_STRICT_OPTIONS "$@" 2>&1 | \
+    egrep -v -f "$FALSE_POSITIVES" \
+    )"
+
+if [ -n "$(echo "$pylint_output" | fgrep -v '************* Module ')" ]; then
+    # Replace the Module line with the actual filename
+    pylint_output="$(echo "$pylint_output" | sed "s|\* Module .*|* Module $(eval echo \$$#)|")"
+    echo "$pylint_output" > pylint-out_$file_suffix
+    touch "pylint-$file_suffix-failed"
+fi
diff --git a/anaconda/tests/pylint/runpylint.sh b/anaconda/tests/pylint/runpylint.sh
index 0ca8708..3615052 100755
--- a/anaconda/tests/pylint/runpylint.sh
+++ b/anaconda/tests/pylint/runpylint.sh
@@ -8,57 +8,89 @@
 # to stdout and this script will exit with a status of 1, if no (non filtered)
 # warnings are found it exits with a status of 0
 
+# XDG_RUNTIME_DIR is "required" to be set, so make one up in case something
+# actually tries to do something with it
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+    export XDG_RUNTIME_DIR="$(mktemp -d)"
+    trap "rm -rf \"$XDG_RUNTIME_DIR\"" EXIT
+fi
+
 # If $top_srcdir is set, assume this is being run from automake and we don't
 # need to keep a separate log
-pylint_log=0
+export pylint_log=0
 if [ -z "$top_srcdir" ]; then
-    pylint_log=1
+    export pylint_log=1
 fi
 
 # Unset TERM so that things that use readline don't output terminal garbage
 unset TERM
 
+# Don't try to connect to the accessibility socket
+export NO_AT_BRIDGE=1
+
+# Force the GDK backend to X11. Otherwise if no display can be found, Gdk
+# tries every backend type, which includes "broadway," which prints an error
+# and keeps changing the content of said error.
+export GDK_BACKEND=x11
+
 # If $top_srcdir has not been set by automake, import the test environment
 if [ -z "$top_srcdir" ]; then
     top_srcdir="$(dirname "$0")/../.."
     . ${top_srcdir}/tests/testenv.sh
 fi
 
-srcdir="${top_srcdir}/tests/pylint"
+. ${top_srcdir}/tests/lib/testlib.sh
 
-FALSE_POSITIVES="${srcdir}"/pylint-false-positives
+srcdir="${top_srcdir}/tests/pylint"
+builddir="${top_builddir}/tests/pylint"
+
+# Need to add the pylint module directory to PYTHONPATH as well.
+export PYTHONPATH="${PYTHONPATH}:${srcdir}"
+
+# Save analysis data in the pylint directory
+export PYLINTHOME="${builddir}/.pylint.d"
+[ -d "$PYLINTHOME" ] || mkdir "$PYLINTHOME"
+
+export FALSE_POSITIVES="${srcdir}"/pylint-false-positives
 
 # W0212 - Access to a protected member %s of a client class
-NON_STRICT_OPTIONS="--disable=W0212"
+export NON_STRICT_OPTIONS="--disable=W0212"
 
 # E1103 - %s %r has no %r member (but some types could not be inferred)
-DISABLED_ERR_OPTIONS="--disable=E1103"
+export DISABLED_ERR_OPTIONS="--disable=E1103"
 
 # W0110 - map/filter on lambda could be replaced by comprehension
+# W0123 - Use of eval
 # W0141 - Used builtin function %r
 # W0142 - Used * or ** magic
-# W0223 - Method %r is abstract in class %r but is not overridden
 # W0511 - Used when a warning note as FIXME or XXX is detected.
 # W0603 - Using the global statement
-# W0604 - Using the global statement at the module level
 # W0613 - Unused argument %r
 # W0614 - Unused import %s from wildcard import
-DISABLED_WARN_OPTIONS="--disable=W0110,W0141,W0142,W0223,W0511,W0603,W0604,W0613,W0614"
+# I0011 - Locally disabling %s (i.e., pylint: disable)
+# I0012 - Locally enabling %s (i.e., pylint: enable)
+# I0013 - Ignoring entire file (i.e., pylint: skip-file)
+export DISABLED_WARN_OPTIONS="--disable=W0110,W0123,W0141,W0142,W0511,W0603,W0613,W0614,I0011,I0012,I0013"
 
 usage () {
   echo "usage: `basename $0` [--strict] [--help] [files...]"
   exit $1
 }
 
+# Separate the module parameters from the files list
+ARGS=
 FILES=
 while [ $# -gt 0 ]; do
   case $1 in
     --strict)
-      NON_STRICT_OPTIONS=
+      export NON_STRICT_OPTIONS=
       ;;
     --help)
       usage 0
       ;;
+    -*)
+      ARGS="$ARGS $1"
+      ;;
     *)
       FILES=$@
       break
@@ -66,62 +98,43 @@ while [ $# -gt 0 ]; do
   shift
 done
 
-if [ "`tail -c 1 $FALSE_POSITIVES`" == "`echo`" ]; then
-  echo "Error $FALSE_POSITIVES ends with an enter."
-  echo "Error the last line of $FALSE_POSITIVES should never have an enter!"
-  exit 1
-fi
-
 exit_status=0
-if [ "$pylint_log" -ne 0 ]; then
-    > pylint-log
+
+if [ -s pylint-log ]; then
+    rm pylint-log
 fi
 
 # run pylint one file / module at a time, otherwise it sometimes gets
 # confused
 if [ -z "$FILES" ]; then
-    # Find any file in the list of directories that either ends in .py
-    # or contains #!/usr/bin/python in the first line.
-    FILES="$(find "${top_srcdir}"/{anaconda,pyanaconda,tests,widgets,utils,scripts} -type f \( -name '*.py' -o -exec awk -e 'NR==1 { if ($0 ~ /^#!\/usr\/bin\/python/) exit 0; else exit 1; }' -e 'END { if (NR == 0) exit 1; }' {} \; \) -print)"
+    # Test any file that either ends in .py or contains #!/usr/bin/python in
+    # the first line.  Scan everything except old_tests
+    FILES=$(findtestfiles \( -name '*.py' -o \
+                -exec /bin/sh -c "head -1 {} | grep -q '#!/usr/bin/python'" \; \) -print | \
+            egrep -v '(|/)old_tests/')
 fi
-for i in $FILES; do
-  if [ -n "$(echo "$i" | grep 'pyanaconda/packaging/dnfpayload.py$')" ]; then
-     continue
-  fi
 
-  pylint_output="$(pylint \
-    --msg-template='{msg_id}:{line:3d},{column}: {obj}: {msg}' \
-    -r n --disable=C,R --rcfile=/dev/null \
-    --dummy-variables-rgx=_ \
-    --ignored-classes=DefaultInstall,Popen,QueueFactory,TransactionSet \
-    --defining-attr-methods=__init__,_grabObjects,initialize,reset,start,setUp \
-    $DISABLED_WARN_OPTIONS \
-    $DISABLED_ERR_OPTIONS \
-    $NON_STRICT_OPTIONS $i | \
-    egrep -v "$(tr '\n' '|' < "$FALSE_POSITIVES") \
-    ")"
-  # I0011 is the informational "Locally disabling ...." message
-  if [ -n "$(echo "$pylint_output" | fgrep -v '************* Module ' |\
-          grep -v '^I0011:')" ]; then
-      # Replace the Module line with the actual filename
-      pylint_output="$(echo "$pylint_output" | sed "s|\* Module .*|* Module $i|")"
+num_cpus=$(getconf _NPROCESSORS_ONLN)
+# run pylint in paralel
+echo $FILES | xargs --max-procs=$num_cpus -n 1 "$srcdir"/pylint-one.sh $ARGS || exit 1
 
-      if [ "$pylint_log" -ne 0 ]; then
-          echo "$pylint_output" >> pylint-log
-      else
-          echo "$pylint_output"
-      fi
-      exit_status=1
-  fi
+for file in $(find -name 'pylint-out*'); do
+    cat "$file" >> pylint-log
+    rm "$file"
 done
 
-if [ "$pylint_log" -ne 0 ]; then
-    if [ -s pylint-log ]; then
-        echo "pylint reports the following issues:"
-        cat pylint-log
-    else
-        rm pylint-log
-    fi
+fails=$(find -name 'pylint*failed' -print -exec rm '{}' \;)
+if [ -z "$fails" ]; then
+    exit_status=0
+else
+    exit_status=1
+fi
+
+if [ -s pylint-log ]; then
+    echo "pylint reports the following issues:"
+    cat pylint-log
+elif [ -e pylint-log ]; then
+    rm pylint-log
 fi
 
 exit "$exit_status"
diff --git a/anaconda/tests/regex_tests/hostname_test.py b/anaconda/tests/regex_tests/hostname_test.py
new file mode 100644
index 0000000..fa2bfc6
--- /dev/null
+++ b/anaconda/tests/regex_tests/hostname_test.py
@@ -0,0 +1,190 @@
+#!/usr/bin/python
+# vim:set fileencoding=utf-8
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dshea@redhat.com>
+#
+import unittest
+import re
+
+from pyanaconda.regexes import HOSTNAME_PATTERN_WITHOUT_ANCHORS, IPV4_PATTERN_WITHOUT_ANCHORS,\
+        IPV6_PATTERN_WITHOUT_ANCHORS
+
+def _run_tests(testcase, expression, goodlist, badlist):
+    got_error = False
+    for good in goodlist:
+        try:
+            testcase.assertIsNotNone(expression.match(good))
+        except AssertionError:
+            got_error = True
+            print("Good string %s did not match expression" % good)
+
+    for bad in badlist:
+        try:
+            testcase.assertIsNone(expression.match(bad))
+        except AssertionError:
+            got_error = True
+            print("Bad string %s matched expression" % bad)
+
+    if got_error:
+        testcase.fail()
+
+class HostnameRegexTestCase(unittest.TestCase):
+    def hostname_test(self):
+        good_tests = [
+                '0',
+                'a',
+                'A',
+                'hostname',
+                'host-name',
+                'host.name',
+                'host.name.with.oneverylongsectionthatisexactly63characterslong-and-contains-se',
+                '3numberstart',
+                'numberend3',
+                'first.3numberstart',
+                'first.3numberend',
+                'dot.end.'
+                ]
+
+        bad_tests = [
+                '.',
+                '..',
+                'too..many.dots',
+                '-hypenstart',
+                'hyphenend-',
+                'first.-hyphenstart',
+                'first.hyphenend-',
+                'bad,character',
+                '.dot.start',
+                'host.name.with.oneverylongsectionthatisexactly64characterslong-and-contains-sev',
+                'únicode'
+                ]
+
+        hostname_re = re.compile('^' + HOSTNAME_PATTERN_WITHOUT_ANCHORS + '$')
+        _run_tests(self, hostname_re, good_tests, bad_tests)
+
+class IPv4RegexTestCase(unittest.TestCase):
+    def ipv4_test(self):
+        good_tests = [
+                '1.2.3.4',
+                '0.0.0.0',
+                '10.20.30.40',
+                '255.255.255.255',
+                '249.249.249.249'
+                ]
+
+        bad_tests = [
+                '1.2.3.',
+                '1.2.3',
+                '256.2.3.4',
+                'a.b.c.d',
+                '1.2.3.400'
+                '....',
+                '1..2.3'
+                ]
+
+        ipv4_re = re.compile('^(' + IPV4_PATTERN_WITHOUT_ANCHORS + ')$')
+        _run_tests(self, ipv4_re, good_tests, bad_tests)
+
+class IPv6RegexTestCase(unittest.TestCase):
+    def ipv6_test(self):
+        good_tests = [
+                '0000:0000:0000:0000:0000:0000:0000:0000',
+                '0000:0000:0000:0000:0000:0000:1.2.3.4',
+                '::a:b:c:d:e:f:1',
+                '::a:b:c:d:e:255.255.255.255',
+                '1::a:b:c:d:e:f',
+                '1::a:b:c:d:255.255.255.255',
+                '1:12::a:b:c:d:e',
+                '1:12::a:b:c:10.20.30.40',
+                '12::a:b:c:d:e',
+                '12::a:b:c:10.20.30.40',
+                '1:12:123::a:b:c:d',
+                '1:12:123::a:b:100.200.250.249',
+                '12:123::a:b:c:d',
+                '12:123::a:b:100.200.250.249',
+                '123::a:b:c:d',
+                '123::a:b:100.200.250.249',
+                '::a:b:c:d',
+                '::a:b:100.200.250.249',
+                '1:12:123:1234::a:b:c',
+                '1:12:123:1234::a:1.20.30.99',
+                '12:123:1234::a:b:c',
+                '12:123:1234::a:1.20.30.99',
+                '123:1234::a:b:c',
+                '123:1234::a:1.20.30.99',
+                '1234::a:b:c',
+                '1234::a:1.20.30.99',
+                '::a:b:c',
+                '::a:1.20.30.99',
+                '1:12:123:1234:abcd::a:b',
+                '1:12:123:1234:abcd::0.0.0.0',
+                '12:123:1234:abcd::a:b',
+                '12:123:1234:abcd::0.0.0.0',
+                '123:1234:abcd::a:b',
+                '123:1234:abcd::0.0.0.0',
+                '1234:abcd::a:b',
+                '1234:abcd::0.0.0.0',
+                'abcd::a:b',
+                'abcd::0.0.0.0',
+                '::a:b',
+                '::0.0.0.0',
+                '1:12:123:1234:dead:beef::aaaa',
+                '12:123:1234:dead:beef::aaaa',
+                '123:1234:dead:beef::aaaa',
+                '1234:dead:beef::aaaa',
+                'dead:beef::aaaa',
+                'beef::aaaa',
+                '::aaaa',
+                '::'
+                ]
+
+        bad_tests = [
+                # Too many bits
+                '0000:0000:0000:0000:0000:0000:0000:0000:0000'
+                '0000:0000:0000:0000:0000:0000:0000:1.2.3.4',
+                '0000:0000:0000:0000:0000:0000:1.2.3.4.5',
+                # Not enough bits
+                '0000:0000:0000:0000:0000:0000:0000',
+                '0000:0000:0000:0000:0000:1.2.3.4',
+                # zero-length contractions
+                '0000::0000:0000:0000:0000:0000:1.2.3.4',
+                '0000:0000::0000:0000:0000:0000:1.2.3.4',
+                '0000:0000:0000::0000:0000:0000:1.2.3.4',
+                '0000:0000:0000:0000::0000:0000:1.2.3.4',
+                '0000:0000:0000:0000:0000::0000:1.2.3.4',
+                '0000:0000:0000:0000:0000:0000::1.2.3.4',
+                '123::4567:89:a:bcde:f0f0:aaaa:8',
+                '123:4567::89:a:bcde:f0f0:aaaa:8',
+                '123:4567:89::a:bcde:f0f0:aaaa:8',
+                '123:4567:89:a:bcde::f0f0:aaaa:8',
+                '123:4567:89:a:bcde:f0f0::aaaa:8',
+                '123:4567:89:a:bcde:f0f0:aaaa::8',
+                # too many contractions
+                'a::b::c',
+                '::a::b',
+                'a::b::',
+                # invalid numbers
+                '00000::0000',
+                'defg::',
+                '12345::abcd',
+                'ffff::0x1e'
+                ]
+
+        ipv6_re = re.compile('^(' + IPV6_PATTERN_WITHOUT_ANCHORS + ')$')
+        _run_tests(self, ipv6_re, good_tests, bad_tests)
diff --git a/anaconda/tests/regex_tests/proxy_test.py b/anaconda/tests/regex_tests/proxy_test.py
deleted file mode 100644
index 6fae463..0000000
--- a/anaconda/tests/regex_tests/proxy_test.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2010-2013  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Brian C. Lane <bcl@redhat.com>
-#
-
-import unittest
-
-from pyanaconda.regexes import PROXY_URL_PARSE
-
-class ProxyRegexTestCase(unittest.TestCase):
-    def proxy_regex_test(self):
-        """
-        Run a list of possible proxy= values through the regex and check for
-        correct results.
-
-        tests are in the form of: (proxy string, match.groups() tuple)
-        """
-        tests = [ ( "proxy.host",
-                      (None, None, None, None, 'proxy.host', None, None) ),
-
-                  ( "proxy.host:3128",
-                      (None, None, None, None, 'proxy.host', ':3128', None) ),
-
-                  ( "user:password@proxy.host",
-                      (None, 'user:password@', 'user', ':password', 'proxy.host', None, None) ),
-
-                  ( "user@proxy.host",
-                      (None, 'user@', 'user', None, 'proxy.host', None, None) ),
-
-                  ( "user:password@proxy.host:3128",
-                      (None, 'user:password@', 'user', ':password', 'proxy.host', ':3128', None) ),
-
-                  ( "user@proxy.host:3128",
-                      (None, 'user@', 'user', None, 'proxy.host', ':3128', None) ),
-
-                  ( "proxy.host/blah/blah",
-                      (None, None, None, None, 'proxy.host', None, '/blah/blah') ),
-
-                  ( "proxy.host:3128/blah/blah",
-                      (None, None, None, None, 'proxy.host', ':3128', '/blah/blah') ),
-
-                  ( "user:password@proxy.host/blah/blah",
-                      (None, 'user:password@', 'user', ':password', 'proxy.host', None, '/blah/blah') ),
-
-                  ( "user@proxy.host/blah/blah",
-                      (None, 'user@', 'user', None, 'proxy.host', None, '/blah/blah') ),
-
-                  ( "user:password@proxy.host:3128/blah/blah",
-                      (None, 'user:password@', 'user', ':password', 'proxy.host', ':3128', "/blah/blah") ),
-
-                  ( "user@proxy.host:3128/blah/blah",
-                      (None, 'user@', 'user', None, 'proxy.host', ':3128', "/blah/blah") ),
-
-
-
-                  ( "http://proxy.host",
-                      ('http://', None, None, None, 'proxy.host', None, None) ),
-
-                  ( "http://proxy.host:3128",
-                      ('http://', None, None, None, 'proxy.host', ':3128', None) ),
-
-                  ( "http://user:password@proxy.host",
-                      ('http://', 'user:password@', 'user', ':password', 'proxy.host', None, None) ),
-
-                  ( "http://user@proxy.host",
-                      ('http://', 'user@', 'user', None, 'proxy.host', None, None) ),
-
-                  ( "http://user:password@proxy.host:3128",
-                      ('http://', 'user:password@', 'user', ':password', 'proxy.host', ':3128', None) ),
-
-                  ( "http://user@proxy.host:3128",
-                      ('http://', 'user@', 'user', None, 'proxy.host', ':3128', None) ),
-
-                  ( "http://proxy.host/blah/blah",
-                      ('http://', None, None, None, 'proxy.host', None, '/blah/blah') ),
-
-                  ( "http://proxy.host:3128/blah/blah",
-                      ('http://', None, None, None, 'proxy.host', ':3128', '/blah/blah') ),
-
-                  ( "http://user:password@proxy.host/blah/blah",
-                      ("http://", 'user:password@', 'user', ':password', 'proxy.host', None, '/blah/blah') ),
-
-                  ( "http://user@proxy.host/blah/blah",
-                      ("http://", 'user@', 'user', None, 'proxy.host', None, '/blah/blah') ),
-
-                  ( "http://user:password@proxy.host:3128/blah/blah",
-                      ("http://", 'user:password@', 'user', ':password', 'proxy.host', ':3128', '/blah/blah') ),
-
-                  ( "http://user@proxy.host:3128/blah/blah",
-                      ("http://", 'user@', 'user', None, 'proxy.host', ':3128', '/blah/blah') ),
-
-                ]
-
-
-        got_error = False
-        for proxy, result in tests:
-            try:
-                self.assertEqual(PROXY_URL_PARSE.match(proxy).groups(), result)
-            except AssertionError:
-                got_error = True
-                print("Proxy parse error: `%s' did not parse as `%s'" % (proxy, result))
-
-        if got_error:
-            self.fail()
diff --git a/anaconda/tests/regex_tests/repo_name_test.py b/anaconda/tests/regex_tests/repo_name_test.py
new file mode 100644
index 0000000..10f55a8
--- /dev/null
+++ b/anaconda/tests/regex_tests/repo_name_test.py
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+# vim:set fileencoding=utf-8
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): David Shea <dshea@redhat.com>
+#
+import unittest
+
+from pyanaconda.regexes import REPO_NAME_VALID
+
+def _run_tests(testcase, expression, goodlist, badlist):
+    got_error = False
+    for good in goodlist:
+        try:
+            testcase.assertIsNotNone(expression.match(good))
+        except AssertionError:
+            got_error = True
+            print("Good string %s did not match expression" % good)
+
+    for bad in badlist:
+        try:
+            testcase.assertIsNone(expression.match(bad))
+        except AssertionError:
+            got_error = True
+            print("Bad string %s matched expression" % bad)
+
+    if got_error:
+        testcase.fail()
+
+class RepoNameTestCase(unittest.TestCase):
+    def reponame_test(self):
+        good_tests = [
+                'reponame',
+                'repoName',
+                'repo-name',
+                'repo.name',
+                'repo_name',
+                'repo:name',
+                'rep0Name',
+                '0repoName',
+                'repoName0'
+                ]
+
+        bad_tests = [
+                'repo name',
+                'répo name',
+                '@repo name',
+                '[reponame]'
+                ]
+
+        _run_tests(self, REPO_NAME_VALID, good_tests, bad_tests)
diff --git a/anaconda/tests/regex_tests/url_test.py b/anaconda/tests/regex_tests/url_test.py
new file mode 100644
index 0000000..3c77f7d
--- /dev/null
+++ b/anaconda/tests/regex_tests/url_test.py
@@ -0,0 +1,183 @@
+#
+# Copyright (C) 2010-2013  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Brian C. Lane <bcl@redhat.com>
+#                    David Shea <dshea@redhat.com>
+#
+
+import unittest
+
+from pyanaconda.regexes import URL_PARSE
+
+class URLRegexTestCase(unittest.TestCase):
+    def url_regex_test(self):
+        """
+        Run a list of possible URL values through the regex and check for
+        correct results.
+
+        tests are in the form of: (URL string, match.groups() tuple)
+        """
+        tests = [ ( "proxy.host",
+                      (None, None, None, 'proxy.host', None, None, None, None) ),
+
+                  ( "proxy.host:3128",
+                      (None, None, None, 'proxy.host', '3128', None, None, None) ),
+
+                  ( "user:password@proxy.host",
+                      (None, 'user', 'password', 'proxy.host', None, None, None, None) ),
+
+                  ( "user@proxy.host",
+                      (None, 'user', None, 'proxy.host', None, None, None, None) ),
+
+                  ( "user:password@proxy.host:3128",
+                      (None, 'user', 'password', 'proxy.host', '3128', None, None, None) ),
+
+                  ( "user@proxy.host:3128",
+                      (None, 'user', None, 'proxy.host', '3128', None, None, None) ),
+
+                  ( "proxy.host/blah/blah",
+                      (None, None, None, 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "proxy.host:3128/blah/blah",
+                      (None, None, None, 'proxy.host', '3128', '/blah/blah', None, None) ),
+
+                  ( "user:password@proxy.host/blah/blah",
+                      (None, 'user', 'password', 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "user@proxy.host/blah/blah",
+                      (None, 'user', None, 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "user:password@proxy.host:3128/blah/blah",
+                      (None, 'user', 'password', 'proxy.host', '3128', "/blah/blah", None, None) ),
+
+                  ( "user@proxy.host:3128/blah/blah",
+                      (None, 'user', None, 'proxy.host', '3128', "/blah/blah", None, None) ),
+
+
+
+                  ( "http://proxy.host",
+                      ('http://', None, None, 'proxy.host', None, None, None, None) ),
+
+                  ( "http://proxy.host:3128",
+                      ('http://', None, None, 'proxy.host', '3128', None, None, None) ),
+
+                  ( "http://user:password@proxy.host",
+                      ('http://', 'user', 'password', 'proxy.host', None, None, None, None) ),
+
+                  ( "http://user@proxy.host",
+                      ('http://', 'user', None, 'proxy.host', None, None, None, None) ),
+
+                  ( "http://user:password@proxy.host:3128",
+                      ('http://', 'user', 'password', 'proxy.host', '3128', None, None, None) ),
+
+                  ( "http://user@proxy.host:3128",
+                      ('http://', 'user', None, 'proxy.host', '3128', None, None, None) ),
+
+                  ( "http://proxy.host/blah/blah",
+                      ('http://', None, None, 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "http://proxy.host:3128/blah/blah",
+                      ('http://', None, None, 'proxy.host', '3128', '/blah/blah', None, None) ),
+
+                  ( "http://user:password@proxy.host/blah/blah",
+                      ("http://", 'user', 'password', 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "http://%75ser:password@proxy.host/blah/blah",
+                      ("http://", '%75ser', 'password', 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "http://user:%70assword@proxy.host/blah/blah",
+                      ("http://", 'user', '%70assword', 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "http://user@proxy.host/blah/blah",
+                      ("http://", 'user', None, 'proxy.host', None, '/blah/blah', None, None) ),
+
+                  ( "http://user@proxy.host/blah/bla%68",
+                      ("http://", 'user', None, 'proxy.host', None, '/blah/bla%68', None, None) ),
+
+                  ( "http://user:password@proxy.host:3128/blah/blah",
+                      ("http://", 'user', 'password', 'proxy.host', '3128', '/blah/blah', None, None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', None, None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah?query",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', "query", None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah?query?",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', "query?", None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah?query=whatever",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', "query=whatever", None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah?query=whate%76er",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', "query=whate%76er", None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah?",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', "", None) ),
+
+                  ( "http://user@proxy.host:3128/blah/blah#fragment",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', None, "fragment") ),
+
+                  ( "http://user@proxy.host:3128/blah/blah#",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', None, "") ),
+
+                  ( "http://user@proxy.host:3128/blah/blah#fragm%65nt",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', None, "fragm%65nt") ),
+
+                  ( "http://user@proxy.host:3128/blah/blah?query=whatever#fragment",
+                      ("http://", 'user', None, 'proxy.host', '3128', '/blah/blah', "query=whatever", "fragment") ),
+
+                  # Invalid schemes
+                  ( "0http://proxy.host/", None),
+                  ( "h~ttp://proxy.host/", None),
+
+                  # Invalid usernames and passwords
+                  ( "http://%x5ser@proxy.host/", None),
+                  ( "http://*ser@proxy.host/", None),
+                  ( "http://user:p%xxssword@proxy.host/", None),
+                  ( "http://user:p@ssword@proxy.host/", None),
+
+                  # Invalid paths
+                  ( "http://user:password@proxy.host/%xxlah/blah", None),
+                  ( "http://user:password@proxy.host/[]lah/blah", None),
+
+                  # Invalid queries
+                  ( "http://proxy.host/blah/blah?quer%xx", None),
+                  ( "http://proxy.host/blah/blah?que[]y", None),
+
+                  # Invalid fragments
+                  ( "http://proxy.host/blah/blah#fragment#", None),
+                  ( "http://proxy.host/blah/blah#%xxragment", None),
+                ]
+
+
+        got_error = False
+        for proxy, result in tests:
+            match = URL_PARSE.match(proxy)
+            if match:
+                match= match.groups()
+            else:
+                match = None
+
+            try:
+                self.assertEqual(match, result)
+            except AssertionError:
+                got_error = True
+                print("Proxy parse error: `%s' did not parse as `%s': %s" % (proxy, result, match))
+
+        if got_error:
+            self.fail()
diff --git a/anaconda/tests/storage/cases/__init__.py b/anaconda/tests/storage/cases/__init__.py
new file mode 100644
index 0000000..87882a9
--- /dev/null
+++ b/anaconda/tests/storage/cases/__init__.py
@@ -0,0 +1,237 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2013  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+import logging
+import os, sys
+import re
+
+import blivet
+
+blivet.util.set_up_logging()
+blivet_log = logging.getLogger("blivet")
+blivet_log.info(sys.argv[0])
+
+from pyanaconda.installclass import DefaultInstall
+from pyanaconda.kickstart import AnacondaKSHandler, AnacondaKSParser, doKickstartStorage
+from pykickstart.errors import KickstartError
+
+class FailedTest(Exception):
+    def __init__(self, got, expected):
+        Exception.__init__(self)
+        self.got = got
+        self.expected = expected
+
+class TestCase(object):
+    """A TestCase is a way of grouping related TestCaseComponent objects
+       together into a single place.  It provides a way of iterating through
+       all these components, running each, and tabulating the results.  If any
+       component fails, the entire TestCase fails.
+
+       Class attributes:
+
+       components   -- A list of TestCaseComponent classes.
+       desc         -- A description of what this test is supposed to be
+                       testing.
+       name         -- An identifying string given to this TestCase.
+       platforms    -- A list of blivet.platform.Platform subclasses that this
+                       TestCase is valid for.  This TestCase will only run on
+                       matching platforms.  If the list is empty, it is assumed
+                       to be valid for all platforms.
+    """
+    components  = []
+    desc        = ""
+    name        = ""
+    platforms   = []
+
+    def __init__(self):
+        pass
+
+    def run(self):
+        """Iterate over all components, running each, and collecting the
+           results.
+        """
+        successes = 0
+        failures = 0
+
+        if self.platforms and blivet.platform.getPlatform().__class__.__name__ not in self.platforms:
+            print("Test %s skipped:  not valid for this platform" % self.name)
+            return
+
+        for c in self.components:
+            obj = c()
+
+            try:
+                obj._run()
+            except FailedTest as e:
+                print("Test %s-%s failed:\n\tExpected: %s\n\tGot:      %s" % (self.name, obj.name, e.expected, e.got))
+                failures += 1
+                continue
+
+            print("Test %s-%s succeeded" % (self.name, obj.name))
+            successes += 1
+
+        print("Test %s summary:" % self.name)
+        print("\tSuccesses: %s" % successes)
+        print("\tFailures:  %s" % failures)
+        return failures
+
+class TestCaseComponent(object):
+    """A TestCaseComponent is one individual test that runs as part of a TestCase.
+       It consists of a set of disk images provided by self.disksToCreate, a
+       kickstart storage snippet provided by self.ks, and an expected error
+       condition provided by self.expectedExceptionType and self.expectedExceptionText.
+       If the TestCaseComponent is expected to succeed, these latter two should
+       just be set to None.
+
+       A TestCaseComponent succeeds in the following cases:
+
+       * No exception is encountered, and self.expectedExceptionType is None.
+
+       A TestCaseComponent fails in all other cases.
+
+       Class attributes:
+
+       name -- An identifying string given to this TestCaseComponent.
+    """
+    name = ""
+
+    def __init__(self):
+        """Create a new TestCaseComponent instance.  This __init__ method should
+           typically do very little.  However, subclasses must be sure to set
+           self.disksToCreate.  This attribute is a list of (disk name, blivet.Size)
+           tuples that will be used in this test.  Disks given in this list will
+           be automatically created by setupDisks and destroyed by tearDownDisks.
+        """
+        self._disks     = {}
+        self._blivet    = None
+
+        self.disksToCreate = []
+
+    @property
+    def ks(self):
+        """Return the storage-specific portion of a kickstart file used for
+           performing this test.  The kickstart snippet must be provided as
+           text.  Only storage commands will be tested.  No bootloader actions
+           will be performed.
+        """
+        return ""
+
+    def setupDisks(self):
+        """Create all disk images given by self.disksToCreate and initialize
+           the storage module.  Subclasses may override this method, but they
+           should be sure to call the base method as well.
+        """
+        self._blivet = blivet.Blivet()
+
+        # blivet only sets up the bootloader in installer_mode.  We don't
+        # want installer_mode, though, because that involves running lots
+        # of programs on the host and setting up all sorts of other things.
+        # Thus, we set it up manually.
+        from pyanaconda.bootloader import get_bootloader
+        self._blivet._bootloader = get_bootloader()
+
+        for (name, size) in self.disksToCreate:
+            self._disks[name] = blivet.util.create_sparse_tempfile(name, size)
+            self._blivet.config.diskImages[name] = self._disks[name]
+
+        self._blivet.reset()
+
+    def tearDownDisks(self):
+        """Disable any disk images used by this test component and remove their
+           image files from the host system.  Subclasses may override this
+           method, but they should call the base method as well to make sure
+           the images get destroyed.
+        """
+        # pylint: disable=undefined-variable
+        self._blivet.devicetree.teardownDiskImages()
+
+        for d in self._disks.values():
+            os.unlink(d)
+
+    @property
+    def expectedExceptionType(self):
+        """Should this test component be expected to fail, this property returns
+           the exception type.  If this component is not expected to fail, this
+           property returns None.  All components that are expected to fail
+           should override this property.
+        """
+        return None
+
+    @property
+    def expectedExceptionText(self):
+        """Should this test component be expected to fail, this property returns
+           a regular expression that the raised exception's text must match.
+           Otherwise, this property returns None.  All components that are
+           expected to fail should override this property.
+        """
+        return None
+
+    def _text_matches(self, s):
+        prog = re.compile(self.expectedExceptionText)
+
+        for line in s.splitlines():
+            match = prog.match(line)
+            if match:
+                return match
+
+        return None
+
+    def _run(self):
+        from blivet.errors import StorageError
+
+        # Set up disks/blivet.
+        try:
+            self.setupDisks()
+
+            # Parse the kickstart using anaconda's parser, since it has more
+            # advanced error detection.  This also requires having storage set
+            # up first.
+            parser = AnacondaKSParser(AnacondaKSHandler())
+            parser.readKickstartFromString(self.ks)
+
+            instClass = DefaultInstall()
+
+            doKickstartStorage(self._blivet, parser.handler, instClass)
+            self._blivet.updateKSData()
+            self._blivet.doIt()
+        except (KickstartError, StorageError) as e:
+            # anaconda handles expected kickstart errors (like parsing busted
+            # input files) by printing the error and quitting.  For testing, an
+            # error might be expected so we should compare the result here with
+            # what is expected.
+            if self.expectedExceptionType and isinstance(e, self.expectedExceptionType):
+                # We expected an exception, and we got one of the correct type.
+                # If it also contains the string we were expecting, then the
+                # test case passes.  Otherwise, it's a failure.
+                if self.expectedExceptionText and self._text_matches(str(e)):
+                    return
+                else:
+                    raise FailedTest(str(e), self.expectedExceptionText)
+            else:
+                # We either got an exception when we were not expecting one,
+                # or we got one of a type other than what we were expecting.
+                # Either of these cases indicates a failure of the test case.
+                raise FailedTest(e, self.expectedExceptionType)
+        finally:
+            self.tearDownDisks()
+
+        if self.expectedExceptionType:
+            raise FailedTest(None, self.expectedExceptionType)
+
+        return
diff --git a/anaconda/tests/storage/cases/bz1014545.py b/anaconda/tests/storage/cases/bz1014545.py
new file mode 100644
index 0000000..6aa8ba1
--- /dev/null
+++ b/anaconda/tests/storage/cases/bz1014545.py
@@ -0,0 +1,110 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2013-2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from . import TestCase, TestCaseComponent
+
+from blivet.size import Size
+from pykickstart.errors import KickstartValueError
+
+class BTRFSOnNonBTRFSComponent(TestCaseComponent):
+    name = "BTRFSOnNonBTRFS"
+
+    def __init__(self, *args, **kwargs):
+        TestCaseComponent.__init__(self, *args, **kwargs)
+        self.disksToCreate = [("anatest-disk1", Size("1GiB"))]
+
+    @property
+    def ks(self):
+        return """
+zerombr
+clearpart --all --initlabel
+btrfs none --data=0 --metadata=1 anatest-disk1
+"""
+
+    @property
+    def expectedExceptionType(self):
+        return KickstartValueError
+
+    @property
+    def expectedExceptionText(self):
+        return "BTRFS partition .* has incorrect format"
+
+class VolGroupOnNonPVsComponent(TestCaseComponent):
+    name = "VolGroupOnNonPVs"
+
+    def __init__(self, *args, **kwargs):
+        TestCaseComponent.__init__(self, *args, **kwargs)
+        self.disksToCreate = [("anatest-disk1", Size("1GiB"))]
+
+    @property
+    def ks(self):
+        return """
+zerombr
+clearpart --all --initlabel
+volgroup myvg anatest-disk1
+"""
+
+    @property
+    def expectedExceptionType(self):
+        return KickstartValueError
+
+    @property
+    def expectedExceptionText(self):
+        return "Physical Volume .* has incorrect format"
+
+class RaidOnNonRaidMembersComponent(TestCaseComponent):
+    name = "RaidOnNonRaidMembers"
+
+    def __init__(self, *args, **kwargs):
+        TestCaseComponent.__init__(self, *args, **kwargs)
+        self.disksToCreate = [("anatest-disk1", Size("1GiB")),
+                              ("anatest-disk2", Size("1GiB"))]
+
+    @property
+    def ks(self):
+        return """
+zerombr
+clearpart --all --initlabel
+raid / --level=1 --device=md0 anatest-disk1 anatest-disk2
+"""
+
+    @property
+    def expectedExceptionType(self):
+        return KickstartValueError
+
+    @property
+    def expectedExceptionText(self):
+        return "RAID member .* has incorrect format"
+
+class BZ1014545_TestCase(TestCase):
+    components = [BTRFSOnNonBTRFSComponent,
+                  RaidOnNonRaidMembersComponent,
+                  VolGroupOnNonPVsComponent]
+    name = "1014545"
+    desc = """The members of various commands must have the correct format.
+For instance, raid members must have mdmember, and volgroup members must have
+lvmpv.  If they do not have this format, a KickstartValueError should be raised
+during storage execution time.
+
+Note that this is different from the error condition described in the bug.
+There, anaconda was letting the invalid format go and then hitting errors
+much further in installation - during bootloader installation.  The real
+bug is that this condition should be detected when the kickstart storage
+commands are being converted to actions.
+"""
diff --git a/anaconda/tests/storage/cases/bz1067707.py b/anaconda/tests/storage/cases/bz1067707.py
new file mode 100644
index 0000000..e49e4fc
--- /dev/null
+++ b/anaconda/tests/storage/cases/bz1067707.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2014  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+from . import TestCase, TestCaseComponent
+from blivet.size import Size
+
+class SwapWithRecommendedSizeComponent(TestCaseComponent):
+    name = "SwapWithRecommendedSize"
+
+    def __init__(self, *args, **kwargs):
+        TestCaseComponent.__init__(self, *args, **kwargs)
+        self.disksToCreate = [("anatest-disk1", Size("1GiB"))]
+
+    @property
+    def ks(self):
+        return """
+zerombr
+clearpart --all --initlabel
+part swap --recommended
+"""
+
+class BZ1067707_TestCase(TestCase):
+    components = [SwapWithRecommendedSizeComponent]
+    name = "1067707"
+    desc = """Partition lines do not necessarily require a size to be
+specified.  There are plenty of reasons why a user might not do this:  putting
+a filesystem on a given pre-existing partition, giving a resize or maxsize
+option, or (in this case) asking for the recommended swap size.
+"""
diff --git a/anaconda/tests/storage/run_storage_tests.py b/anaconda/tests/storage/run_storage_tests.py
new file mode 100644
index 0000000..ef155e0
--- /dev/null
+++ b/anaconda/tests/storage/run_storage_tests.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+import os, sys
+
+if os.geteuid() != 0:
+    sys.stderr.write("You must be root to run the storage tests; skipping.\n")
+    # This return code tells the automake test driver that this test was skipped.
+    os._exit(77)
+
+from cases.bz1014545 import BZ1014545_TestCase
+from cases.bz1067707 import BZ1067707_TestCase
+
+for tc in [BZ1014545_TestCase(),
+           BZ1067707_TestCase()]:
+    failures = tc.run()
+
+os._exit(failures)
diff --git a/anaconda/tests/testenv.sh b/anaconda/tests/testenv.sh
index 1568644..017559d 100644
--- a/anaconda/tests/testenv.sh
+++ b/anaconda/tests/testenv.sh
@@ -9,10 +9,27 @@ fi
 : "${top_builddir:=$top_srcdir}"
 
 if [ -z "$PYTHONPATH" ]; then
-    PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}"
+    PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}:${top_srcdir}/tests/lib"
 else
-    PYTHONPATH="${PYTHONPATH}:${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}"
+    PYTHONPATH="${PYTHONPATH}:${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}:${top_srcdir}/tests/lib"
 fi
+
+if [ -z "$LD_LIBRARY_PATH" ]; then
+    LD_LIBRARY_PATH="${top_builddir}/widgets/src/.libs"
+else
+    LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${top_builddir}/widgets/src/.libs"
+fi
+
+ANACONDA_INSTALL_CLASSES="${top_builddir}/pyanaconda/installclasses"
+GI_TYPELIB_PATH="${top_builddir}/widgets/src"
+
+export ANACONDA_INSTALL_CLASSES
+export GI_TYPELIB_PATH
+export LD_LIBRARY_PATH
 export PYTHONPATH
 export top_srcdir
 export top_builddir
+
+# This must be added to gi.overrides.__path__ by any test requiring the
+# AnacondaWidgets gi-overrides
+export ANACONDA_WIDGETS_OVERRIDES="${top_srcdir}/widgets/python"
diff --git a/anaconda/widgets/configure b/anaconda/widgets/configure
index c315cb6..89cb4bb 100755
--- a/anaconda/widgets/configure
+++ b/anaconda/widgets/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for AnacondaWidgets 2.0.
+# Generated by GNU Autoconf 2.69 for AnacondaWidgets 3.1.
 #
 # Report bugs to <clumens@redhat.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='AnacondaWidgets'
 PACKAGE_TARNAME='anacondawidgets'
-PACKAGE_VERSION='2.0'
-PACKAGE_STRING='AnacondaWidgets 2.0'
+PACKAGE_VERSION='3.1'
+PACKAGE_STRING='AnacondaWidgets 3.1'
 PACKAGE_BUGREPORT='clumens@redhat.com'
 PACKAGE_URL=''
 
@@ -655,11 +655,14 @@ GTK_DOC_BUILD_HTML_FALSE
 GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
+HAVE_GTK_DOC_FALSE
+HAVE_GTK_DOC_TRUE
 GTKDOC_DEPS_LIBS
 GTKDOC_DEPS_CFLAGS
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
+GTKDOC_CHECK_PATH
 GTKDOC_CHECK
 HAVE_INTROSPECTION_FALSE
 HAVE_INTROSPECTION_TRUE
@@ -1408,7 +1411,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures AnacondaWidgets 2.0 to adapt to many kinds of systems.
+\`configure' configures AnacondaWidgets 3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1478,7 +1481,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of AnacondaWidgets 2.0:";;
+     short | recursive ) echo "Configuration of AnacondaWidgets 3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1621,7 +1624,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-AnacondaWidgets configure 2.0
+AnacondaWidgets configure 3.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2107,11 +2110,114 @@ fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by AnacondaWidgets $as_me 2.0, which was
+It was created by AnacondaWidgets $as_me 3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2460,7 +2566,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2975,7 +3081,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='anacondawidgets'
- VERSION='2.0'
+ VERSION='3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3026,6 +3132,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
@@ -4068,6 +4215,65 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -15468,7 +15674,7 @@ $as_echo "$USE_NLS" >&6; }
 
 
 
-      GETTEXT_MACRO_VERSION=0.18
+      GETTEXT_MACRO_VERSION=0.19
 
 
 
@@ -16719,36 +16925,42 @@ else
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
-
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
 #include <string.h>
-int main ()
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
 {
-  int result = 0;
+int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           result |= 1;
@@ -16761,14 +16973,14 @@ int main ()
     iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
     if (cd_ascii_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\263";
+        static ICONV_CONST char input[] = "\263";
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           result |= 2;
@@ -16780,14 +16992,14 @@ int main ()
     iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static const char input[] = "\304";
+        static ICONV_CONST char input[] = "\304";
         static char buf[2] = { (char)0xDE, (char)0xAD };
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = 1;
         char *outptr = buf;
         size_t outbytesleft = 1;
         size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
           result |= 4;
@@ -16800,14 +17012,14 @@ int main ()
     iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
         char buf[50];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
           result |= 8;
@@ -16827,17 +17039,20 @@ int main ()
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
     result |= 16;
   return result;
+
+  ;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   am_cv_func_iconv_works=yes
-else
-  am_cv_func_iconv_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+        test "$am_cv_func_iconv_works" = no || break
+      done
       LIBS="$am_save_LIBS"
 
 fi
@@ -17741,16 +17956,78 @@ fi
 
 
 
-    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+  gtk_doc_requires="gtk-doc >= 1.14"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
+$as_echo_n "checking for gtk-doc... " >&6; }
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_gtk_doc=yes
+else
+  have_gtk_doc=no
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5
+$as_echo "$have_gtk_doc" >&6; }
+
+  if test "$have_gtk_doc" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&5
+$as_echo "$as_me: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&2;}
+  fi
+
+            # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
+if ${ac_cv_prog_GTKDOC_CHECK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GTKDOC_CHECK in
+  if test -n "$GTKDOC_CHECK"; then
+  ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
+if test -n "$GTKDOC_CHECK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+$as_echo "$GTKDOC_CHECK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_CHECK_PATH in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+  ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -17760,7 +18037,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -17771,10 +18048,10 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-if test -n "$GTKDOC_CHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-$as_echo "$GTKDOC_CHECK" >&6; }
+GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
+if test -n "$GTKDOC_CHECK_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
+$as_echo "$GTKDOC_CHECK_PATH" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -17887,18 +18164,19 @@ else
 fi
 
 
-  if test x$enable_gtk_doc = xyes; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.14\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.14") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
-else
-  as_fn_error $? "You need to have gtk-doc >= 1.14 installed to build $PACKAGE_NAME" "$LINENO" 5
-fi
-        if test "x$PACKAGE_NAME" != "xglib"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
+
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    as_fn_error $? "
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5
+  fi
+
+    if test "x$PACKAGE_NAME" != "xglib"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
@@ -17970,14 +18248,8 @@ else
 $as_echo "yes" >&6; }
 
 fi
-    fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-$as_echo "$enable_gtk_doc" >&6; }
-
     # Check whether --enable-gtk-doc-html was given.
 if test "${enable_gtk_doc_html+set}" = set; then :
   enableval=$enable_gtk_doc_html;
@@ -18002,6 +18274,14 @@ fi
   fi
 
 
+   if test x$have_gtk_doc = xyes; then
+  HAVE_GTK_DOC_TRUE=
+  HAVE_GTK_DOC_FALSE='#'
+else
+  HAVE_GTK_DOC_TRUE='#'
+  HAVE_GTK_DOC_FALSE=
+fi
+
    if test x$enable_gtk_doc = xyes; then
   ENABLE_GTK_DOC_TRUE=
   ENABLE_GTK_DOC_FALSE='#'
@@ -18144,12 +18424,12 @@ if test -n "$GTK_CFLAGS"; then
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-x11-3.0 >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-x11-3.0 >= 3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-x11-3.0 >= 3.11.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-x11-3.0 >= 3.11.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-x11-3.0 >= 3.0" 2>/dev/null`
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-x11-3.0 >= 3.11.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -18161,12 +18441,12 @@ if test -n "$GTK_LIBS"; then
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-x11-3.0 >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-x11-3.0 >= 3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-x11-3.0 >= 3.11.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-x11-3.0 >= 3.11.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-x11-3.0 >= 3.0" 2>/dev/null`
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-x11-3.0 >= 3.11.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -18187,14 +18467,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-x11-3.0 >= 3.0" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-x11-3.0 >= 3.11.3" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-x11-3.0 >= 3.0" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-x11-3.0 >= 3.11.3" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-x11-3.0 >= 3.0) were not met:
+	as_fn_error $? "Package requirements (gtk+-x11-3.0 >= 3.11.3) were not met:
 
 $GTK_PKG_ERRORS
 
@@ -18417,7 +18697,7 @@ if test -n "$PKG_CONFIG" && \
   :
 fi
 
-for ac_header in libintl.h string.h
+for ac_header in libintl.h stdlib.h string.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -18431,7 +18711,122 @@ fi
 done
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile glade/Makefile src/Makefile python/Makefile data/Makefile data/tzmapdata/Makefile"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <time.h>
+
+int
+main ()
+{
+struct tm tm;
+				     int *p = &tm.tm_sec;
+				     return !p;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_struct_tm=time.h
+else
+  ac_cv_struct_tm=sys/time.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
+
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+
+"
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_ZONE 1
+_ACEOF
+
+
+fi
+
+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
+
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
+
+else
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+#if !HAVE_DECL_TZNAME
+extern char *tzname[];
+#endif
+
+int
+main ()
+{
+return tzname[0][0];
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_var_tzname=yes
+else
+  ac_cv_var_tzname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
+  if test $ac_cv_var_tzname = yes; then
+
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
+
+  fi
+fi
+
+
+for ac_func in pow setenv setlocale strchr
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ac_config_files="$ac_config_files Makefile doc/Makefile glade/Makefile src/Makefile python/Makefile data/Makefile data/pixmaps/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18574,6 +18969,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18991,7 +19390,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by AnacondaWidgets $as_me 2.0, which was
+This file was extended by AnacondaWidgets $as_me 3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19057,7 +19456,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-AnacondaWidgets config.status 2.0
+AnacondaWidgets config.status 3.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19578,7 +19977,7 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/tzmapdata/Makefile") CONFIG_FILES="$CONFIG_FILES data/tzmapdata/Makefile" ;;
+    "data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/anaconda/widgets/configure.ac b/anaconda/widgets/configure.ac
index 19dedb9..83c197d 100644
--- a/anaconda/widgets/configure.ac
+++ b/anaconda/widgets/configure.ac
@@ -20,7 +20,7 @@
 #
 
 AC_PREREQ([2.63])
-AC_INIT([AnacondaWidgets], [2.0], [clumens@redhat.com])
+AC_INIT([AnacondaWidgets], [3.1], [clumens@redhat.com])
 AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 
@@ -53,18 +53,21 @@ m4_pattern_forbid([GTK_DOC_CHECK])dnl
 GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
 
 PKG_CHECK_MODULES([GLADEUI], [gladeui-2.0 >= 3.10])
-PKG_CHECK_MODULES([GTK], [gtk+-x11-3.0 >= 3.0])
+PKG_CHECK_MODULES([GTK], [gtk+-x11-3.0 >= 3.11.3])
 PKG_CHECK_MODULES([GLIB], [glib-2.0])
 PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier >= 5.2.1])
 PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 1.30])
 
-AC_CHECK_HEADERS([libintl.h string.h])
+AC_CHECK_HEADERS([libintl.h stdlib.h string.h unistd.h])
 
+AC_STRUCT_TIMEZONE
+
+AC_CHECK_FUNCS([pow setenv setlocale strchr])
 AC_CONFIG_FILES([Makefile
                  doc/Makefile
                  glade/Makefile
                  src/Makefile
                  python/Makefile
                  data/Makefile
-                 data/tzmapdata/Makefile])
+                 data/pixmaps/Makefile])
 AC_OUTPUT
diff --git a/anaconda/widgets/data/Makefile.am b/anaconda/widgets/data/Makefile.am
index 0f106d5..771075f 100644
--- a/anaconda/widgets/data/Makefile.am
+++ b/anaconda/widgets/data/Makefile.am
@@ -18,6 +18,6 @@
 # Red Hat Author(s): Vratislav Podzimek <vpodzime@redhat.com>
 #
 
-SUBDIRS = tzmapdata
+SUBDIRS = pixmaps
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/pixmaps/Makefile.am b/anaconda/widgets/data/pixmaps/Makefile.am
similarity index 94%
rename from anaconda/data/pixmaps/Makefile.am
rename to anaconda/widgets/data/pixmaps/Makefile.am
index 2b95c4d..fb9ee01 100644
--- a/anaconda/data/pixmaps/Makefile.am
+++ b/anaconda/widgets/data/pixmaps/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: David Cantrell <dcantrell@redhat.com>
 
-pixmapsdir        = $(datadir)/$(PACKAGE_NAME)/pixmaps
+pixmapsdir        = $(datadir)/anaconda/pixmaps
 dist_pixmaps_DATA = $(srcdir)/*.png $(srcdir)/*.svg
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/data/pixmaps/anaconda-selected-icon.svg b/anaconda/widgets/data/pixmaps/anaconda-selected-icon.svg
similarity index 57%
rename from anaconda/data/pixmaps/anaconda-selected-icon.svg
rename to anaconda/widgets/data/pixmaps/anaconda-selected-icon.svg
index 32c90fd..e2faa03 100644
--- a/anaconda/data/pixmaps/anaconda-selected-icon.svg
+++ b/anaconda/widgets/data/pixmaps/anaconda-selected-icon.svg
@@ -10,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg7384"
-   sodipodi:docname="anaconda-selected-icon.svg"
+   sodipodi:docname="emblem-default-symbolic_b-on-w.svg"
    version="1.1"
-   inkscape:version="0.48+devel r11963"
-   height="16"
-   width="16">
+   inkscape:version="0.48.4 r9939"
+   height="32.20126"
+   width="32">
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -28,14 +28,14 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:cy="6.5413406"
-     pagecolor="#ffffff"
+     inkscape:cy="28.803581"
+     pagecolor="#555753"
      borderopacity="1"
-     showborder="true"
+     showborder="false"
      inkscape:bbox-paths="false"
      guidetolerance="10"
      inkscape:object-paths="true"
-     inkscape:window-width="1145"
+     inkscape:window-width="1279"
      showguides="true"
      inkscape:object-nodes="true"
      inkscape:snap-bbox="true"
@@ -47,19 +47,22 @@
      id="namedview88"
      showgrid="false"
      inkscape:window-maximized="0"
-     inkscape:window-x="201"
+     inkscape:window-x="3840"
      inkscape:snap-global="true"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      gridtolerance="10"
-     inkscape:window-height="709"
+     inkscape:window-height="1402"
      inkscape:snap-to-guides="true"
      inkscape:current-layer="layer15"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:zoom="16"
-     inkscape:cx="6.9516857"
+     inkscape:zoom="11.313708"
+     inkscape:cx="7.2014857"
      inkscape:snap-grids="true"
-     inkscape:pageopacity="0"
-     borderlayer="true">
+     inkscape:pageopacity="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
     <inkscape:grid
        spacingx="1px"
        spacingy="1px"
@@ -68,7 +71,9 @@
        enabled="true"
        type="xygrid"
        snapvisiblegridlinesonly="true"
-       visible="true" />
+       visible="true"
+       originx="-1.09395px"
+       originy="-0.99998px" />
   </sodipodi:namedview>
   <title
      id="title9167">Gnome Symbolic Icon Theme</title>
@@ -76,38 +81,38 @@
      id="defs7386" />
   <g
      inkscape:label="status"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer9"
      style="display:inline" />
   <g
      inkscape:label="devices"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer10" />
   <g
      inkscape:label="apps"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer11" />
   <g
      inkscape:label="actions"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer12" />
   <g
      inkscape:label="places"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer13" />
   <g
      inkscape:label="mimetypes"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer14" />
   <g
      inkscape:label="emblems"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="layer15"
      style="display:inline">
@@ -115,21 +120,21 @@
        inkscape:label="emblem-important"
        transform="translate(135.8093,-581.17812)"
        id="g17779" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 11.53125 4.3125 C 11.784964 4.3148534 12.043986 4.3496993 12.28125 4.40625 C 12.035802 4.3478581 11.794428 4.3125 11.53125 4.3125 z M 12.28125 4.40625 C 12.505761 4.4597611 12.733193 4.5282014 12.9375 4.625 C 12.73111 4.5265635 12.508413 4.460292 12.28125 4.40625 z M 13.6875 5.125 C 13.850992 5.2667533 13.991932 5.4225624 14.125 5.59375 C 13.993811 5.4260074 13.847799 5.2645304 13.6875 5.125 z M 14.125 5.59375 L 11.71875 7.90625 L 10.8125 6.90625 L 9.78125 7.90625 L 11.71875 9.84375 L 14.78125 7.09375 C 14.688509 6.5295894 14.461839 6.0244437 14.125 5.59375 z M 14.84375 7.625 C 14.84375 8.544865 14.444846 9.3969938 13.84375 10 C 14.452893 9.395735 14.84375 8.5537662 14.84375 7.625 z "
-       transform="translate(482,381.99998)"
-       id="path1012" />
     <path
        inkscape:connector-curvature="0"
-       d="m 493.51417,386.30805 c -1.82723,0 -3.30412,1.49216 -3.30412,3.33188 0,1.83973 1.47689,3.33189 3.30412,3.33189 1.82723,0 3.318,-1.49216 3.318,-3.33189 0,-0.18508 -0.0267,-0.36456 -0.0555,-0.54143 l -3.06223,2.74335 -1.92929,-1.93014 1.01176,-0.99284 0.91795,0.98022 2.40931,-2.31382 C 495.51856,386.80617 494.57294,386.30805 493.51417,386.30805 Z"
+       d="m 499.06041,364.79874 c -8.82972,0 -15.96646,7.21055 -15.96646,16.10063 0,8.89008 7.13674,16.10063 15.96646,16.10063 8.8297,0 16.03354,-7.21055 16.03354,-16.10063 0,-0.89439 -0.12904,-1.76166 -0.26835,-2.61635 l -14.79756,13.25664 -9.32289,-9.32701 4.8891,-4.79769 4.43584,4.73672 11.64248,-11.18104 c -2.92636,-3.76483 -7.49586,-6.1719 -12.61216,-6.1719 z"
        id="path74"
        sodipodi:nodetypes="ssssccccccs"
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
+    <path
+       style="fill:#ffffff;stroke:none"
+       d="m 511.71875,370.93748 -0.0312,0.0312 -11.59375,11.125 -0.0625,0.0625 -4.4375,-4.75 -4.84375,4.78125 9.3125,9.3125 14.75,-13.21875 c 0.002,0.0102 -0.002,0.021 0,0.0312 l 0.125,-0.0937 c -0.45853,-2.7164 -1.57856,-5.20692 -3.21875,-7.28125 z"
+       id="path8950"
+       inkscape:connector-curvature="0" />
   </g>
   <g
      inkscape:label="categories"
-     transform="translate(-482,-381.99998)"
+     transform="translate(-483.09395,-364.79874)"
      inkscape:groupmode="layer"
      id="g4953"
      style="display:inline" />
diff --git a/anaconda/data/pixmaps/dialog-warning-symbolic.svg b/anaconda/widgets/data/pixmaps/dialog-warning-symbolic.svg
similarity index 99%
rename from anaconda/data/pixmaps/dialog-warning-symbolic.svg
rename to anaconda/widgets/data/pixmaps/dialog-warning-symbolic.svg
index d89a442..8349c5d 100644
--- a/anaconda/data/pixmaps/dialog-warning-symbolic.svg
+++ b/anaconda/widgets/data/pixmaps/dialog-warning-symbolic.svg
@@ -17,7 +17,7 @@
   <title id='title9167'>Gnome Symbolic Icon Theme</title>
   <defs id='defs7386'/>
   <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline'>
-    
+
     <path inkscape:connector-curvature='0' class='warning' d='m 308.91905,257.09375 c -0.5255,-0.0286 -1.03823,0.28305 -1.4375,0.96875 l -6.25,11.59375 C 300.69808,270.61964 301.27977,272 302.3253,272 l 13.15625,0 c 0.98172,0 1.90311,-1.15939 1.21875,-2.34375 L 310.3878,258.125 c -0.39872,-0.64617 -0.94325,-1.00262 -1.46875,-1.03125 z m -0.0313,3.9375 c 0.54448,-0.0172 1.04849,0.48677 1.03125,1.03125 l 0,3.9375 c 0.007,0.52831 -0.47163,1.01424 -1,1.01424 -0.52836,0 -1.00747,-0.48593 -1,-1.01424 l 0,-3.9375 c -0.008,-0.4666 0.3541,-0.91253 0.8125,-1 0.0511,-0.0145 0.10345,-0.025 0.15625,-0.0313 z m -0.9687,6.96875 2,0 0,2 -2,0 0,-2 z' id='path18112' sodipodi:nodetypes='cccccccccccsccscccccc' style='color:#bebebe;fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
   </g>
   <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer10' inkscape:label='devices'/>
diff --git a/anaconda/data/pixmaps/left-arrow-icon.png b/anaconda/widgets/data/pixmaps/left-arrow-icon.png
similarity index 100%
rename from anaconda/data/pixmaps/left-arrow-icon.png
rename to anaconda/widgets/data/pixmaps/left-arrow-icon.png
diff --git a/anaconda/data/pixmaps/right-arrow-icon.png b/anaconda/widgets/data/pixmaps/right-arrow-icon.png
similarity index 100%
rename from anaconda/data/pixmaps/right-arrow-icon.png
rename to anaconda/widgets/data/pixmaps/right-arrow-icon.png
diff --git a/anaconda/widgets/data/tzmapdata/Makefile.am b/anaconda/widgets/data/tzmapdata/Makefile.am
deleted file mode 100644
index 2dd6029..0000000
--- a/anaconda/widgets/data/tzmapdata/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2012  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Vratislav Podzimek <vpodzime@redhat.com>
-
-timezonemap_datadir        = $(datadir)/anaconda/tzmapdata
-dist_timezonemap_data_DATA = $(srcdir)/*.png timezones_backward
-
-MAINTAINERCLEANFILES = Makefile.in
-
diff --git a/anaconda/widgets/data/tzmapdata/bg.png b/anaconda/widgets/data/tzmapdata/bg.png
deleted file mode 100644
index 4180ee8..0000000
Binary files a/anaconda/widgets/data/tzmapdata/bg.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/cc.png b/anaconda/widgets/data/tzmapdata/cc.png
deleted file mode 100644
index 9984d23..0000000
Binary files a/anaconda/widgets/data/tzmapdata/cc.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/pin.png b/anaconda/widgets/data/tzmapdata/pin.png
deleted file mode 100644
index 599a751..0000000
Binary files a/anaconda/widgets/data/tzmapdata/pin.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-1.png b/anaconda/widgets/data/tzmapdata/timezone_-1.png
deleted file mode 100644
index fb00d83..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-1.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-10.png b/anaconda/widgets/data/tzmapdata/timezone_-10.png
deleted file mode 100644
index 472eb88..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-10.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-11.png b/anaconda/widgets/data/tzmapdata/timezone_-11.png
deleted file mode 100644
index 1da3536..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-11.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-2.png b/anaconda/widgets/data/tzmapdata/timezone_-2.png
deleted file mode 100644
index 30a1ec7..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-2.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-3.5.png b/anaconda/widgets/data/tzmapdata/timezone_-3.5.png
deleted file mode 100644
index c1df00b..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-3.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-3.png b/anaconda/widgets/data/tzmapdata/timezone_-3.png
deleted file mode 100644
index c22dbb6..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-3.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-4.5.png b/anaconda/widgets/data/tzmapdata/timezone_-4.5.png
deleted file mode 100644
index 9e3c134..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-4.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-4.png b/anaconda/widgets/data/tzmapdata/timezone_-4.png
deleted file mode 100644
index 4b5a431..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-4.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-5.5.png b/anaconda/widgets/data/tzmapdata/timezone_-5.5.png
deleted file mode 100644
index b1c788d..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-5.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-5.png b/anaconda/widgets/data/tzmapdata/timezone_-5.png
deleted file mode 100644
index 06c15e6..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-6.png b/anaconda/widgets/data/tzmapdata/timezone_-6.png
deleted file mode 100644
index 8505fb1..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-6.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-7.png b/anaconda/widgets/data/tzmapdata/timezone_-7.png
deleted file mode 100644
index fec235d..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-7.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-8.png b/anaconda/widgets/data/tzmapdata/timezone_-8.png
deleted file mode 100644
index bdad7bf..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-8.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-9.5.png b/anaconda/widgets/data/tzmapdata/timezone_-9.5.png
deleted file mode 100644
index b1c788d..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-9.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_-9.png b/anaconda/widgets/data/tzmapdata/timezone_-9.png
deleted file mode 100644
index 04cb3cb..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_-9.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_0.png b/anaconda/widgets/data/tzmapdata/timezone_0.png
deleted file mode 100644
index e59b773..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_0.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_1.png b/anaconda/widgets/data/tzmapdata/timezone_1.png
deleted file mode 100644
index 2053b7e..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_1.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_10.5.png b/anaconda/widgets/data/tzmapdata/timezone_10.5.png
deleted file mode 100644
index 6ec7f9f..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_10.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_10.png b/anaconda/widgets/data/tzmapdata/timezone_10.png
deleted file mode 100644
index 475dcf4..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_10.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_11.5.png b/anaconda/widgets/data/tzmapdata/timezone_11.5.png
deleted file mode 100644
index afdedd7..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_11.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_11.png b/anaconda/widgets/data/tzmapdata/timezone_11.png
deleted file mode 100644
index 6168aa2..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_11.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_12.75.png b/anaconda/widgets/data/tzmapdata/timezone_12.75.png
deleted file mode 100644
index 4f74a85..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_12.75.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_12.png b/anaconda/widgets/data/tzmapdata/timezone_12.png
deleted file mode 100644
index d0b3531..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_12.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_13.png b/anaconda/widgets/data/tzmapdata/timezone_13.png
deleted file mode 100644
index fe2f134..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_13.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_14.png b/anaconda/widgets/data/tzmapdata/timezone_14.png
deleted file mode 100644
index e91d4eb..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_14.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_2.png b/anaconda/widgets/data/tzmapdata/timezone_2.png
deleted file mode 100644
index ec1e874..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_2.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_3.5.png b/anaconda/widgets/data/tzmapdata/timezone_3.5.png
deleted file mode 100644
index 2dc7399..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_3.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_3.png b/anaconda/widgets/data/tzmapdata/timezone_3.png
deleted file mode 100644
index eda59dc..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_3.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_4.5.png b/anaconda/widgets/data/tzmapdata/timezone_4.5.png
deleted file mode 100644
index e09ed90..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_4.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_4.png b/anaconda/widgets/data/tzmapdata/timezone_4.png
deleted file mode 100644
index 483dc53..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_4.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_5.5.png b/anaconda/widgets/data/tzmapdata/timezone_5.5.png
deleted file mode 100644
index f904cc2..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_5.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_5.75.png b/anaconda/widgets/data/tzmapdata/timezone_5.75.png
deleted file mode 100644
index 827ce1a..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_5.75.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_5.png b/anaconda/widgets/data/tzmapdata/timezone_5.png
deleted file mode 100644
index 1bb6d20..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_6.5.png b/anaconda/widgets/data/tzmapdata/timezone_6.5.png
deleted file mode 100644
index d307bf3..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_6.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_6.png b/anaconda/widgets/data/tzmapdata/timezone_6.png
deleted file mode 100644
index 460f9cf..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_6.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_7.png b/anaconda/widgets/data/tzmapdata/timezone_7.png
deleted file mode 100644
index 239115a..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_7.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_8.75.png b/anaconda/widgets/data/tzmapdata/timezone_8.75.png
deleted file mode 100644
index 2a2917f..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_8.75.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_8.png b/anaconda/widgets/data/tzmapdata/timezone_8.png
deleted file mode 100644
index d210222..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_8.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_9.5.png b/anaconda/widgets/data/tzmapdata/timezone_9.5.png
deleted file mode 100644
index 1c3290c..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_9.5.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezone_9.png b/anaconda/widgets/data/tzmapdata/timezone_9.png
deleted file mode 100644
index 65d2e46..0000000
Binary files a/anaconda/widgets/data/tzmapdata/timezone_9.png and /dev/null differ
diff --git a/anaconda/widgets/data/tzmapdata/timezones_backward b/anaconda/widgets/data/tzmapdata/timezones_backward
deleted file mode 100644
index f1f95a8..0000000
--- a/anaconda/widgets/data/tzmapdata/timezones_backward
+++ /dev/null
@@ -1,118 +0,0 @@
-# <pre>
-# @(#)backward	8.9
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file provides links between current names for time zones
-# and their old names.  Many names changed in late 1993.
-
-Link	Africa/Asmara		Africa/Asmera
-Link	Africa/Bamako		Africa/Timbuktu
-Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
-Link	America/Adak		America/Atka
-Link	America/Argentina/Buenos_Aires	America/Buenos_Aires
-Link	America/Argentina/Catamarca	America/Catamarca
-Link	America/Atikokan	America/Coral_Harbour
-Link	America/Argentina/Cordoba	America/Cordoba
-Link	America/Tijuana		America/Ensenada
-Link	America/Indiana/Indianapolis	America/Fort_Wayne
-Link	America/Indiana/Indianapolis	America/Indianapolis
-Link	America/Argentina/Jujuy	America/Jujuy
-Link	America/Indiana/Knox	America/Knox_IN
-Link	America/Kentucky/Louisville	America/Louisville
-Link	America/Argentina/Mendoza	America/Mendoza
-Link	America/Rio_Branco	America/Porto_Acre
-Link	America/Argentina/Cordoba	America/Rosario
-Link	America/St_Thomas	America/Virgin
-Link	Asia/Ashgabat		Asia/Ashkhabad
-Link	Asia/Chongqing		Asia/Chungking
-Link	Asia/Dhaka		Asia/Dacca
-Link	Asia/Kathmandu		Asia/Katmandu
-Link	Asia/Kolkata		Asia/Calcutta
-Link	Asia/Macau		Asia/Macao
-Link	Asia/Jerusalem		Asia/Tel_Aviv
-Link	Asia/Ho_Chi_Minh	Asia/Saigon
-Link	Asia/Thimphu		Asia/Thimbu
-Link	Asia/Makassar		Asia/Ujung_Pandang
-Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
-Link	Atlantic/Faroe		Atlantic/Faeroe
-Link	Europe/Oslo		Atlantic/Jan_Mayen
-Link	Australia/Sydney	Australia/ACT
-Link	Australia/Sydney	Australia/Canberra
-Link	Australia/Lord_Howe	Australia/LHI
-Link	Australia/Sydney	Australia/NSW
-Link	Australia/Darwin	Australia/North
-Link	Australia/Brisbane	Australia/Queensland
-Link	Australia/Adelaide	Australia/South
-Link	Australia/Hobart	Australia/Tasmania
-Link	Australia/Melbourne	Australia/Victoria
-Link	Australia/Perth		Australia/West
-Link	Australia/Broken_Hill	Australia/Yancowinna
-Link	America/Rio_Branco	Brazil/Acre
-Link	America/Noronha		Brazil/DeNoronha
-Link	America/Sao_Paulo	Brazil/East
-Link	America/Manaus		Brazil/West
-Link	America/Halifax		Canada/Atlantic
-Link	America/Winnipeg	Canada/Central
-Link	America/Regina		Canada/East-Saskatchewan
-Link	America/Toronto		Canada/Eastern
-Link	America/Edmonton	Canada/Mountain
-Link	America/St_Johns	Canada/Newfoundland
-Link	America/Vancouver	Canada/Pacific
-Link	America/Regina		Canada/Saskatchewan
-Link	America/Whitehorse	Canada/Yukon
-Link	America/Santiago	Chile/Continental
-Link	Pacific/Easter		Chile/EasterIsland
-Link	America/Havana		Cuba
-Link	Africa/Cairo		Egypt
-Link	Europe/Dublin		Eire
-Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
-Link	Europe/London		GB
-Link	Europe/London		GB-Eire
-Link	Etc/GMT			GMT+0
-Link	Etc/GMT			GMT-0
-Link	Etc/GMT			GMT0
-Link	Etc/GMT			Greenwich
-Link	Asia/Hong_Kong		Hongkong
-Link	Atlantic/Reykjavik	Iceland
-Link	Asia/Tehran		Iran
-Link	Asia/Jerusalem		Israel
-Link	America/Jamaica		Jamaica
-Link	Asia/Tokyo		Japan
-Link	Pacific/Kwajalein	Kwajalein
-Link	Africa/Tripoli		Libya
-Link	America/Tijuana		Mexico/BajaNorte
-Link	America/Mazatlan	Mexico/BajaSur
-Link	America/Mexico_City	Mexico/General
-Link	Pacific/Auckland	NZ
-Link	Pacific/Chatham		NZ-CHAT
-Link	America/Denver		Navajo
-Link	Asia/Shanghai		PRC
-Link	Pacific/Pago_Pago	Pacific/Samoa
-Link	Pacific/Chuuk		Pacific/Yap
-Link	Pacific/Chuuk		Pacific/Truk
-Link	Pacific/Pohnpei		Pacific/Ponape
-Link	Europe/Warsaw		Poland
-Link	Europe/Lisbon		Portugal
-Link	Asia/Taipei		ROC
-Link	Asia/Seoul		ROK
-Link	Asia/Singapore		Singapore
-Link	Europe/Istanbul		Turkey
-Link	Etc/UCT			UCT
-Link	America/Anchorage	US/Alaska
-Link	America/Adak		US/Aleutian
-Link	America/Phoenix		US/Arizona
-Link	America/Chicago		US/Central
-Link	America/Indiana/Indianapolis	US/East-Indiana
-Link	America/New_York	US/Eastern
-Link	Pacific/Honolulu	US/Hawaii
-Link	America/Indiana/Knox	US/Indiana-Starke
-Link	America/Detroit		US/Michigan
-Link	America/Denver		US/Mountain
-Link	America/Los_Angeles	US/Pacific
-Link	Pacific/Pago_Pago	US/Samoa
-Link	Etc/UTC			UTC
-Link	Etc/UTC			Universal
-Link	Europe/Moscow		W-SU
-Link	Etc/UTC			Zulu
diff --git a/anaconda/widgets/doc/AnacondaWidgets-docs.xml b/anaconda/widgets/doc/AnacondaWidgets-docs.xml
index 3ea50ae..b67f97d 100644
--- a/anaconda/widgets/doc/AnacondaWidgets-docs.xml
+++ b/anaconda/widgets/doc/AnacondaWidgets-docs.xml
@@ -24,10 +24,10 @@
     <chapter id="windows">
         <title>Window Widgets</title>
         <xi:include href="xml/BaseWindow.xml" />
+        <xi:include href="xml/BaseStandalone.xml" />
         <xi:include href="xml/HubWindow.xml" />
         <xi:include href="xml/SpokeWindow.xml" />
         <xi:include href="xml/StandaloneWindow.xml" />
-        <xi:include href="xml/Lightbox.xml" />
     </chapter>
 
     <chapter id="disks">
@@ -40,7 +40,11 @@
         <title>Miscellaneous Widgets</title>
         <xi:include href="xml/SpokeSelector.xml" />
         <xi:include href="xml/LayoutIndicator.xml" />
-        <xi:include href="xml/TimezoneMap.xml" />
+    </chapter>
+
+    <chapter id="utility">
+	<title>Utility Functions</title>
+	<xi:include href="xml/widgets-common.xml" />
     </chapter>
 
     <chapter id="hierarchy">
@@ -52,4 +56,8 @@
         <title>Index</title>
         <xi:include href="xml/api-index-full.xml" />
     </index>
+
+    <xi:include href="xml/annotation-glossary.xml">
+	<xi:fallback />
+    </xi:include>
 </book>
diff --git a/anaconda/widgets/glade/AnacondaWidgets.xml b/anaconda/widgets/glade/AnacondaWidgets.xml
index 56da94c..044ceb2 100644
--- a/anaconda/widgets/glade/AnacondaWidgets.xml
+++ b/anaconda/widgets/glade/AnacondaWidgets.xml
@@ -1,5 +1,6 @@
 <glade-catalog name="AnacondaWidgets"
-               version="1.0"
+               version="3.1"
+               targetable="3.0,2.0,1.0"
                library="AnacondaWidgets"
                domain="glade-3"
                depends="gtk+">
@@ -17,7 +18,6 @@
                 <property id="height-request" disabled="True" />
                 <property id="modal" disabled="True" />
                 <property id="resizable" disabled="True" />
-                <property id="startup-id" visible="False" />
                 <property id="title" disabled="True" />
                 <property id="type" disabled="True" />
                 <property id="width-request" disabled="True" />
@@ -25,6 +25,11 @@
                 <property id="distribution" translatable="True" />
                 <property id="window-name" translatable="True" />
             </properties>
+
+            <signals>
+              <signal since="3.1" id="help-button-clicked" />
+            </signals>
+
         </glade-widget-class>
 
         <glade-widget-class title="Standalone Spoke Window"
@@ -34,7 +39,6 @@
                             use-placeholders="True"
                             toplevel="True">
             <post-create-function>anaconda_standalone_window_post_create</post-create-function>
-            <write-widget-function>anaconda_standalone_window_write_widget</write-widget-function>
 
             <internal-children>
                 <object name="main_box">
@@ -56,7 +60,16 @@
                             toplevel="True">
             <!-- Not a typo - we really can use the same functions here (for now) -->
             <post-create-function>anaconda_standalone_window_post_create</post-create-function>
-            <write-widget-function>anaconda_standalone_window_write_widget</write-widget-function>
+
+            <properties>
+              <property since="3.0" id="quit-button" />
+              <property since="3.0" id="continue-button" />
+            </properties>
+
+            <signals>
+              <signal since="3.0" id="quit-clicked" />
+              <signal since="3.0" id="continue-clicked" />
+            </signals>
 
             <internal-children>
                 <object name="main_box">
@@ -80,7 +93,6 @@
                             toplevel="True">
             <!-- Not a typo - we really can use the same functions here (for now) -->
             <post-create-function>anaconda_standalone_window_post_create</post-create-function>
-            <write-widget-function>anaconda_standalone_window_write_widget</write-widget-function>
 
             <internal-children>
                 <object name="main_box">
@@ -92,10 +104,6 @@
                     </object>
                 </object>
             </internal-children>
-
-            <properties>
-                <property id="button-label" translatable="True" />
-            </properties>
         </glade-widget-class>
 
         <glade-widget-class title="Spoke Selector"
@@ -105,7 +113,7 @@
             <properties>
                 <property id="column-spacing" default="6" visible="False" />
 
-                <property since="1.0" themed-icon="True" id="icon" name="Icon" default="gtk-missing-image" visible="True">
+                <property since="1.0" themed-icon="True" id="icon" name="Icon" default="image-missing" visible="True">
                     <parameter-spec>
                         <type>GParamString</type>
                     </parameter-spec>
@@ -134,15 +142,6 @@
             </properties>
         </glade-widget-class>
 
-	<glade-widget-class title="Timezone Map"
-			    name="AnacondaTimezoneMap"
-			    icon-name="widget-gtk-image"
-			    generic-name="AnacondaTimezoneMap">
-	    <properties>
-	        <property id="spacing" default="6" visible="False" />
-	    </properties>
-	</glade-widget-class>
-
     <glade-widget-class title="Layout Indicator"
 			            name="AnacondaLayoutIndicator"
 			            icon-name="widget-gtk-label"
@@ -165,7 +164,6 @@
 
     <glade-widget-group name="anaconda-misc-widgets" title="Anaconda Miscellaneous Widgets">
         <glade-widget-class-ref name="AnacondaSpokeSelector" />
-        <glade-widget-class-ref name="AnacondaTimezoneMap" />
         <glade-widget-class-ref name="AnacondaLayoutIndicator" />
     </glade-widget-group>
 </glade-catalog>
diff --git a/anaconda/widgets/python/AnacondaWidgets.py b/anaconda/widgets/python/AnacondaWidgets.py
index ec87b3f..71632bd 100644
--- a/anaconda/widgets/python/AnacondaWidgets.py
+++ b/anaconda/widgets/python/AnacondaWidgets.py
@@ -43,16 +43,34 @@ class MountpointSelector(Anaconda.MountpointSelector):
         if mountpoint:
             self.set_property("mountpoint", mountpoint)
 
+        # our extensions not related to the look of the widget
+        self._device = None
+        self._root = None
+
     @property
     def size(self):
-        # using get_property causes problems with pylint for some reason
-        # pylint: disable-msg=E1101
         return self.get_property("size")
 
     @size.setter
     def size(self, size):
         self.set_property("size", size)
 
+    @property
+    def device(self):
+        return self._device
+
+    @device.setter
+    def device(self, device):
+        self._device = device
+
+    @property
+    def root(self):
+        return self._root
+
+    @root.setter
+    def root(self, dev):
+        self._root = dev
+
 MountpointSelector = override(MountpointSelector)
 __all__.append('MountpointSelector')
 
@@ -86,11 +104,3 @@ class DiskOverview(Anaconda.DiskOverview):
 
 DiskOverview = override(DiskOverview)
 __all__.append('DiskOverview')
-
-# pylint: disable-msg=W0232
-class TimezoneMap(Anaconda.TimezoneMap):
-    def set_timezone(self, timezone, no_signal=False):
-        Anaconda.TimezoneMap.set_timezone(self, timezone, no_signal)
-
-TimezoneMap = override(TimezoneMap)
-__all__.append('TimezoneMap')
diff --git a/anaconda/widgets/python/Makefile.am b/anaconda/widgets/python/Makefile.am
index 81910ec..7a2277d 100644
--- a/anaconda/widgets/python/Makefile.am
+++ b/anaconda/widgets/python/Makefile.am
@@ -19,7 +19,7 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
-overridesdir	= $(shell python -c "import gi ; print gi._overridesdir")
+overridesdir    = $(pyexecdir)/gi/overrides
 dist_overrides_PYTHON = AnacondaWidgets.py
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/anaconda/widgets/src/BaseStandalone.c b/anaconda/widgets/src/BaseStandalone.c
new file mode 100644
index 0000000..c822cf4
--- /dev/null
+++ b/anaconda/widgets/src/BaseStandalone.c
@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2014  Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Shea <dshea@redhat.com>
+ */
+
+#include "BaseWindow.h"
+#include "BaseStandalone.h"
+#include "intl.h"
+
+/**
+ * SECTION: BaseStandalone
+ * @title: AnacondaBaseStandalone
+ * @short_description: Abstract base class for standalone Anaconda windows.
+ *
+ * #AnacondaBaseStandalone is an abstract base class for standalone windows
+ * in Anaconda; i.e., windows that do not appear in or depend upon a hub.
+ * A #AnacondaBaseStandalone can continue to the next #AnacondaBaseStandalone
+ * or quit the installer.
+ *
+ * Since: 3.0
+ */
+
+/* change value below to make sidebar bigger / smaller */
+#define STANDALONE_SIDEBAR_WIDTH_PCT    (0.15)
+
+enum {
+    SIGNAL_QUIT_CLICKED,
+    SIGNAL_CONTINUE_CLICKED,
+    LAST_SIGNAL
+};
+
+static guint standalone_signals[LAST_SIGNAL] = { 0 };
+
+enum {
+    PROP_QUIT_BUTTON = 1,
+    PROP_CONTINUE_BUTTON
+};
+
+struct _AnacondaBaseStandalonePrivate {
+    GtkWidget *quit_button, *continue_button;
+    gulong quit_clicked_handler_id, continue_clicked_handler_id;
+};
+
+static void anaconda_base_standalone_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void anaconda_base_standalone_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void anaconda_base_standalone_size_allocate(GtkWidget *window, GtkAllocation *allocation);
+static gboolean anaconda_base_standalone_on_draw(GtkWidget *window, cairo_t *cr);
+static void anaconda_base_standalone_dispose(GObject *object);
+static void anaconda_base_standalone_set_quit_button(AnacondaBaseStandalone *win, GtkButton *button);
+static void anaconda_base_standalone_set_continue_button(AnacondaBaseStandalone *win, GtkButton *button);
+static void anaconda_base_standalone_quit_clicked(GtkButton *button, gpointer user_data);
+static void anaconda_base_standalone_continue_clicked(GtkButton *button, gpointer user_data);
+
+G_DEFINE_ABSTRACT_TYPE(AnacondaBaseStandalone, anaconda_base_standalone, ANACONDA_TYPE_BASE_WINDOW)
+
+static void anaconda_base_standalone_class_init(AnacondaBaseStandaloneClass *klass) {
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+
+    object_class->set_property = anaconda_base_standalone_set_property;
+    object_class->get_property = anaconda_base_standalone_get_property;
+    object_class->dispose = anaconda_base_standalone_dispose;
+
+    widget_class->draw = anaconda_base_standalone_on_draw;
+    widget_class->size_allocate = anaconda_base_standalone_size_allocate;
+
+    /**
+     * AnacondaBaseStandalone::quit-clicked:
+     * @window: the window that received the signal
+     *
+     * Emitted when the quit button has been activated (pressed and released).
+     *
+     * Since: 3.0
+     */
+    standalone_signals[SIGNAL_QUIT_CLICKED] = g_signal_new("quit-clicked",
+                                                           G_TYPE_FROM_CLASS(object_class),
+                                                           G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                                           G_STRUCT_OFFSET(AnacondaBaseStandaloneClass, quit_clicked),
+                                                           NULL, NULL,
+                                                           g_cclosure_marshal_VOID__VOID,
+                                                           G_TYPE_NONE, 0);
+
+    /**
+     * AnacondaBaseStandalone::continue-clicked:
+     * @window: the window that received the signal
+     *
+     * Emitted when the continue button has been activated (pressed and released).
+     *
+     * Since: 3.0
+     */
+    standalone_signals[SIGNAL_CONTINUE_CLICKED] = g_signal_new("continue-clicked",
+                                                               G_TYPE_FROM_CLASS(object_class),
+                                                               G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                                               G_STRUCT_OFFSET(AnacondaBaseStandaloneClass, continue_clicked),
+                                                               NULL, NULL,
+                                                               g_cclosure_marshal_VOID__VOID,
+                                                               G_TYPE_NONE, 0);
+
+    /*
+     * These two properties can't be CONSTRUCT_ONLY, since GtkBuilder will normally
+     * set them after construction. For a window that sets its quit-button or continue-button
+     * property to a GtkButton defined as a child of the window, Builder will construct
+     * the window, then construct the Button and set the property on the window.
+     */
+
+    /**
+     * AnacondaBaseStandalone::quit-button:
+     *
+     * The button to quit anaconda.
+     *
+     * Since: 3.0
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_QUIT_BUTTON,
+                                    g_param_spec_object("quit-button",
+                                                        P_("Quit button"),
+                                                        P_("The button to quit Anaconda"),
+                                                        GTK_TYPE_BUTTON,
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+    /**
+     * AnacondaBaseStandalone::continue-button:
+     *
+     * The button to continue to the next window.
+     *
+     * Since: 3.0
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_CONTINUE_BUTTON,
+                                    g_param_spec_object("continue-button",
+                                                        P_("Continue button"),
+                                                        P_("The button to continue to the next window"),
+                                                        GTK_TYPE_BUTTON,
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+    g_type_class_add_private(object_class, sizeof(AnacondaBaseStandalonePrivate));
+}
+
+static void anaconda_base_standalone_init(AnacondaBaseStandalone *win) {
+    win->priv = G_TYPE_INSTANCE_GET_PRIVATE(win,
+                                            ANACONDA_TYPE_BASE_STANDALONE,
+                                            AnacondaBaseStandalonePrivate);
+}
+
+static void anaconda_base_standalone_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
+    AnacondaBaseStandalone *win = ANACONDA_BASE_STANDALONE(object);
+    AnacondaBaseStandalonePrivate *priv = win->priv;
+
+    switch (prop_id) {
+        case PROP_QUIT_BUTTON:
+            g_value_set_object(value, priv->quit_button);
+            break;
+        case PROP_CONTINUE_BUTTON:
+            g_value_set_object(value, priv->continue_button);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+            break;
+    }
+}
+
+static void anaconda_base_standalone_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
+    AnacondaBaseStandalone *win = ANACONDA_BASE_STANDALONE(object);
+
+    switch (prop_id) {
+        case PROP_QUIT_BUTTON:
+            anaconda_base_standalone_set_quit_button(win, g_value_get_object(value));
+            break;
+        case PROP_CONTINUE_BUTTON:
+            anaconda_base_standalone_set_continue_button(win, g_value_get_object(value));
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+            break;
+    }
+}
+
+static int get_sidebar_width(GtkWidget *window) {
+    GtkAllocation allocation;
+
+    gtk_widget_get_allocation(window, &allocation);
+    return allocation.width * STANDALONE_SIDEBAR_WIDTH_PCT;
+}
+
+static int get_sidebar_height(GtkWidget *window) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(window, &allocation);
+    return allocation.height;
+}
+
+/* Move base window content appropriate amount of space to make room for sidebar */
+static void anaconda_base_standalone_size_allocate(GtkWidget *window, GtkAllocation *allocation) {
+    GtkAllocation child_allocation;
+    GtkWidget *child;
+    int sidebar_width;
+
+    GTK_WIDGET_CLASS(anaconda_base_standalone_parent_class)->size_allocate(window, allocation);
+
+    /*
+     * For RTL languages, the width is reduced by the same amount, but the
+     * start of the window does not need to move.
+     */
+    gtk_widget_set_allocation(window, allocation);
+    sidebar_width = get_sidebar_width(window);
+    child_allocation.y = allocation->y;
+    child_allocation.width = allocation->width-sidebar_width;
+    child_allocation.height = allocation->height;
+
+    if (gtk_get_locale_direction() == GTK_TEXT_DIR_LTR)
+        child_allocation.x = allocation->x+sidebar_width;
+    else
+        child_allocation.x = allocation->x;
+
+    child = gtk_bin_get_child (GTK_BIN (window));
+    if (child && gtk_widget_get_visible (child))
+        gtk_widget_size_allocate (child, &child_allocation);
+}
+
+/* function to override default drawing to insert sidebar image */
+static gboolean anaconda_base_standalone_on_draw(GtkWidget *win, cairo_t *cr) {
+    GtkStyleContext *context;
+    gdouble sidebar_x;
+    gdouble sidebar_width;
+
+    /* calls parent class' draw handler */
+    GTK_WIDGET_CLASS(anaconda_base_standalone_parent_class)->draw(win,cr);
+
+    sidebar_width = get_sidebar_width(win);
+
+    /* For RTL languages, move the sidebar to the right edge */
+    if (gtk_get_locale_direction() == GTK_TEXT_DIR_LTR) {
+        sidebar_x = 0;
+    } else {
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(win, &allocation);
+        sidebar_x = allocation.width - sidebar_width;
+    }
+
+    context = gtk_widget_get_style_context(win);
+    gtk_style_context_save (context);
+
+    gtk_style_context_add_class(context, "logo-sidebar");
+    gtk_render_background(context, cr, sidebar_x, 0, sidebar_width, get_sidebar_height(win));
+    gtk_style_context_remove_class(context, "logo-sidebar");
+
+    gtk_style_context_add_class(context, "logo");
+    gtk_render_background(context, cr, sidebar_x, 0, sidebar_width, get_sidebar_height(win));
+    gtk_style_context_remove_class(context, "logo");
+
+    gtk_style_context_add_class(context, "product-logo");
+    gtk_render_background(context, cr, sidebar_x, 0, sidebar_width, get_sidebar_height(win));
+    gtk_style_context_remove_class(context, "product-logo");
+
+    gtk_style_context_restore (context);
+
+    return TRUE; /* TRUE to avoid default draw handler */
+}
+
+static void anaconda_base_standalone_dispose(GObject *object) {
+    AnacondaBaseStandalone *win = ANACONDA_BASE_STANDALONE(object);
+
+    anaconda_base_standalone_set_quit_button(win, NULL);
+    anaconda_base_standalone_set_continue_button(win, NULL);
+
+    G_OBJECT_CLASS(anaconda_base_standalone_parent_class)->dispose(object);
+}
+
+static void anaconda_base_standalone_set_quit_button(AnacondaBaseStandalone *win, GtkButton *button) {
+    AnacondaBaseStandalonePrivate *priv = win->priv;
+
+    if (priv->quit_button) {
+        g_signal_handler_disconnect(priv->quit_button, priv->quit_clicked_handler_id);
+        g_object_unref(priv->quit_button);
+    }
+
+    priv->quit_button = GTK_WIDGET(button);
+
+    if (priv->quit_button) {
+        g_object_ref(priv->quit_button);
+        priv->quit_clicked_handler_id = g_signal_connect(priv->quit_button, "clicked", G_CALLBACK(anaconda_base_standalone_quit_clicked), win);
+    }
+}
+
+static void anaconda_base_standalone_set_continue_button(AnacondaBaseStandalone *win, GtkButton *button) {
+    AnacondaBaseStandalonePrivate *priv = win->priv;
+
+    if (priv->continue_button) {
+        g_signal_handler_disconnect(priv->continue_button, priv->continue_clicked_handler_id);
+        g_object_unref(priv->continue_button);
+    }
+
+    priv->continue_button = GTK_WIDGET(button);
+
+    if (priv->continue_button) {
+        g_object_ref(priv->continue_button);
+        priv->continue_clicked_handler_id = g_signal_connect(priv->continue_button, "clicked", G_CALLBACK(anaconda_base_standalone_continue_clicked), win);
+    }
+}
+
+static void anaconda_base_standalone_quit_clicked(GtkButton *button, gpointer user_data) {
+    g_signal_emit(user_data, standalone_signals[SIGNAL_QUIT_CLICKED], 0);
+}
+
+static void anaconda_base_standalone_continue_clicked(GtkButton *button, gpointer user_data) {
+    g_signal_emit(user_data, standalone_signals[SIGNAL_CONTINUE_CLICKED], 0);
+}
+
+/**
+ * anaconda_base_standalone_get_may_continue:
+ * @win: a #AnacondaBaseStandalone
+ *
+ * Returns: Whether or not the continue button is sensitive (thus, whether the
+ * user may continue forward from this window).
+ *
+ * Since: 3.0
+ */
+gboolean anaconda_base_standalone_get_may_continue(AnacondaBaseStandalone *win) {
+    if (win->priv->continue_button) {
+        return gtk_widget_get_sensitive(win->priv->continue_button);
+    }
+    return FALSE;
+}
+
+/**
+ * anaconda_base_standalone_set_may_continue:
+ * @win: a #AnacondaBaseStandalone
+ * @may_continue: %TRUE if this window's continue buttons should be sensitive
+ *
+ * Specifies whether the user may continue forward from this window.  If so,
+ * the continue button will be made sensitive.  Windows default to continuable
+ * so you must set it as false if you want.  The reason the user may not be
+ * able to continue is if there is required information the user must enter
+ * when no reasonable default may be given.
+ *
+ * Since: 3.0
+ */
+void anaconda_base_standalone_set_may_continue(AnacondaBaseStandalone *win, gboolean may_continue) {
+    if (win->priv->continue_button) {
+        gtk_widget_set_sensitive(win->priv->continue_button, may_continue);
+    }
+}
+
+/**
+ * anaconda_base_standalone_get_quit_button:
+ * @win: a #AnacondaBaseStandalone
+ *
+ * Returns: (transfer none): the quit button
+ *
+ * Since: 3.0
+ */
+GtkButton * anaconda_base_standalone_get_quit_button(AnacondaBaseStandalone *win) {
+    return GTK_BUTTON(win->priv->quit_button);
+}
+
+/**
+ * anaconda_base_standalone_get_continue_button:
+ * @win: a #AnacondaBaseStandalone
+ *
+ * Returns: (transfer none): the continue button
+ *
+ * Since: 3.0
+ */
+GtkButton * anaconda_base_standalone_get_continue_button(AnacondaBaseStandalone *win) {
+    return GTK_BUTTON(win->priv->continue_button);
+}
diff --git a/anaconda/widgets/src/BaseStandalone.h b/anaconda/widgets/src/BaseStandalone.h
new file mode 100644
index 0000000..5f2e663
--- /dev/null
+++ b/anaconda/widgets/src/BaseStandalone.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2014  Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Shea <dshea@redhat.com>
+ */
+
+#ifndef _BASE_STANDALONE_H
+#define _BASE_STANDALONE_H
+
+#include <gtk/gtk.h>
+
+#include "BaseWindow.h"
+
+G_BEGIN_DECLS
+
+#define ANACONDA_TYPE_BASE_STANDALONE            (anaconda_base_standalone_get_type())
+#define ANACONDA_BASE_STANDALONE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANACONDA_TYPE_BASE_STANDALONE, AnacondaBaseStandalone))
+#define ANACONDA_IS_BASE_STANDALONE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANACONDA_TYPE_BASE_STANDALONE))
+#define ANACONDA_BASE_STANDALONE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), ANACONDA_TYPE_BASE_STANDALONE, AnacondaBaseStandaloneClass))
+#define ANACONDA_IS_BASE_STANDALONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ANACONDA_TYPE_BASE_STANDALONE))
+#define ANACONDA_BASE_STANDALONE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), ANACONDA_TYPE_BASE_STANDALONE, AnacondaBaseStandaloneClass))
+
+typedef struct _AnacondaBaseStandalone        AnacondaBaseStandalone;
+typedef struct _AnacondaBaseStandaloneClass   AnacondaBaseStandaloneClass;
+typedef struct _AnacondaBaseStandalonePrivate AnacondaBaseStandalonePrivate;
+
+/**
+ * AnacondaBaseStandalone:
+ *
+ * The AnacondaBaseStandalone class contains only private fields and should not
+ * be directly accessed.
+ */
+struct _AnacondaBaseStandalone {
+    AnacondaBaseWindow             parent;
+
+    /*< private >*/
+    AnacondaBaseStandalonePrivate *priv;
+};
+
+/**
+ * AnacondaBaseStandaloneClass:
+ * @parent_class: The object class structure needs to be the first element in
+ *                the widget class structure in order for the class mechanism
+ *                to work correctly. This allows a AnacondaBaseStandaloneClass
+ *                pointer to be cast to a #AnacondaBaseWindowClass pointer.
+ * @quit_clicked: Function pointer called when the #AnacondaBaseStandalone::quit-clicked
+ *                signal is emitted.
+ * @continue_clicked: Function pointer called when the #AnacondaBaseStandalone::continue-clicked
+ *                    signal is emitted.
+ */
+struct _AnacondaBaseStandaloneClass {
+    AnacondaBaseWindowClass parent_class;
+
+    void (* quit_clicked)     (AnacondaBaseStandalone *window);
+    void (* continue_clicked) (AnacondaBaseStandalone *window);
+};
+
+GType       anaconda_base_standalone_get_type(void);
+
+gboolean    anaconda_base_standalone_get_may_continue(AnacondaBaseStandalone *win);
+void        anaconda_base_standalone_set_may_continue(AnacondaBaseStandalone *win, gboolean may_continue);
+
+GtkButton * anaconda_base_standalone_get_quit_button(AnacondaBaseStandalone *win);
+GtkButton * anaconda_base_standalone_get_continue_button(AnacondaBaseStandalone *win);
+
+G_END_DECLS
+
+#endif
diff --git a/anaconda/widgets/src/BaseWindow.c b/anaconda/widgets/src/BaseWindow.c
index 48a8393..b739701 100644
--- a/anaconda/widgets/src/BaseWindow.c
+++ b/anaconda/widgets/src/BaseWindow.c
@@ -18,6 +18,7 @@
  */
 
 #include <libintl.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -25,16 +26,18 @@
 #include "BaseWindow.h"
 #include "intl.h"
 
+ #include <atk/atk.h>
+
 /**
  * SECTION: BaseWindow
  * @title: AnacondaBaseWindow
  * @short_description: Top-level, non-resizeable window
  *
- * A #AnacondaBaseWindow is a top-level, non-resizeable window that contains
- * other widgets and serves as the base class from which all other specialized
- * Anaconda windows are derived.  It is undecorated.
+ * A #AnacondaBaseWindow is a widget that contains other widgets and serves as
+ * the base class from which all other specialized Anaconda windows are
+ * derived.
  *
- * The window consists of two areas:
+ * The AnacondaBaseWindow consists of two areas:
  *
  * - A navigation area in the top of the screen, consisting of some basic
  *   information about what is being displayed and what is being installed.
@@ -45,22 +48,41 @@
  * <refsect2 id="AnacondaBaseWindow-BUILDER-UI"><title>AnacondaBaseWindow as GtkBuildable</title>
  * <para>
  * The AnacondaBaseWindow implementation of the #GtkBuildable interface exposes
- * the @action_area as an internal child with the name "action_area".
+ * the @nav_area as an internal child with the name "nav_area" and the
+ * @action_area as an internal child with the name "action_area".
  * </para>
  * <example>
  * <title>A <structname>AnacondaBaseWindow</structname> UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="AnacondaBaseWindow" id="window1">
- *     <child internal-child="action_area">
- *         <object class="GtkVBox" id="vbox1">
- *             <child>
- *                 <object class="GtkLabel" id="label1">
- *                     <property name="label" translatable="yes">THIS IS ONE LABEL</property>
+ *     <child internal-child="main_box">
+ *         <object class="GtkBox" id="main_box1">
+ *             <child internal-child="nav_box">
+ *                 <object class="GtkEventBox" id="nav_box1">
+ *                     <child internal-child="nav_area">
+ *                         <object class="GtkGrid" id="nav_area1">
+ *                             <child>...</child>
+ *                             <child>...</child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
- *             <child>
- *                 <object class="GtkLabel" id="label2">
- *                     <property name="label" translatable="yes">THIS IS ANOTHER LABEL</property>
+ *             <child internal-child="alignment">
+ *                 <object class="GtkAlignment" id="alignment1">
+ *                     <child internal-child="action_area">
+ *                         <object class="GtkBox" id="action_area1">
+ *                             <child>
+ *                                 <object class="GtkLabel" id="label1">
+ *                                     <property name="label" translatable="yes">THIS IS ONE LABEL</property>
+ *                                 </object>
+ *                             </child>
+ *                             <child>
+ *                                 <object class="GtkLabel" id="label2">
+ *                                     <property name="label" translatable="yes">THIS IS ANOTHER LABEL</property>
+ *                                 </object>
+ *                             </child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
  *         </object>
@@ -73,6 +95,7 @@
 
 enum {
     SIGNAL_INFO_BAR_CLICKED,
+    SIGNAL_HELP_BUTTON_CLICKED,
     LAST_SIGNAL
 };
 
@@ -87,6 +110,7 @@ enum {
 #define DEFAULT_WINDOW_NAME   N_("SPOKE NAME")
 #define DEFAULT_BETA          N_("PRE-RELEASE / TESTING")
 #define LAYOUT_INDICATOR_LABEL_WIDTH 10
+#define HELP_BUTTON_LABEL N_("Help!")
 
 struct _AnacondaBaseWindowPrivate {
     gboolean    is_beta, info_shown;
@@ -95,6 +119,7 @@ struct _AnacondaBaseWindowPrivate {
     GtkWidget  *nav_box, *nav_area, *action_area;
     GtkWidget  *name_label, *distro_label, *beta_label;
     GtkWidget  *layout_indicator;
+    GtkWidget  *help_button;
 
     /* Untranslated versions of various things. */
     gchar *orig_name, *orig_distro, *orig_beta;
@@ -106,8 +131,9 @@ static void anaconda_base_window_buildable_init(GtkBuildableIface *iface);
 static void format_beta_label(AnacondaBaseWindow *window, const char *markup);
 
 static gboolean anaconda_base_window_info_bar_clicked(GtkWidget *widget, GdkEvent *event, AnacondaBaseWindow *win);
+static void anaconda_base_window_help_button_clicked(GtkButton *button, AnacondaBaseWindow *win);
 
-G_DEFINE_TYPE_WITH_CODE(AnacondaBaseWindow, anaconda_base_window, GTK_TYPE_WINDOW,
+G_DEFINE_TYPE_WITH_CODE(AnacondaBaseWindow, anaconda_base_window, GTK_TYPE_BIN,
                         G_IMPLEMENT_INTERFACE(GTK_TYPE_BUILDABLE, anaconda_base_window_buildable_init))
 
 static void anaconda_base_window_class_init(AnacondaBaseWindowClass *klass) {
@@ -151,6 +177,7 @@ static void anaconda_base_window_class_init(AnacondaBaseWindowClass *klass) {
                                                         G_PARAM_READWRITE));
 
     klass->info_bar_clicked = NULL;
+    klass->help_button_clicked = NULL;
 
     /**
      * AnacondaBaseWindow::info-bar-clicked:
@@ -170,6 +197,24 @@ static void anaconda_base_window_class_init(AnacondaBaseWindowClass *klass) {
                                                            g_cclosure_marshal_VOID__VOID,
                                                            G_TYPE_NONE, 0);
 
+    /**
+     * AnacondaBaseWindow::help-button-clicked:
+     * @window: the window that received the signal
+     *
+     * Emitted when the help button in the right corner has been activated
+     * (pressed and released). This is commonly used to open the help view with
+     * help content for the given spoke or hub
+     *
+     * Since: 3.1
+     */
+    window_signals[SIGNAL_HELP_BUTTON_CLICKED] = g_signal_new("help-button-clicked",
+                                                              G_TYPE_FROM_CLASS(object_class),
+                                                              G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                                              G_STRUCT_OFFSET(AnacondaBaseWindowClass, help_button_clicked),
+                                                              NULL, NULL,
+                                                              g_cclosure_marshal_VOID__VOID,
+                                                              G_TYPE_NONE, 0);
+
     g_type_class_add_private(object_class, sizeof(AnacondaBaseWindowPrivate));
 }
 
@@ -188,6 +233,7 @@ GtkWidget *anaconda_base_window_new() {
 
 static void anaconda_base_window_init(AnacondaBaseWindow *win) {
     char *markup;
+    AtkObject *atk;
 
     win->priv = G_TYPE_INSTANCE_GET_PRIVATE(win,
                                             ANACONDA_TYPE_BASE_WINDOW,
@@ -203,9 +249,7 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
     win->priv->orig_distro = NULL;
     win->priv->orig_beta = NULL;
 
-    /* Set properties on the parent (Gtk.Window) class. */
-    gtk_window_set_decorated(GTK_WINDOW(win), FALSE);
-    gtk_window_maximize(GTK_WINDOW(win));
+    /* Set properties on the parent (Gtk.Bin) class. */
     gtk_widget_set_hexpand(GTK_WIDGET(win), TRUE);
     gtk_widget_set_vexpand(GTK_WIDGET(win), TRUE);
     gtk_container_set_border_width(GTK_CONTAINER(win), 0);
@@ -222,15 +266,16 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
      */
 
     win->priv->nav_box = gtk_event_box_new();
-    gtk_widget_set_app_paintable(win->priv->nav_box, TRUE);
+    gtk_widget_set_name(win->priv->nav_box, "nav-box");
     gtk_box_pack_start(GTK_BOX(win->priv->main_box), win->priv->nav_box, FALSE, FALSE, 0);
 
     win->priv->nav_area = gtk_grid_new();
     gtk_grid_set_row_homogeneous(GTK_GRID(win->priv->nav_area), FALSE);
     gtk_grid_set_column_homogeneous(GTK_GRID(win->priv->nav_area), FALSE);
-    gtk_widget_set_margin_left(win->priv->nav_area, 6);
-    gtk_widget_set_margin_right(win->priv->nav_area, 6);
-    gtk_widget_set_margin_top(win->priv->nav_area, 6);
+    gtk_widget_set_margin_start(win->priv->nav_area, 18);
+    gtk_widget_set_margin_end(win->priv->nav_area, 18);
+    gtk_widget_set_margin_top(win->priv->nav_area, 12);
+    gtk_widget_set_margin_bottom(win->priv->nav_area, 6);
 
     gtk_container_add(GTK_CONTAINER(win->priv->nav_box), win->priv->nav_area);
 
@@ -238,7 +283,13 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
      * to control the amount of space the Window's content takes up on the
      * screen.
      */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    /*
+     * GtkAlignment is deprecated, but getting rid of it would have severe downstream
+     * repurcusions, so put that off for as long as we can.
+     */
     win->priv->alignment = gtk_alignment_new(0.5, 0.0, 1.0, 1.0);
+G_GNUC_END_IGNORE_DEPRECATIONS
     gtk_box_pack_start(GTK_BOX(win->priv->main_box), win->priv->alignment, TRUE, TRUE, 0);
 
     /* The action_area goes inside the alignment and represents the main
@@ -256,7 +307,13 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
     markup = g_markup_printf_escaped("<span weight='bold' size='large'>%s</span>", _(DEFAULT_WINDOW_NAME));
     gtk_label_set_markup(GTK_LABEL(win->priv->name_label), markup);
     g_free(markup);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    /*
+     * GtkMisc is deprecated, but if you don't set the GtkMisc properties then they
+     * still default to everything being centered. A+ work everyone.
+     */
     gtk_misc_set_alignment(GTK_MISC(win->priv->name_label), 0, 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
     gtk_widget_set_hexpand(win->priv->name_label, TRUE);
 
     win->priv->orig_name = g_strdup(DEFAULT_WINDOW_NAME);
@@ -266,14 +323,18 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
     markup = g_markup_printf_escaped("<span size='large'>%s</span>", _(DEFAULT_DISTRIBUTION));
     gtk_label_set_markup(GTK_LABEL(win->priv->distro_label), markup);
     g_free(markup);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_misc_set_alignment(GTK_MISC(win->priv->distro_label), 0, 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
     win->priv->orig_distro = g_strdup(DEFAULT_DISTRIBUTION);
 
     /* Create the beta label. */
     win->priv->beta_label = gtk_label_new(NULL);
     format_beta_label(win, _(DEFAULT_BETA));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_misc_set_alignment(GTK_MISC(win->priv->beta_label), 0, 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
     gtk_widget_set_no_show_all(win->priv->beta_label, TRUE);
 
     win->priv->orig_beta = g_strdup(DEFAULT_BETA);
@@ -282,16 +343,34 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
     win->priv->layout_indicator = anaconda_layout_indicator_new();
     anaconda_layout_indicator_set_label_width(ANACONDA_LAYOUT_INDICATOR(win->priv->layout_indicator),
                                               LAYOUT_INDICATOR_LABEL_WIDTH);
+    gtk_widget_set_name(win->priv->layout_indicator, "layout-indicator");
     gtk_widget_set_halign(win->priv->layout_indicator, GTK_ALIGN_START);
     gtk_widget_set_hexpand(win->priv->layout_indicator, FALSE);
     gtk_widget_set_margin_top(win->priv->layout_indicator, 6);
     gtk_widget_set_margin_bottom(win->priv->layout_indicator, 6);
 
+    /* Create the help button. */
+    win->priv->help_button = gtk_button_new_with_label(HELP_BUTTON_LABEL);
+    gtk_widget_set_halign(win->priv->help_button, GTK_ALIGN_END);
+    gtk_widget_set_vexpand(win->priv->help_button, FALSE);
+    gtk_widget_set_valign(win->priv->help_button, GTK_ALIGN_END);
+    gtk_widget_set_margin_bottom(win->priv->help_button, 6);
+
+    atk = gtk_widget_get_accessible(win->priv->help_button);
+    atk_object_set_name(atk, HELP_BUTTON_LABEL);
+
+    /* Hook up some signals for that button.  The signal handlers here will
+     * just raise our own custom signals for the whole window.
+     */
+    g_signal_connect(win->priv->help_button, "clicked",
+                     G_CALLBACK(anaconda_base_window_help_button_clicked), win);
+
     /* Add everything to the nav area. */
     gtk_grid_attach(GTK_GRID(win->priv->nav_area), win->priv->name_label, 0, 0, 1, 1);
-    gtk_grid_attach(GTK_GRID(win->priv->nav_area), win->priv->distro_label, 1, 0, 1, 1);
+    gtk_grid_attach(GTK_GRID(win->priv->nav_area), win->priv->distro_label, 1, 0, 2, 1);
     gtk_grid_attach(GTK_GRID(win->priv->nav_area), win->priv->beta_label, 1, 1, 1, 1);
     gtk_grid_attach(GTK_GRID(win->priv->nav_area), win->priv->layout_indicator, 1, 2, 1, 1);
+    gtk_grid_attach(GTK_GRID(win->priv->nav_area), win->priv->help_button, 2, 1, 1, 2);
 }
 
 static void anaconda_base_window_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
@@ -409,6 +488,20 @@ GtkWidget *anaconda_base_window_get_nav_area(AnacondaBaseWindow *win) {
     return win->priv->nav_area;
 }
 
+/**
+ * anaconda_base_window_get_help_button:
+ * @win: a #AnacondaBaseWindow
+ *
+ * Returns the help button.
+ *
+ * Returns: (transfer none): the help button
+ *
+ * Since: 3.1
+ */
+GtkWidget *anaconda_base_window_get_help_button(AnacondaBaseWindow *win) {
+    return win->priv->help_button;
+}
+
 /**
  * anaconda_base_window_get_nav_area_background_window:
  * @win: a #AnacondaBaseWindow
@@ -549,6 +642,11 @@ static gboolean anaconda_base_window_info_bar_clicked(GtkWidget *wiget, GdkEvent
     return FALSE;
 }
 
+static void anaconda_base_window_help_button_clicked(GtkButton *button,
+                                                     AnacondaBaseWindow *win) {
+        g_signal_emit(win, window_signals[SIGNAL_HELP_BUTTON_CLICKED], 0);
+}
+
 /**
  * anaconda_base_window_clear_info:
  * @win: a #AnacondaBaseWindow
diff --git a/anaconda/widgets/src/BaseWindow.h b/anaconda/widgets/src/BaseWindow.h
index 6c08ee8..0e29df9 100644
--- a/anaconda/widgets/src/BaseWindow.h
+++ b/anaconda/widgets/src/BaseWindow.h
@@ -42,7 +42,7 @@ typedef struct _AnacondaBaseWindowPrivate AnacondaBaseWindowPrivate;
  * be directly accessed.
  */
 struct _AnacondaBaseWindow {
-    GtkWindow                  parent;
+    GtkBin                     parent;
 
     /*< private >*/
     AnacondaBaseWindowPrivate *priv;
@@ -53,14 +53,17 @@ struct _AnacondaBaseWindow {
  * @parent_class: The object class structure needs to be the first element in
  *                the widget class structure in order for the class mechanism
  *                to work correctly.  This allows a AnacondaBaseWindowClass
- *                pointer to be cast to a #GtkWindow pointer.
+ *                pointer to be cast to a #GtkBin pointer.
  * @info_bar_clicked : Function pointer called when the #AnacondaBaseWindow::info-bar-clicked
  *                     signal is emitted.
+ * @help_button_clicked: Function pointer called when the #AnacondaSpokeWindow::help-button-clicked
+ *                       signal is emitted.
  */
 struct _AnacondaBaseWindowClass {
-    GtkWindowClass parent_class;
+    GtkBinClass parent_class;
 
     void (* info_bar_clicked) (AnacondaBaseWindow *window);
+    void (* help_button_clicked) (AnacondaBaseWindow *window);
 };
 
 GType       anaconda_base_window_get_type (void);
@@ -81,6 +84,7 @@ GtkWidget  *anaconda_base_window_get_alignment     (AnacondaBaseWindow *win);
 GtkWidget  *anaconda_base_window_get_main_box      (AnacondaBaseWindow *win);
 GtkWidget  *anaconda_base_window_get_nav_area      (AnacondaBaseWindow *win);
 GtkWidget  *anaconda_base_window_get_nav_area_background_window (AnacondaBaseWindow *win);
+GtkWidget  *anaconda_base_window_get_help_button (AnacondaBaseWindow *win);
 
 G_END_DECLS
 
diff --git a/anaconda/widgets/src/DiskOverview.c b/anaconda/widgets/src/DiskOverview.c
index 52d12ab..f558e7f 100644
--- a/anaconda/widgets/src/DiskOverview.c
+++ b/anaconda/widgets/src/DiskOverview.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013  Red Hat, Inc.
+ * Copyright (C) 2011-2014  Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,12 +17,14 @@
  * Author: Chris Lumens <clumens@redhat.com>
  */
 
+#include <atk/atk.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <string.h>
 
 #include "DiskOverview.h"
 #include "intl.h"
+#include "widgets-common.h"
 
 /**
  * SECTION: DiskOverview
@@ -56,7 +58,7 @@ enum {
 #define DEFAULT_NAME          ""
 #define DEFAULT_POPUP_INFO    ""
 
-#define ICON_SIZE             128
+#define ICON_SIZE             48
 
 struct _AnacondaDiskOverviewPrivate {
     GtkWidget *grid;
@@ -80,7 +82,7 @@ static void anaconda_disk_overview_set_property(GObject *object, guint prop_id,
 static void anaconda_disk_overview_toggle_background(AnacondaDiskOverview *widget);
 
 static void anaconda_disk_overview_realize(GtkWidget *widget, gpointer user_data);
-static void anaconda_disk_overview_finalize(AnacondaDiskOverview *widget);
+static void anaconda_disk_overview_finalize(GObject *object);
 
 static gboolean anaconda_disk_overview_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data);
 
@@ -89,7 +91,7 @@ static void anaconda_disk_overview_class_init(AnacondaDiskOverviewClass *klass)
 
     object_class->set_property = anaconda_disk_overview_set_property;
     object_class->get_property = anaconda_disk_overview_get_property;
-    object_class->finalize = (GObjectFinalizeFunc) anaconda_disk_overview_finalize;
+    object_class->finalize = anaconda_disk_overview_finalize;
 
     /**
      * AnacondaDiskOverview:kind:
@@ -210,6 +212,7 @@ static void set_icon(AnacondaDiskOverview *widget, const char *icon_name) {
     GError *err = NULL;
     GIcon *base_icon, *emblem_icon, *icon;
     GEmblem *emblem = NULL;
+    gchar *file;
 
     if (!icon_name)
         return;
@@ -225,7 +228,9 @@ static void set_icon(AnacondaDiskOverview *widget, const char *icon_name) {
             return;
         }
 
-        emblem_icon = g_icon_new_for_string("/usr/share/anaconda/pixmaps/anaconda-selected-icon.svg", &err);
+        file = g_strdup_printf("%s/pixmaps/anaconda-selected-icon.svg", anaconda_get_widgets_datadir());
+        emblem_icon = g_icon_new_for_string(file, &err);
+        g_free(file);
         if (!emblem_icon) {
             fprintf(stderr, "could not create emblem: %s\n", err->message);
             g_error_free(err);
@@ -252,6 +257,8 @@ static void set_icon(AnacondaDiskOverview *widget, const char *icon_name) {
 
 /* Initialize the widgets in a newly allocated DiskOverview. */
 static void anaconda_disk_overview_init(AnacondaDiskOverview *widget) {
+    AtkObject *atk;
+    AtkRole role;
     char *markup;
 
     widget->priv = G_TYPE_INSTANCE_GET_PRIVATE(widget,
@@ -274,7 +281,7 @@ static void anaconda_disk_overview_init(AnacondaDiskOverview *widget) {
 
     /* Create the grid. */
     widget->priv->grid = gtk_grid_new();
-    gtk_grid_set_row_spacing(GTK_GRID(widget->priv->grid), 6);
+    gtk_grid_set_row_spacing(GTK_GRID(widget->priv->grid), 2);
     gtk_grid_set_column_spacing(GTK_GRID(widget->priv->grid), 6);
     gtk_container_set_border_width(GTK_CONTAINER(widget->priv->grid), 6);
 
@@ -319,6 +326,15 @@ static void anaconda_disk_overview_init(AnacondaDiskOverview *widget) {
 
     /* And this one is to handle when you select a DiskOverview via keyboard. */
     g_signal_connect(widget, "key-release-event", G_CALLBACK(anaconda_disk_overview_clicked), NULL);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    /* No existing role is appropriate for this, so ignore the warning raised
+       by registering a new role. */
+    role = atk_role_register("disk overview");
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    atk = gtk_widget_get_accessible(GTK_WIDGET(widget));
+    atk_object_set_role(atk, role);
 }
 
 gboolean anaconda_disk_overview_clicked(AnacondaDiskOverview *widget, GdkEvent *event) {
@@ -345,8 +361,11 @@ static void anaconda_disk_overview_toggle_background(AnacondaDiskOverview *widge
     gtk_widget_show(widget->priv->kind_icon);
 }
 
-static void anaconda_disk_overview_finalize(AnacondaDiskOverview *widget) {
+static void anaconda_disk_overview_finalize(GObject *object) {
+    AnacondaDiskOverview *widget = ANACONDA_DISK_OVERVIEW(object);
     g_object_unref(widget->priv->cursor);
+
+    G_OBJECT_CLASS(anaconda_disk_overview_parent_class)->finalize(object);
 }
 
 static void anaconda_disk_overview_realize(GtkWidget *widget, gpointer user_data) {
@@ -472,9 +491,9 @@ void anaconda_disk_overview_set_chosen(AnacondaDiskOverview *widget, gboolean is
 static gboolean anaconda_disk_overview_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) {
     GtkStateFlags new_state;
 
-    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FOCUSED;
+    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FLAG_SELECTED;
     if (event->in)
-        new_state |= GTK_STATE_FOCUSED;
+        new_state |= GTK_STATE_FLAG_SELECTED;
     gtk_widget_set_state_flags(widget, new_state, TRUE);
 
     return FALSE;
diff --git a/anaconda/widgets/src/HubWindow.c b/anaconda/widgets/src/HubWindow.c
index 7f118dd..3b5cdea 100644
--- a/anaconda/widgets/src/HubWindow.c
+++ b/anaconda/widgets/src/HubWindow.c
@@ -17,7 +17,7 @@
  * Author: Chris Lumens <clumens@redhat.com>
  */
 
-#include "BaseWindow.h"
+#include "BaseStandalone.h"
 #include "HubWindow.h"
 #include "intl.h"
 
@@ -26,12 +26,11 @@
  * @title: AnacondaHubWindow
  * @short_description: Window for displaying a Hub
  *
- * A #AnacondaHubWindow is a top-level window that displays a hub on the
- * entire screen.  A Hub allows selection of multiple configuration spokes
- * from a single interface, as well as a place to display current configuration
- * selections.
+ * A #AnacondaHubWindow is a widget that displays a hub on the screen.  A Hub
+ * allows selection of multiple configuration spokes from a single interface,
+ * as well as a place to display current configuration selections.
  *
- * The window consists of three areas:
+ * The AnacondaHubWindow consists of three areas:
  *
  * - A navigation area in the top of the screen, inherited from #AnacondaBaseWindow.
  *
@@ -45,27 +44,45 @@
  * <refsect2 id="AnacondaHubWindow-BUILDER-UI"><title>AnacondaHubWindow as GtkBuildable</title>
  * <para>
  * The AnacondaHubWindow implementation of the #GtkBuildable interface exposes
- * the @action_area and @scrolled_window as internal children with the names
- * "action_area" and "scrolled_window".  action_area, in this case, is largely
- * there to give a box to contain both the scrolled_window and a #GtkButtonBox.
+ * the @nav_area, @action_area and @scrolled_window as internal children with the names
+ * "nav_area", "action_area" and "scrolled_window".  action_area, in this case,
+ * is largely there to give a box to contain both the scrolled_window and a
+ * #GtkButtonBox.
  * </para>
  * <example>
  * <title>A <structname>AnacondaHubWindow</structname> UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="AnacondaHubWindow" id="hub1">
- *     <child internal-child="action_area">
- *         <object class="GtkVBox" id="vbox1">
- *             <child internal-child="scrolled_window">
- *                 <object class="GtkScrolledWindow" id="window1">
- *                     <child>...</child>
+ *     <child internal-child="main_box">
+ *         <object class="GtkBox" id="main_box1">
+ *             <child internal-child="nav_box">
+ *                 <object class="GtkEventBox" id="nav_box1">
+ *                     <child internal-child="nav_area">
+ *                         <object class="GtkGrid" id="nav_area1">
+ *                             <child>...</child>
+ *                             <child>...</child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
- *             <child>
- *                 <object class="GtkHButtonBox" id="buttonbox1">
- *                     <child>...</child>
+ *             <child internal-child="alignment">
+ *                 <object class="GtkAlignment" id="alignment1">
+ *                     <child internal-child="action_area">
+ *                         <object class="GtkBox" id="action_area1">
+ *                             <child internal-child="scrolled_window">
+ *                                 <object class="GtkScrolledWindow" id="scrolled_window1">
+ *                                     <child>...</child>
+ *                                 </object>
+ *                             </child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
  *         </object>
+ *     <child>
+ *         <object class="GtkButtonBox" id="buttonbox1">
+ *             <child>...</child>
+ *         </object>
  *     </child>
  * </object>
  * ]]></programlisting>
@@ -79,7 +96,7 @@ struct _AnacondaHubWindowPrivate {
 
 static void anaconda_hub_window_buildable_init(GtkBuildableIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE(AnacondaHubWindow, anaconda_hub_window, ANACONDA_TYPE_BASE_WINDOW,
+G_DEFINE_TYPE_WITH_CODE(AnacondaHubWindow, anaconda_hub_window, ANACONDA_TYPE_BASE_STANDALONE,
                         G_IMPLEMENT_INTERFACE(GTK_TYPE_BUILDABLE, anaconda_hub_window_buildable_init))
 
 static void anaconda_hub_window_class_init(AnacondaHubWindowClass *klass) {
@@ -113,8 +130,10 @@ static void anaconda_hub_window_init(AnacondaHubWindow *win) {
     gtk_box_pack_start(GTK_BOX(action_area), win->priv->scrolled_window, TRUE, TRUE, 0);
 
     /* The hub has different alignment requirements than a spoke. */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_alignment_set(GTK_ALIGNMENT(anaconda_base_window_get_alignment(ANACONDA_BASE_WINDOW(win))),
                       0.5, 0.0, 0.5, 1.0);
+G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 /**
diff --git a/anaconda/widgets/src/HubWindow.h b/anaconda/widgets/src/HubWindow.h
index 8040eb8..9ff91e0 100644
--- a/anaconda/widgets/src/HubWindow.h
+++ b/anaconda/widgets/src/HubWindow.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include "BaseWindow.h"
+#include "BaseStandalone.h"
 
 G_BEGIN_DECLS
 
@@ -44,7 +44,7 @@ typedef struct _AnacondaHubWindowPrivate   AnacondaHubWindowPrivate;
  * be directly accessed.
  */
 struct _AnacondaHubWindow {
-    AnacondaBaseWindow           parent;
+    AnacondaBaseStandalone     parent;
 
     /*< private >*/
     AnacondaHubWindowPrivate  *priv;
@@ -58,7 +58,7 @@ struct _AnacondaHubWindow {
  *                pointer to be cast to an #AnacondaBaseWindow pointer.
  */
 struct _AnacondaHubWindowClass {
-    AnacondaBaseWindowClass parent_class;
+    AnacondaBaseStandaloneClass parent_class;
 };
 
 GType       anaconda_hub_window_get_type (void);
diff --git a/anaconda/widgets/src/LayoutIndicator.c b/anaconda/widgets/src/LayoutIndicator.c
index 2a44560..cebc21d 100644
--- a/anaconda/widgets/src/LayoutIndicator.c
+++ b/anaconda/widgets/src/LayoutIndicator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Red Hat, Inc.
+ * Copyright (C) 2013-2014 Red Hat, Inc.
  *
  * Some parts of this code were inspired by the xfce4-xkb-plugin's sources.
  *
@@ -19,6 +19,7 @@
  * Author: Vratislav Podzimek <vpodzime@redhat.com>
  */
 
+#include <atk/atk.h>
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -59,7 +60,9 @@ struct _AnacondaLayoutIndicatorPrivate {
     GdkCursor *cursor;
     XklConfigRec *config_rec;
     gulong state_changed_handler_id;
+    gboolean state_changed_handler_id_set;
     gulong config_changed_handler_id;
+    gboolean config_changed_handler_id_set;
 };
 
 G_DEFINE_TYPE(AnacondaLayoutIndicator, anaconda_layout_indicator, GTK_TYPE_EVENT_BOX)
@@ -136,6 +139,7 @@ GtkWidget *anaconda_layout_indicator_new() {
 }
 
 static void anaconda_layout_indicator_init(AnacondaLayoutIndicator *self) {
+    AtkObject *atk;
     GdkDisplay *display;
     GdkRGBA background_color = { 0.0, 0.0, 0.0, 0.0 };
     AnacondaLayoutIndicatorClass *klass = ANACONDA_LAYOUT_INDICATOR_GET_CLASS(self);
@@ -198,9 +202,11 @@ static void anaconda_layout_indicator_init(AnacondaLayoutIndicator *self) {
     self->priv->state_changed_handler_id = g_signal_connect(klass->engine, "X-state-changed",
                                                               G_CALLBACK(x_state_changed),
                                                               g_object_ref(self));
+    self->priv->state_changed_handler_id_set = TRUE;
     self->priv->config_changed_handler_id = g_signal_connect(klass->engine, "X-config-changed",
                                                              G_CALLBACK(x_config_changed),
                                                              g_object_ref(self));
+    self->priv->config_changed_handler_id_set = TRUE;
 
     /* init layout attribute with the current layout */
     self->priv->layout = get_current_layout(klass->engine, self->priv->config_rec);
@@ -211,7 +217,9 @@ static void anaconda_layout_indicator_init(AnacondaLayoutIndicator *self) {
     gtk_label_set_max_width_chars(self->priv->layout_label, DEFAULT_LABEL_MAX_CHAR_WIDTH);
     gtk_label_set_width_chars(self->priv->layout_label, DEFAULT_LABEL_MAX_CHAR_WIDTH);
     gtk_label_set_ellipsize(self->priv->layout_label, PANGO_ELLIPSIZE_END);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_misc_set_alignment(GTK_MISC(self->priv->layout_label), 0.0, 0.5);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
     /* initialize the label with the current layout name */
     anaconda_layout_indicator_refresh_ui_elements(self);
@@ -224,13 +232,17 @@ static void anaconda_layout_indicator_init(AnacondaLayoutIndicator *self) {
     self->priv->main_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4));
     gtk_box_pack_start(self->priv->main_box, self->priv->icon, FALSE, FALSE, 0);
     gtk_box_pack_end(self->priv->main_box, GTK_WIDGET(self->priv->layout_label), FALSE, FALSE, 0);
-    gtk_widget_set_margin_left(GTK_WIDGET(self->priv->main_box), 4);
-    gtk_widget_set_margin_right(GTK_WIDGET(self->priv->main_box), 4);
+    gtk_widget_set_margin_start(GTK_WIDGET(self->priv->main_box), 4);
+    gtk_widget_set_margin_end(GTK_WIDGET(self->priv->main_box), 4);
     gtk_widget_set_margin_top(GTK_WIDGET(self->priv->main_box), 3);
     gtk_widget_set_margin_bottom(GTK_WIDGET(self->priv->main_box), 3);
 
     /* add box to the main container (self) */
     gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->priv->main_box));
+
+    atk = gtk_widget_get_accessible(GTK_WIDGET(self));
+    atk_object_set_name(atk, "Keyboard Layout");
+    atk_object_set_description(atk, self->priv->layout);
 }
 
 static void anaconda_layout_indicator_dispose(GObject *object) {
@@ -238,8 +250,17 @@ static void anaconda_layout_indicator_dispose(GObject *object) {
     AnacondaLayoutIndicatorClass *klass = ANACONDA_LAYOUT_INDICATOR_GET_CLASS(self);
 
     /* disconnect signals (XklEngine will outlive us) */
-    g_signal_handler_disconnect(klass->engine, self->priv->state_changed_handler_id);
-    g_signal_handler_disconnect(klass->engine, self->priv->config_changed_handler_id);
+    if (self->priv->state_changed_handler_id_set)
+    {
+        g_signal_handler_disconnect(klass->engine, self->priv->state_changed_handler_id);
+        self->priv->state_changed_handler_id_set = FALSE;
+    }
+
+    if (self->priv->config_changed_handler_id_set)
+    {
+        g_signal_handler_disconnect(klass->engine, self->priv->config_changed_handler_id);
+        self->priv->config_changed_handler_id_set = FALSE;
+    }
 
     /* unref all objects we reference (may be called multiple times) */
     if (self->priv->layout_label) {
@@ -258,6 +279,8 @@ static void anaconda_layout_indicator_dispose(GObject *object) {
         g_free(self->priv->layout);
         self->priv->layout = NULL;
     }
+
+    G_OBJECT_CLASS(anaconda_layout_indicator_parent_class)->dispose(object);
 }
 
 static void anaconda_layout_indicator_realize(GtkWidget *widget, gpointer data) {
@@ -322,11 +345,15 @@ static void anaconda_layout_indicator_refresh_ui_elements(AnacondaLayoutIndicato
 }
 
 static void anaconda_layout_indicator_refresh_layout(AnacondaLayoutIndicator *self) {
+    AtkObject *atk;
     AnacondaLayoutIndicatorClass *klass = ANACONDA_LAYOUT_INDICATOR_GET_CLASS(self);
 
     g_free(self->priv->layout);
     self->priv->layout = get_current_layout(klass->engine, self->priv->config_rec);
 
+    atk = gtk_widget_get_accessible(GTK_WIDGET(self));
+    atk_object_set_description(atk, self->priv->layout);
+
     anaconda_layout_indicator_refresh_ui_elements(self);
 }
 
diff --git a/anaconda/widgets/src/Lightbox.c b/anaconda/widgets/src/Lightbox.c
deleted file mode 100644
index 70479e4..0000000
--- a/anaconda/widgets/src/Lightbox.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2011  Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ales Kozumplik <akozumpl@redhat.com>
- */
-
-/* based on an example by Ray Strode <rstrode@redhat.com> */
-
-/**
- * SECTION: Lightbox
- * @title: Lightbox
- * @short_description: Functions to draw a window over a shaded background
- *
- * The lightbox is a widget used to display one window (a dialog or other
- * similar window, typically) over top of the main window in the background.
- * The main window is shaded out to make the foreground window stand out more,
- * as well as to reinforce to the user that the background window may not be
- * interacted with.
- *
- * The lightbox window will show as soon as it is created.
- */
-
-/*
- * We have two methods for drawing the transparent background, depending
- * on whether we can use a compositing window manager for alpha blending
- * or not.
- *
- * In a compositing window manager (e.g., gnome-shell on the livecd), we
- * create the transparent background using Gtk by overriding the window's
- * background color and setting an opacity.
- *
- * In a non-compositing window manager (e.g., metacity on the install DVD),
- * we override Gtk's drawing of the widget entirely. We set paintable to
- * false to indicate that theme information should not be applied, and then
- * as the parent-window property is being set, we use cairo to paint a new
- * surface using the parent's Gdk window as the source pattern, apply a 50%
- * translucent fill to the surface, and then use this surface as the
- * background for the lightbox's Gdk window.
- */
-
-#include <cairo.h>
-#include <gtk/gtk.h>
-
-#include "Lightbox.h"
-
-#include "intl.h"
-
-enum {
-    PROP_PARENT_WINDOW = 1
-};
-
-struct _AnacondaLightboxPrivate {
-    GtkWindow *transient_parent;
-    gboolean   parent_configure_event_handler_set;
-    guint      parent_configure_event_handler;
-
-    gboolean   composited;
-};
-
-static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void anaconda_lightbox_set_parent_window(GObject *gobject, GParamSpec *psec, gpointer user_data);
-
-static gboolean anaconda_lb_parent_configure_event(GtkWidget *parent, GdkEvent *event, gpointer lightbox);
-static void anaconda_lb_cleanup(GtkWidget *widget, gpointer user_data);
-
-G_DEFINE_TYPE(AnacondaLightbox, anaconda_lightbox, GTK_TYPE_WINDOW)
-
-static void anaconda_lightbox_class_init(AnacondaLightboxClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-    object_class->set_property = anaconda_lightbox_set_property;
-
-    /**
-     * AnacondaLightbox:parent-window:
-     *
-     * The parent of this window. This value is used as the transient parent
-     * for this window.
-     *
-     * Since: 2.0
-     */
-    g_object_class_install_property(object_class,
-            PROP_PARENT_WINDOW,
-            g_param_spec_object("parent-window",
-                P_("Parent Window"),
-                P_("The parent of this window"),
-                GTK_TYPE_WINDOW,
-                G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-    g_type_class_add_private(object_class, sizeof(AnacondaLightboxPrivate));
-}
-
-static void anaconda_lightbox_init(AnacondaLightbox *lightbox)
-{
-    lightbox->priv = G_TYPE_INSTANCE_GET_PRIVATE(lightbox,
-            ANACONDA_TYPE_LIGHTBOX,
-            AnacondaLightboxPrivate
-            );
-
-    /* Disable the window decorations on the parent (Gtk.Window) class */
-    gtk_container_set_border_width(GTK_CONTAINER(lightbox), 0);
-    gtk_window_set_decorated(GTK_WINDOW(lightbox), FALSE);
-    gtk_window_set_has_resize_grip(GTK_WINDOW(lightbox), FALSE);
-
-    gtk_window_set_type_hint(GTK_WINDOW(lightbox), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
-
-    /* Decide now which background drawing method to use */
-    lightbox->priv->composited = gtk_widget_is_composited(GTK_WIDGET(lightbox));
-    if (lightbox->priv->composited)
-    {
-        GdkRGBA color = {0.0, 0.0, 0.0, 1.0};    /* opaque black */
-
-        /* Set the background to black */
-        gtk_widget_override_background_color(GTK_WIDGET(lightbox),
-                GTK_STATE_FLAG_NORMAL,
-                &color
-                );
-
-        /* Set the opacity to 50% */
-        gtk_widget_set_opacity(GTK_WIDGET(lightbox), 0.5);
-    }
-    else
-    {
-        /*
-         * Indicate we will handle drawing the widget, do the rest in
-         * anaconda_lightbox_set_parent_window
-         */
-        gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE);
-    }
-
-    /* cleanup */
-    g_signal_connect(lightbox, "destroy", G_CALLBACK(anaconda_lb_cleanup), NULL);
-}
-
-static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-    AnacondaLightbox *lightbox = ANACONDA_LIGHTBOX(object);
-    AnacondaLightboxPrivate *priv = lightbox->priv;
-
-    switch (prop_id)
-    {
-        case PROP_PARENT_WINDOW:
-            priv->transient_parent = GTK_WINDOW(g_object_ref(g_value_get_object(value)));
-            /* The property is CONSTRUCT_ONLY, so no point calling notify */
-            anaconda_lightbox_set_parent_window(object, pspec, NULL);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-            break;
-    }
-}
-
-/*
- * Adjust the lightbox any time the parent window's size, position or stacking
- * changes. Returns FALSE to allow signal processing to continue.
- */
-static gboolean anaconda_lb_parent_configure_event(
-        GtkWidget *parent,
-        GdkEvent *event,
-        gpointer lightbox
-        )
-{
-    /* Always return FALSE to continue processing for this signal. */
-    GdkWindow *g_lightbox_window;
-    gint x, y, width, height;
-
-    if ((event->type != GDK_CONFIGURE) ||
-            !GTK_IS_WIDGET(parent) ||
-            !GTK_IS_WINDOW(lightbox))
-    {
-        return FALSE;
-    }
-
-    g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox));
-    if (NULL == g_lightbox_window)
-    {
-        /*
-         * No underlying GdkWindow. This may mean the lightbox is not yet
-         * realized, but whatever the cause, there's nothing we can do here.
-         */
-        return FALSE;
-    }
-
-    /* Get the current size and position of the lightbox */
-    gdk_window_get_geometry(g_lightbox_window, &x, &y, &width, &height);
-
-    /* Resize and move the lightbox if anything changed */
-    if ((event->configure.x != x) || (event->configure.y != y) ||
-            (event->configure.width != width) || (event->configure.height != height))
-    {
-        gdk_window_move_resize(g_lightbox_window,
-                event->configure.x,
-                event->configure.y,
-                event->configure.width,
-                event->configure.height
-                );
-    }
-
-    return FALSE;
-}
-
-
-/*
- * Draw the window background. Uses the gobject notify handler signature
- * in case we want to allow parent-window to change in the future.
- */
-static void anaconda_lightbox_set_parent_window(
-        GObject *gobject,
-        GParamSpec *psec,
-        gpointer user_data
-        )
-{
-    AnacondaLightbox *lightbox;
-
-    GdkWindow *g_lightbox_window;
-    GdkWindow *g_parent_window;
-    cairo_surface_t *surface;
-    cairo_pattern_t *pattern;
-    cairo_t *cr;
-
-    if (!ANACONDA_IS_LIGHTBOX(gobject))
-    {
-        return;
-    }
-
-    lightbox = ANACONDA_LIGHTBOX(gobject);
-
-    /*
-     * Skip the check for whether the value has changed, since we only allow
-     * it to be set in the constructor
-     */
-
-    if (lightbox->priv->transient_parent)
-    {
-        gtk_window_set_transient_for(GTK_WINDOW(lightbox), lightbox->priv->transient_parent);
-
-        /* Destroy the lightbox when the parent is destroyed */
-        gtk_window_set_destroy_with_parent(GTK_WINDOW(lightbox), TRUE);
-
-        /* Set the initial position to the center of the parent */
-        gtk_window_set_position(GTK_WINDOW(lightbox), GTK_WIN_POS_CENTER_ON_PARENT);
-
-        /* Set the lightbox to the parent window's dimensions */
-        g_parent_window = gtk_widget_get_window(GTK_WIDGET(lightbox->priv->transient_parent));
-        gtk_window_set_default_size(GTK_WINDOW(lightbox),
-                gdk_window_get_width(g_parent_window),
-                gdk_window_get_height(g_parent_window)
-                );
-
-        /* make the shade move with the parent window */
-        /* Add a reference for the lightbox pointer held for the handler */
-        g_object_ref(lightbox);
-        lightbox->priv->parent_configure_event_handler =
-            g_signal_connect(lightbox->priv->transient_parent, "configure-event",
-                    G_CALLBACK(anaconda_lb_parent_configure_event), lightbox);
-        lightbox->priv->parent_configure_event_handler_set = TRUE;
-
-        /* Handle the non-compositing background case */
-        if (!lightbox->priv->composited)
-        {
-            /*
-             * NB: We should probably be handling the draw signal in order to refresh
-             * the transparent pattern from the parent window whenver something
-             * changes, but by the time things get to the signal handler the surface is
-             * already set up and doesn't support alpha channels and replacing it
-             * doesn't seem to work quite right. Besides, none of these windows are
-             * supposed to move anyway.
-             */
-
-            /* Realize the window to initialize the Gdk objects */
-            if (!gtk_widget_get_realized(GTK_WIDGET(lightbox)))
-            {
-                gtk_widget_realize(GTK_WIDGET(lightbox));
-            }
-            g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox));
-
-            /* Create a new surface that supports alpha content */
-            surface = gdk_window_create_similar_surface(g_lightbox_window,
-                    CAIRO_CONTENT_COLOR_ALPHA,
-                    gdk_window_get_width(g_parent_window),
-                    gdk_window_get_height(g_parent_window));
-            cr = cairo_create(surface);
-
-            /* Use the parent window as a pattern and paint it on the surface */
-            gdk_cairo_set_source_window(cr, g_parent_window, 0, 0);
-            cairo_paint(cr);
-
-            /* Paint a black, 50% transparent shade */
-            cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5);
-            cairo_paint(cr);
-
-            cairo_destroy(cr);
-
-            /* Use the surface we painted as the window background */
-            pattern = cairo_pattern_create_for_surface(surface);
-            gdk_window_set_background_pattern(g_lightbox_window, pattern);
-            cairo_pattern_destroy(pattern);
-        }
-    }
-
-    gtk_widget_show(GTK_WIDGET(lightbox));
-}
-
-/* Clean up references to lightbox held by the parent window */
-static void anaconda_lb_cleanup(GtkWidget *widget, gpointer user_data)
-{
-    AnacondaLightbox *lightbox;
-
-    /* Remove the signal handlers set on the parent window */
-    if (ANACONDA_IS_LIGHTBOX(widget))
-    {
-        lightbox = ANACONDA_LIGHTBOX(widget);
-
-        if (lightbox->priv->parent_configure_event_handler_set)
-        {
-            g_signal_handler_disconnect(lightbox->priv->transient_parent,
-                    lightbox->priv->parent_configure_event_handler);
-            lightbox->priv->parent_configure_event_handler_set = FALSE;
-            g_object_unref(lightbox);
-        }
-
-        /* Drop the reference for the parent window */
-        g_object_unref(lightbox->priv->transient_parent);
-        lightbox->priv->transient_parent = NULL;
-    }
-}
-
-/**
- * anaconda_lightbox_new:
- * @parent: The parent for this window
- *
- * Creates a new #AnacondaLightbox, which is a top-level, undecorated window
- * that uses a shaded version of its parent window's background as its own
- * background.
- *
- * Returns: the new lightbox as a #GtkWidget
- */
-GtkWidget* anaconda_lightbox_new(GtkWindow *parent)
-{
-    AnacondaLightbox *lightbox;
-
-    lightbox = ANACONDA_LIGHTBOX(g_object_new(ANACONDA_TYPE_LIGHTBOX,
-                "parent-window", parent,
-                NULL));
-
-    return GTK_WIDGET(lightbox);
-}
diff --git a/anaconda/widgets/src/Lightbox.h b/anaconda/widgets/src/Lightbox.h
deleted file mode 100644
index 7e645e2..0000000
--- a/anaconda/widgets/src/Lightbox.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2011  Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ales Kozumplik <akozumpl@redhat.com>
- */
-
-#ifndef LIGHTBOX_H
-#define LIGHTBOX_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define ANACONDA_TYPE_LIGHTBOX              (anaconda_lightbox_get_type())
-#define ANACONDA_LIGHTBOX(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANACONDA_TYPE_LIGHTBOX, AnacondaLightbox))
-#define ANACONDA_LIGHTBOX_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), ANACONDA_TYPE_LIGHTBOX, AnacondaLightboxClass))
-#define ANACONDA_IS_LIGHTBOX(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANACONDA_TYPE_LIGHTBOX))
-#define ANACONDA_IS_LIGHTBOX_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), ANACONDA_TYPE_LIGHTBOX))
-#define ANACONDA_LIGHTBOX_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), ANACONDA_TYPE_LIGHTBOX, AnacondaLightboxClass))
-
-typedef struct _AnacondaLightbox        AnacondaLightbox;
-typedef struct _AnacondaLightboxClass   AnacondaLightboxClass;
-typedef struct _AnacondaLightboxPrivate AnacondaLightboxPrivate;
-
-/**
- * AnacondaLightbox:
- *
- * The AnacondaLightbox struct contains only private fields and should not
- * be directly accessed.
- */
-struct _AnacondaLightbox {
-    GtkWindow               parent;
-
-    /*< private >*/
-    AnacondaLightboxPrivate *priv;
-};
-
-/**
- * AnacondaLightboxClass:
- * @parent_class: The object class structure needs to be the first element in
- *                the widget class structure in order for the class mechanism
- *                to work correctly. This allows a AnacondaLightbox
- *                pointer to be cast to a #GtkWindow pointer.
- */
-struct _AnacondaLightboxClass {
-    GtkWindowClass          parent_class;
-};
-
-GType      anaconda_lightbox_get_type(void);
-GtkWidget *anaconda_lightbox_new(GtkWindow *parent);
-
-G_END_DECLS
-
-#endif
diff --git a/anaconda/widgets/src/Makefile.am b/anaconda/widgets/src/Makefile.am
index 689207e..42615c2 100644
--- a/anaconda/widgets/src/Makefile.am
+++ b/anaconda/widgets/src/Makefile.am
@@ -32,9 +32,9 @@ GISOURCES = BaseWindow.c \
 	 SpokeSelector.c \
 	 SpokeWindow.c \
 	 StandaloneWindow.c \
-	 TimezoneMap.c \
 	 LayoutIndicator.c \
-	 Lightbox.c
+	 BaseStandalone.c \
+	 widgets-common.c
 
 GIHDRS = BaseWindow.h \
 	 DiskOverview.h \
@@ -43,13 +43,13 @@ GIHDRS = BaseWindow.h \
 	 SpokeSelector.h \
 	 SpokeWindow.h \
 	 StandaloneWindow.h \
-	 TimezoneMap.h \
 	 LayoutIndicator.h \
-	 Lightbox.h
+	 BaseStandalone.h \
+	 widgets-common.h
 
-NONGISOURCES = tz.c
+NONGISOURCES =
 
-NONGIHDRS = tz.h
+NONGIHDRS =
 
 SOURCES = $(GISOURCES) $(NONGISOURCES)
 
@@ -65,7 +65,7 @@ libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(LIBXKLAVIER_CFL
 			       -DWIDGETS_DATADIR=$(WIDGETSDATA)\
 			       -DTZMAP_DATADIR=$(TZMAPDATA)
 libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) $(LIBXKLAVIER_LIBS)
-libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 1:0:0
+libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 3:0:1
 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) \
 	  glade-adaptor.c
 
@@ -75,18 +75,18 @@ lib_include_HEADERS = $(HDRS)
 MAINTAINERCLEANFILES = gettext.h
 
 if HAVE_INTROSPECTION
-AnacondaWidgets-1.0.gir: libAnacondaWidgets.la
+AnacondaWidgets-3.0.gir: libAnacondaWidgets.la
 
-AnacondaWidgets_1_0_gir_FILES = $(GISOURCES) $(GIHDRS)
-AnacondaWidgets_1_0_gir_LIBS = libAnacondaWidgets.la
-AnacondaWidgets_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Anaconda --symbol-prefix=anaconda
-AnacondaWidgets_1_0_gir_INCLUDES = Gtk-3.0 Xkl-1.0
+AnacondaWidgets_3_0_gir_FILES = $(GISOURCES) $(GIHDRS)
+AnacondaWidgets_3_0_gir_LIBS = libAnacondaWidgets.la
+AnacondaWidgets_3_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Anaconda --symbol-prefix=anaconda
+AnacondaWidgets_3_0_gir_INCLUDES = Gtk-3.0 Xkl-1.0
 
-INTROSPECTION_GIRS = AnacondaWidgets-1.0.gir
+INTROSPECTION_GIRS = AnacondaWidgets-3.0.gir
 
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES = AnacondaWidgets-1.0.gir $(typelib_DATA)
+CLEANFILES = AnacondaWidgets-3.0.gir $(typelib_DATA)
 MAINTAINERCLEANFILES += Makefile.in
 endif
diff --git a/anaconda/widgets/src/MountpointSelector.c b/anaconda/widgets/src/MountpointSelector.c
index 9c8e61c..b2323b4 100644
--- a/anaconda/widgets/src/MountpointSelector.c
+++ b/anaconda/widgets/src/MountpointSelector.c
@@ -21,10 +21,12 @@
 #include <gdk/gdk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <pango/pango.h>
 #include <gettext.h>
 
 #include "MountpointSelector.h"
 #include "intl.h"
+#include "widgets-common.h"
 
 /**
  * SECTION: MountpointSelector
@@ -66,17 +68,16 @@ static void anaconda_mountpoint_selector_get_property(GObject *object, guint pro
 static void anaconda_mountpoint_selector_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 
 static void anaconda_mountpoint_selector_realize(GtkWidget *widget, gpointer user_data);
-static void anaconda_mountpoint_selector_finalize(AnacondaMountpointSelector *widget);
+static void anaconda_mountpoint_selector_finalize(GObject *object);
 
-static void     anaconda_mountpoint_selector_toggle_background(AnacondaMountpointSelector *widget);
-static gboolean anaconda_mountpoint_selector_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data);
+static void anaconda_mountpoint_selector_toggle_background(AnacondaMountpointSelector *widget);
 
 static void anaconda_mountpoint_selector_class_init(AnacondaMountpointSelectorClass *klass) {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
     object_class->set_property = anaconda_mountpoint_selector_set_property;
     object_class->get_property = anaconda_mountpoint_selector_get_property;
-    object_class->finalize = (GObjectFinalizeFunc) anaconda_mountpoint_selector_finalize;
+    object_class->finalize = anaconda_mountpoint_selector_finalize;
 
     /**
      * AnacondaMountpointSelector:name:
@@ -167,16 +168,9 @@ static void format_name_label(AnacondaMountpointSelector *widget, const char *va
     g_free(markup);
 }
 
-/* XXX: this should be provided by the Gtk itself (#1008821) */
-static GtkTextDirection get_default_widget_direction() {
-    const char *xlated = g_dgettext("gtk30", "default:LTR");
-    if (strcmp (xlated, "default:RTL") == 0)
-        return GTK_TEXT_DIR_RTL;
-    else
-        return GTK_TEXT_DIR_LTR;
-}
-
 static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountpoint) {
+    gchar *file;
+
     mountpoint->priv = G_TYPE_INSTANCE_GET_PRIVATE(mountpoint,
                                                    ANACONDA_TYPE_MOUNTPOINT_SELECTOR,
                                                    AnacondaMountpointSelectorPrivate);
@@ -186,8 +180,6 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
      */
     gtk_widget_set_can_focus(GTK_WIDGET(mountpoint), TRUE);
     gtk_widget_add_events(GTK_WIDGET(mountpoint), GDK_FOCUS_CHANGE_MASK|GDK_KEY_RELEASE_MASK);
-    g_signal_connect(mountpoint, "focus-in-event", G_CALLBACK(anaconda_mountpoint_selector_focus_changed), NULL);
-    g_signal_connect(mountpoint, "focus-out-event", G_CALLBACK(anaconda_mountpoint_selector_focus_changed), NULL);
 
     /* Set "hand" cursor shape when over the selector */
     mountpoint->priv->cursor = gdk_cursor_new(GDK_HAND2);
@@ -196,16 +188,18 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
     /* Create the grid. */
     mountpoint->priv->grid = gtk_grid_new();
     gtk_grid_set_column_spacing(GTK_GRID(mountpoint->priv->grid), 12);
-    gtk_widget_set_margin_left(GTK_WIDGET(mountpoint->priv->grid), 30);
+    gtk_widget_set_margin_start(GTK_WIDGET(mountpoint->priv->grid), 30);
 
     /* Create the icon.  We don't need to check if it returned NULL since
      * gtk_image_new_from_file will just display a broken image icon in that
      * case.  That's good enough error notification.
      */
-    if (get_default_widget_direction() == GTK_TEXT_DIR_LTR)
-        mountpoint->priv->arrow = gtk_image_new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png");
+    if (gtk_get_locale_direction() == GTK_TEXT_DIR_LTR)
+        file = g_strdup_printf("%s/pixmaps/right-arrow-icon.png", anaconda_get_widgets_datadir());
     else
-        mountpoint->priv->arrow = gtk_image_new_from_file("/usr/share/anaconda/pixmaps/left-arrow-icon.png");
+        file = g_strdup_printf("%s/pixmaps/left-arrow-icon.png", anaconda_get_widgets_datadir());
+    mountpoint->priv->arrow = gtk_image_new_from_file(file);
+    g_free(file);
     gtk_widget_set_no_show_all(GTK_WIDGET(mountpoint->priv->arrow), TRUE);
 
     /* Set some properties. */
@@ -214,18 +208,27 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
     /* Create the name label. */
     mountpoint->priv->name_label = gtk_label_new(NULL);
     format_name_label(mountpoint, _(DEFAULT_NAME));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    /* gtk+ did a garbage job of "deprecating" GtkMisc, so keep using it for now */
     gtk_misc_set_alignment(GTK_MISC(mountpoint->priv->name_label), 0, 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
+    gtk_label_set_ellipsize(GTK_LABEL(mountpoint->priv->name_label), PANGO_ELLIPSIZE_MIDDLE);
+    gtk_label_set_max_width_chars(GTK_LABEL(mountpoint->priv->name_label), 25);
     gtk_widget_set_hexpand(GTK_WIDGET(mountpoint->priv->name_label), TRUE);
 
     /* Create the size label. */
     mountpoint->priv->size_label = gtk_label_new(NULL);
     format_size_label(mountpoint, _(DEFAULT_SIZE));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_misc_set_alignment(GTK_MISC(mountpoint->priv->size_label), 0, 0.5);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
     /* Create the mountpoint label. */
     mountpoint->priv->mountpoint_label = gtk_label_new(NULL);
     format_mountpoint_label(mountpoint, DEFAULT_MOUNTPOINT);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_misc_set_alignment(GTK_MISC(mountpoint->priv->mountpoint_label), 0, 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
     gtk_widget_set_hexpand(GTK_WIDGET(mountpoint->priv->mountpoint_label), TRUE);
 
     /* Add everything to the grid, add the grid to the widget. */
@@ -233,13 +236,16 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
     gtk_grid_attach(GTK_GRID(mountpoint->priv->grid), mountpoint->priv->size_label, 1, 0, 1, 2);
     gtk_grid_attach(GTK_GRID(mountpoint->priv->grid), mountpoint->priv->arrow, 2, 0, 1, 2);
     gtk_grid_attach(GTK_GRID(mountpoint->priv->grid), mountpoint->priv->name_label, 0, 1, 1, 2);
-    gtk_widget_set_margin_right(GTK_WIDGET(mountpoint->priv->grid), 12);
+    gtk_widget_set_margin_end(GTK_WIDGET(mountpoint->priv->grid), 12);
 
     gtk_container_add(GTK_CONTAINER(mountpoint), mountpoint->priv->grid);
 }
 
-static void anaconda_mountpoint_selector_finalize(AnacondaMountpointSelector *widget) {
+static void anaconda_mountpoint_selector_finalize(GObject *object) {
+    AnacondaMountpointSelector *widget = ANACONDA_MOUNTPOINT_SELECTOR(object);
     g_object_unref(widget->priv->cursor);
+
+    G_OBJECT_CLASS(anaconda_mountpoint_selector_parent_class)->finalize(object);
 }
 
 static void anaconda_mountpoint_selector_realize(GtkWidget *widget, gpointer user_data) {
@@ -288,24 +294,6 @@ static void anaconda_mountpoint_selector_set_property(GObject *object, guint pro
     }
 }
 
-static gboolean anaconda_mountpoint_selector_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) {
-    GtkStateFlags new_state;
-
-    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FOCUSED;
-    if (event->in) {
-        gtk_widget_show(GTK_WIDGET(ANACONDA_MOUNTPOINT_SELECTOR(widget)->priv->arrow));
-        new_state |= GTK_STATE_FOCUSED;
-        anaconda_mountpoint_selector_set_chosen(ANACONDA_MOUNTPOINT_SELECTOR(widget), TRUE);
-    }
-    else {
-        gtk_widget_hide(GTK_WIDGET(ANACONDA_MOUNTPOINT_SELECTOR(widget)->priv->arrow));
-        anaconda_mountpoint_selector_set_chosen(ANACONDA_MOUNTPOINT_SELECTOR(widget), FALSE);
-    }
-
-    gtk_widget_set_state_flags(widget, new_state, TRUE);
-    return FALSE;
-}
-
 static void anaconda_mountpoint_selector_toggle_background(AnacondaMountpointSelector *widget) {
     if (widget->priv->chosen) {
         gtk_widget_set_state_flags(GTK_WIDGET(widget), GTK_STATE_FLAG_SELECTED, FALSE);
@@ -346,6 +334,12 @@ gboolean anaconda_mountpoint_selector_get_chosen(AnacondaMountpointSelector *wid
 void anaconda_mountpoint_selector_set_chosen(AnacondaMountpointSelector *widget, gboolean is_chosen) {
     widget->priv->chosen = is_chosen;
     anaconda_mountpoint_selector_toggle_background(widget);
-    if (is_chosen)
+
+    if (is_chosen) {
+        gtk_widget_show(GTK_WIDGET(widget->priv->arrow));
         gtk_widget_grab_focus(GTK_WIDGET(widget));
+    }
+    else {
+        gtk_widget_hide(GTK_WIDGET(widget->priv->arrow));
+    }
 }
diff --git a/anaconda/widgets/src/SpokeSelector.c b/anaconda/widgets/src/SpokeSelector.c
index 8d3b645..492a6e2 100644
--- a/anaconda/widgets/src/SpokeSelector.c
+++ b/anaconda/widgets/src/SpokeSelector.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013  Red Hat, Inc.
+ * Copyright (C) 2011-2014  Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  * Author: Chris Lumens <clumens@redhat.com>
  */
 
+#include <atk/atk.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <glib.h>
@@ -24,6 +25,7 @@
 
 #include "SpokeSelector.h"
 #include "intl.h"
+#include "widgets-common.h"
 
 /**
  * SECTION: SpokeSelector
@@ -51,7 +53,7 @@ enum {
     PROP_TITLE,
 };
 
-#define DEFAULT_ICON    "gtk-missing-image"
+#define DEFAULT_ICON    "image-missing"
 #define DEFAULT_STATUS  N_("None")
 #define DEFAULT_TITLE   N_("New Selector")
 
@@ -71,7 +73,7 @@ G_DEFINE_TYPE(AnacondaSpokeSelector, anaconda_spoke_selector, GTK_TYPE_EVENT_BOX
 static void anaconda_spoke_selector_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void anaconda_spoke_selector_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void anaconda_spoke_selector_realize(GtkWidget *widget, gpointer user_data);
-static void anaconda_spoke_selector_finalize(AnacondaSpokeSelector *spoke);
+static void anaconda_spoke_selector_finalize(GObject *object);
 
 static gboolean anaconda_spoke_selector_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data);
 
@@ -80,7 +82,7 @@ static void anaconda_spoke_selector_class_init(AnacondaSpokeSelectorClass *klass
 
     object_class->set_property = anaconda_spoke_selector_set_property;
     object_class->get_property = anaconda_spoke_selector_get_property;
-    object_class->finalize = (GObjectFinalizeFunc) anaconda_spoke_selector_finalize;
+    object_class->finalize = anaconda_spoke_selector_finalize;
 
     /**
      * AnacondaSpokeSelector:icon:
@@ -193,6 +195,7 @@ static void set_icon(AnacondaSpokeSelector *widget, const char *icon_name) {
     GtkIconTheme *icon_theme;
     GtkIconInfo *icon_info;
     GdkPixbuf *pixbuf;
+    gchar *file;
 
     if (!icon_name)
         return;
@@ -208,7 +211,9 @@ static void set_icon(AnacondaSpokeSelector *widget, const char *icon_name) {
             return;
         }
 
-        emblem_icon = g_icon_new_for_string("/usr/share/anaconda/pixmaps/dialog-warning-symbolic.svg", &err);
+        file = g_strdup_printf("%s/pixmaps/dialog-warning-symbolic.svg", anaconda_get_widgets_datadir());
+        emblem_icon = g_icon_new_for_string(file, &err);
+        g_free(file);
         if (!emblem_icon) {
             fprintf(stderr, "could not create emblem: %s\n", err->message);
             g_error_free(err);
@@ -234,16 +239,36 @@ static void set_icon(AnacondaSpokeSelector *widget, const char *icon_name) {
     icon_info = gtk_icon_theme_lookup_by_gicon(icon_theme,
                                                icon,
                                                64, 0);
-    pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
+    if (NULL == icon_info) {
+        gchar *icon_str = g_icon_to_string(icon);
+        fprintf(stderr, "unable to lookup icon %s\n", icon_str);
+        if (NULL != icon_str) {
+            g_free(icon_str);
+        }
+        return;
+    }
+
+    pixbuf = gtk_icon_info_load_icon(icon_info, &err);
+    g_object_unref(icon_info);
+
+    if (NULL == pixbuf) {
+        fprintf(stderr, "could not load icon: %s\n", err->message);
+        g_error_free(err);
+        return;
+    }
 
     widget->priv->icon = gtk_image_new_from_pixbuf(pixbuf);
     gtk_image_set_pixel_size(GTK_IMAGE(widget->priv->icon), 64);
     gtk_widget_set_valign(widget->priv->icon, GTK_ALIGN_START);
-    gtk_misc_set_padding(GTK_MISC(widget->priv->icon), 12, 0);
+    gtk_widget_set_margin_start(widget->priv->icon, 12);
+    gtk_widget_set_margin_end(widget->priv->icon, 12);
     gtk_grid_attach(GTK_GRID(widget->priv->grid), widget->priv->icon, 0, 0, 1, 2);
 }
 
 static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) {
+    AtkObject *atk;
+    AtkRole role;
+
     spoke->priv = G_TYPE_INSTANCE_GET_PRIVATE(spoke,
                                               ANACONDA_TYPE_SPOKE_SELECTOR,
                                               AnacondaSpokeSelectorPrivate);
@@ -276,14 +301,19 @@ static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) {
     format_title_label(spoke, _(DEFAULT_TITLE));
     gtk_label_set_justify(GTK_LABEL(spoke->priv->title_label), GTK_JUSTIFY_LEFT);
     gtk_label_set_mnemonic_widget(GTK_LABEL(spoke->priv->title_label), GTK_WIDGET(spoke));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    /* gtk+ did a garbage job of "deprecating" GtkMisc, so keep using it for now */
     gtk_misc_set_alignment(GTK_MISC(spoke->priv->title_label), 0, 1);
+G_GNUC_END_IGNORE_DEPRECATIONS
     gtk_widget_set_hexpand(GTK_WIDGET(spoke->priv->title_label), FALSE);
 
     /* Create the status label. */
     spoke->priv->status_label = gtk_label_new(NULL);
     format_status_label(spoke, _(DEFAULT_STATUS));
     gtk_label_set_justify(GTK_LABEL(spoke->priv->status_label), GTK_JUSTIFY_LEFT);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_misc_set_alignment(GTK_MISC(spoke->priv->status_label), 0, 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
     gtk_label_set_ellipsize(GTK_LABEL(spoke->priv->status_label), PANGO_ELLIPSIZE_MIDDLE);
     gtk_label_set_max_width_chars(GTK_LABEL(spoke->priv->status_label), 45);
     gtk_widget_set_hexpand(GTK_WIDGET(spoke->priv->status_label), FALSE);
@@ -295,10 +325,24 @@ static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) {
     gtk_grid_attach(GTK_GRID(spoke->priv->grid), spoke->priv->status_label, 1, 1, 2, 1);
 
     gtk_container_add(GTK_CONTAINER(spoke), spoke->priv->grid);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    /* No existing role is appropriate for this, so ignore the warning raised
+       by registering a new role. */
+    role = atk_role_register("spoke selector");
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    atk = gtk_widget_get_accessible(GTK_WIDGET(spoke));
+    atk_object_set_name(atk, _(DEFAULT_TITLE));
+    atk_object_set_description(atk, _(DEFAULT_STATUS));
+    atk_object_set_role(atk, role);
 }
 
-static void anaconda_spoke_selector_finalize(AnacondaSpokeSelector *spoke) {
+static void anaconda_spoke_selector_finalize(GObject *object) {
+    AnacondaSpokeSelector *spoke = ANACONDA_SPOKE_SELECTOR(object);
     g_object_unref(spoke->priv->cursor);
+
+    G_OBJECT_CLASS(anaconda_spoke_selector_parent_class)->finalize(object);
 }
 
 static void anaconda_spoke_selector_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
@@ -321,6 +365,7 @@ static void anaconda_spoke_selector_get_property(GObject *object, guint prop_id,
 }
 
 static void anaconda_spoke_selector_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
+    AtkObject *atk;
     AnacondaSpokeSelector *widget = ANACONDA_SPOKE_SELECTOR(object);
 
     switch(prop_id) {
@@ -334,12 +379,18 @@ static void anaconda_spoke_selector_set_property(GObject *object, guint prop_id,
             break;
 
         case PROP_STATUS: {
+            atk = gtk_widget_get_accessible(GTK_WIDGET(widget));
+
             format_status_label(widget, g_value_get_string(value));
+            atk_object_set_description(atk, g_value_get_string(value));
             break;
         }
 
         case PROP_TITLE: {
+            atk = gtk_widget_get_accessible(GTK_WIDGET(widget));
+
             format_title_label(widget, g_value_get_string(value));
+            atk_object_set_name(atk, gtk_label_get_text(GTK_LABEL(widget->priv->title_label)));
             break;
         }
     }
@@ -387,9 +438,9 @@ void anaconda_spoke_selector_set_incomplete(AnacondaSpokeSelector *spoke, gboole
 static gboolean anaconda_spoke_selector_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) {
     GtkStateFlags new_state;
 
-    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FOCUSED;
+    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FLAG_SELECTED;
     if (event->in)
-        new_state |= GTK_STATE_FOCUSED;
+        new_state |= GTK_STATE_FLAG_SELECTED;
     gtk_widget_set_state_flags(widget, new_state, TRUE);
     return FALSE;
 }
diff --git a/anaconda/widgets/src/SpokeWindow.c b/anaconda/widgets/src/SpokeWindow.c
index 1bba1e6..a1a46f1 100644
--- a/anaconda/widgets/src/SpokeWindow.c
+++ b/anaconda/widgets/src/SpokeWindow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013  Red Hat, Inc.
+ * Copyright (C) 2011-2014  Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,9 @@
 #include "BaseWindow.h"
 #include "SpokeWindow.h"
 #include "intl.h"
+#include "widgets-common.h"
 
+#include <atk/atk.h>
 #include <gdk/gdkkeysyms.h>
 
 /**
@@ -28,11 +30,11 @@
  * @title: AnacondaSpokeWindow
  * @short_description: Window for displaying single spokes
  *
- * A #AnacondaSpokeWindow is a top-level window that displays a single spoke
- * on the entire screen.  Examples include the keyboard and language
- * configuration screens off the first hub.
+ * A #AnacondaSpokeWindow is a widget that displays a single spoke on the
+ * screen.  Examples include the keyboard and language configuration screens
+ * off the first hub.
  *
- * The window consists of two areas:
+ * The AnacondaSpokeWindow consists of two areas:
  *
  * - A navigation area in the top of the screen, inherited from #AnacondaBaseWindow
  *   and augmented with a button in the upper left corner.
@@ -41,10 +43,6 @@
  *   space.  This is where widgets will be added and the user will do things.
  */
 
-enum {
-    PROP_BUTTON_LABEL = 1
-};
-
 #define DEFAULT_BUTTON_LABEL _("_Done")
 
 enum {
@@ -60,38 +58,14 @@ struct _AnacondaSpokeWindowPrivate {
 
 G_DEFINE_TYPE(AnacondaSpokeWindow, anaconda_spoke_window, ANACONDA_TYPE_BASE_WINDOW)
 
-static void anaconda_spoke_window_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void anaconda_spoke_window_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-
-static void anaconda_spoke_window_realize(GtkWidget *widget, gpointer user_data);
 static void anaconda_spoke_window_button_clicked(GtkButton *button,
                                                  AnacondaSpokeWindow *win);
 
 static void anaconda_spoke_window_class_init(AnacondaSpokeWindowClass *klass) {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    object_class->set_property = anaconda_spoke_window_set_property;
-    object_class->get_property = anaconda_spoke_window_get_property;
-
     klass->button_clicked = NULL;
 
-    /**
-     * AnacondaSpokeWindow:button-label:
-     *
-     * The :button-label string is the text used to label the button displayed
-     * in the upper lefthand of the window.  By default, this button says Done,
-     * but it could be changed to anything appropriate.
-     *
-     * Since: 1.0
-     */
-    g_object_class_install_property(object_class,
-                                    PROP_BUTTON_LABEL,
-                                    g_param_spec_string("button-label",
-                                                        P_("Button Label"),
-                                                        P_("Label to appear on the upper left button"),
-                                                        DEFAULT_BUTTON_LABEL,
-                                                        G_PARAM_READWRITE));
-
     /**
      * AnacondaSpokeWindow::button-clicked:
      * @window: the window that received the signal
@@ -130,17 +104,14 @@ GtkWidget *anaconda_spoke_window_new() {
 }
 
 static void anaconda_spoke_window_init(AnacondaSpokeWindow *win) {
+    AtkObject *atk;
     GtkWidget *nav_area;
+    GtkStyleContext *context;
 
     win->priv = G_TYPE_INSTANCE_GET_PRIVATE(win,
                                             ANACONDA_TYPE_SPOKE_WINDOW,
                                             AnacondaSpokeWindowPrivate);
 
-    g_signal_connect(win, "map", G_CALLBACK(anaconda_spoke_window_realize), NULL);
-
-    /* Set some default properties. */
-    gtk_window_set_modal(GTK_WINDOW(win), TRUE);
-
     /* Create the button. */
     win->priv->button = gtk_button_new_with_mnemonic(DEFAULT_BUTTON_LABEL);
     gtk_widget_set_halign(win->priv->button, GTK_ALIGN_START);
@@ -148,6 +119,13 @@ static void anaconda_spoke_window_init(AnacondaSpokeWindow *win) {
     gtk_widget_set_valign(win->priv->button, GTK_ALIGN_END);
     gtk_widget_set_margin_bottom(win->priv->button, 6);
 
+    atk = gtk_widget_get_accessible(win->priv->button);
+    atk_object_set_name(atk, DEFAULT_BUTTON_LABEL);
+
+    /* Set 'Done' button to blue 'suggested-action' style class */
+    context = gtk_widget_get_style_context(win->priv->button);
+    gtk_style_context_add_class(context, "suggested-action");
+
     /* Hook up some signals for that button.  The signal handlers here will
      * just raise our own custom signals for the whole window.
      */
@@ -159,78 +137,7 @@ static void anaconda_spoke_window_init(AnacondaSpokeWindow *win) {
     gtk_grid_attach(GTK_GRID(nav_area), win->priv->button, 0, 1, 1, 2);
 }
 
-static void anaconda_spoke_window_realize(GtkWidget *widget, gpointer user_data) {
-    GtkAccelGroup *accel_group;
-    GError *error;
-    GdkPixbuf *pixbuf;
-    cairo_pattern_t *pattern;
-    cairo_surface_t *surface;
-    cairo_t *cr;
-
-    AnacondaSpokeWindow *window = ANACONDA_SPOKE_WINDOW(widget);
-
-    /* Set the background gradient in the header.  If we fail to load the
-     * background for any reason, just print an error message and display the
-     * header without an image.
-     */
-    error = NULL;
-    pixbuf = gdk_pixbuf_new_from_file("/usr/share/anaconda/pixmaps/anaconda_spoke_header.png", &error);
-    if (!pixbuf) {
-        fprintf(stderr, "could not load header background: %s\n", error->message);
-        g_error_free(error);
-    } else {
-        GtkWidget *nav_box = anaconda_base_window_get_nav_area_background_window(ANACONDA_BASE_WINDOW(window));
-        gtk_widget_set_size_request(nav_box, -1, gdk_pixbuf_get_height (pixbuf));
-
-        surface = gdk_window_create_similar_surface(gtk_widget_get_window(nav_box), CAIRO_CONTENT_COLOR_ALPHA,
-                                                    gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
-        cr = cairo_create(surface);
-
-        gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
-        cairo_paint(cr);
-        cairo_destroy(cr);
-        pattern = cairo_pattern_create_for_surface(surface);
-        cairo_surface_destroy(surface);
-
-        cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
-        gdk_window_set_background_pattern(gtk_widget_get_window(nav_box), pattern);
-    }
-
-    /* Pressing F12 should send you back to the hub, similar to how the old UI worked. */
-    accel_group = gtk_accel_group_new();
-    gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
-    gtk_widget_add_accelerator(window->priv->button,
-                               "clicked",
-                               accel_group,
-                               GDK_KEY_F12,
-                               0,
-                               0);
-}
-
 static void anaconda_spoke_window_button_clicked(GtkButton *button,
                                                  AnacondaSpokeWindow *win) {
     g_signal_emit(win, window_signals[SIGNAL_BUTTON_CLICKED], 0);
 }
-
-static void anaconda_spoke_window_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
-    AnacondaSpokeWindow *widget = ANACONDA_SPOKE_WINDOW(object);
-    AnacondaSpokeWindowPrivate *priv = widget->priv;
-
-    switch(prop_id) {
-        case PROP_BUTTON_LABEL:
-            g_value_set_string (value, gtk_button_get_label(GTK_BUTTON(priv->button)));
-            break;
-    }
-}
-
-static void anaconda_spoke_window_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
-    AnacondaSpokeWindow *widget = ANACONDA_SPOKE_WINDOW(object);
-    AnacondaSpokeWindowPrivate *priv = widget->priv;
-
-    switch(prop_id) {
-        case PROP_BUTTON_LABEL:
-            gtk_button_set_label(GTK_BUTTON(priv->button), g_value_get_string(value));
-            gtk_button_set_use_underline(GTK_BUTTON(priv->button), TRUE);
-            break;
-    }
-}
diff --git a/anaconda/widgets/src/StandaloneWindow.c b/anaconda/widgets/src/StandaloneWindow.c
index 5bf8c1c..8281184 100644
--- a/anaconda/widgets/src/StandaloneWindow.c
+++ b/anaconda/widgets/src/StandaloneWindow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013  Red Hat, Inc.
+ * Copyright (C) 2011-2014  Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,11 @@
  * Author: Chris Lumens <clumens@redhat.com>
  */
 
-#include "BaseWindow.h"
+#include "BaseStandalone.h"
 #include "StandaloneWindow.h"
 #include "intl.h"
 
+#include <atk/atk.h>
 #include <gdk/gdkkeysyms.h>
 
 /**
@@ -28,12 +29,12 @@
  * @title: AnacondaStandaloneWindow
  * @short_description: Window for displaying standalone spokes
  *
- * A #AnacondaStandaloneWindow is a top-level window that displays a standalone
+ * A #AnacondaStandaloneWindow is a widget that displays a standalone
  * spoke.  A standalone spoke is like a normal spoke, but is not entered via a
  * hub.  Instead, it is displayed by itself.  Examples include the welcome and
  * network configuration screens at the beginning of installation.
  *
- * The window consist of three areas:
+ * The AnacondaStandaloneWindow consist of three areas:
  *
  * - A navigation area in the top of the screen, inherited from #AnacondaBaseWindow.
  *
@@ -45,72 +46,77 @@
  *   space.  This is where widgets will be added and the user will do things.
  */
 
-enum {
-    SIGNAL_QUIT_CLICKED,
-    SIGNAL_CONTINUE_CLICKED,
-    LAST_SIGNAL
-};
-
 #define QUIT_TEXT       N_("_Quit")
 #define CONTINUE_TEXT   N_("_Continue")
 
-static guint window_signals[LAST_SIGNAL] = { 0 };
-
 struct _AnacondaStandaloneWindowPrivate {
     GtkWidget  *button_box;
     GtkWidget  *continue_button, *quit_button;
 };
 
-static void anaconda_standalone_window_quit_clicked(GtkButton *button,
-                                                    AnacondaStandaloneWindow *win);
-static void anaconda_standalone_window_continue_clicked(GtkButton *button,
-                                                        AnacondaStandaloneWindow *win);
-static void anaconda_standalone_window_realize(GtkWidget *widget,
-                                               AnacondaStandaloneWindow *win);
+enum {
+    PROP_QUIT_BUTTON = 1,
+    PROP_CONTINUE_BUTTON
+};
 
-G_DEFINE_TYPE(AnacondaStandaloneWindow, anaconda_standalone_window, ANACONDA_TYPE_BASE_WINDOW)
+static void anaconda_standalone_window_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+
+G_DEFINE_TYPE(AnacondaStandaloneWindow, anaconda_standalone_window, ANACONDA_TYPE_BASE_STANDALONE)
 
 static void anaconda_standalone_window_class_init(AnacondaStandaloneWindowClass *klass) {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    klass->quit_clicked = NULL;
-    klass->continue_clicked = NULL;
+    object_class->get_property = anaconda_standalone_window_get_property;
+
+    /*
+     * Override the quit-button and continue-button properties to make them
+     * read only. The buttons will be create during the object's init method.
+     */
 
     /**
-     * AnacondaStandaloneWindow::quit-clicked:
-     * @window: the window that received the signal
+     * AnacondaStandaloneWindow::quit-button:
      *
-     * Emitted when the quit button has been activated (pressed and released).
+     * The button to quit anaconda.
      *
-     * Since: 1.0
+     * This overrides #AnacondaBaseStandalone:quit-button in #AnacondaBaseStandalone to be read-only.
+     *
+     * Since: 3.0
      */
-    window_signals[SIGNAL_QUIT_CLICKED] = g_signal_new("quit-clicked",
-                                                       G_TYPE_FROM_CLASS(object_class),
-                                                       G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                                                       G_STRUCT_OFFSET(AnacondaStandaloneWindowClass, quit_clicked),
-                                                       NULL, NULL,
-                                                       g_cclosure_marshal_VOID__VOID,
-                                                       G_TYPE_NONE, 0);
+    g_object_class_install_property(object_class,
+                                    PROP_QUIT_BUTTON,
+                                    g_param_spec_object("quit-button",
+                                                        P_("Quit button"),
+                                                        P_("The button to quit Anaconda"),
+                                                        GTK_TYPE_BUTTON,
+                                                        G_PARAM_READABLE));
 
     /**
-     * AnacondaStandaloneWindow::continue-clicked:
-     * @window: the window that received the signal
+     * AnacondaStandaloneWindow::continue-button:
      *
-     * Emitted when the continue button has been activated (pressed and released).
+     * The button to continue to the next window.
      *
-     * Since: 1.0
+     * This overrides #AnacondaBaseStandalone:continue-button in #AnacondaBaseStandalone to be read-only.
+     *
+     * Since: 3.0
      */
-    window_signals[SIGNAL_CONTINUE_CLICKED] = g_signal_new("continue-clicked",
-                                                           G_TYPE_FROM_CLASS(object_class),
-                                                           G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                                                           G_STRUCT_OFFSET(AnacondaStandaloneWindowClass, continue_clicked),
-                                                           NULL, NULL,
-                                                           g_cclosure_marshal_VOID__VOID,
-                                                           G_TYPE_NONE, 0);
+    g_object_class_install_property(object_class,
+                                    PROP_CONTINUE_BUTTON,
+                                    g_param_spec_object("continue-button",
+                                                        P_("Continue button"),
+                                                        P_("The button to continue to the next window"),
+                                                        GTK_TYPE_BUTTON,
+                                                        G_PARAM_READABLE));
 
     g_type_class_add_private(object_class, sizeof(AnacondaStandaloneWindowPrivate));
 }
 
+static void anaconda_standalone_window_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
+    /* Just chain up to the parent class get_property */
+    gchar *parent_property = g_strdup_printf("%s::%s", G_OBJECT_CLASS_NAME(anaconda_standalone_window_parent_class), pspec->name);
+    g_object_get_property(object, parent_property, value);
+    g_free(parent_property);
+}
+
 /**
  * anaconda_standalone_window_new:
  *
@@ -125,7 +131,9 @@ GtkWidget *anaconda_standalone_window_new() {
 }
 
 static void anaconda_standalone_window_init(AnacondaStandaloneWindow *win) {
+    AtkObject *atk;
     GtkWidget *main_box = anaconda_base_window_get_main_box(ANACONDA_BASE_WINDOW(win));
+    GtkStyleContext *context;
 
     win->priv = G_TYPE_INSTANCE_GET_PRIVATE(win,
                                             ANACONDA_TYPE_STANDALONE_WINDOW,
@@ -133,91 +141,38 @@ static void anaconda_standalone_window_init(AnacondaStandaloneWindow *win) {
 
     /* Create the buttons. */
     win->priv->quit_button = gtk_button_new_with_mnemonic(_(QUIT_TEXT));
-    win->priv->continue_button = gtk_button_new_with_mnemonic(_(CONTINUE_TEXT));
+    atk = gtk_widget_get_accessible(win->priv->quit_button);
+    atk_object_set_name(atk, _(QUIT_TEXT));
 
-    /* Hook up some signals for those buttons.  The signal handlers here will
-     * just raise our own custom signals for the whole window.
-     */
-    g_signal_connect(win->priv->quit_button, "clicked",
-                     G_CALLBACK(anaconda_standalone_window_quit_clicked), win);
-    g_signal_connect(win->priv->continue_button, "clicked",
-                     G_CALLBACK(anaconda_standalone_window_continue_clicked), win);
+    win->priv->continue_button = gtk_button_new_with_mnemonic(_(CONTINUE_TEXT));
+    atk = gtk_widget_get_accessible(win->priv->continue_button);
+    atk_object_set_name(atk, _(CONTINUE_TEXT));
+
+    /* Set the Continue button to the blue 'suggested-action' style class */
+    context = gtk_widget_get_style_context(win->priv->continue_button);
+    gtk_style_context_add_class(context, "suggested-action");
+
+    /* Set the properties on AnacondaBaseStandalone */
+    g_object_set(G_OBJECT(win), "AnacondaBaseStandalone::quit-button", win->priv->quit_button, NULL);
+    g_object_set(G_OBJECT(win), "AnacondaBaseStandalone::continue-button", win->priv->continue_button, NULL);
 
     /* Create the button box and pack the buttons into it. */
     win->priv->button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-    gtk_widget_set_margin_left(win->priv->button_box, 6);
-    gtk_widget_set_margin_right(win->priv->button_box, 6);
+    gtk_widget_set_margin_start(win->priv->button_box, 6);
+    gtk_widget_set_margin_end(win->priv->button_box, 6);
     gtk_widget_set_margin_bottom(win->priv->button_box, 6);
-    gtk_button_box_set_layout(GTK_BUTTON_BOX(win->priv->button_box), GTK_BUTTONBOX_EDGE);
+    gtk_button_box_set_layout(GTK_BUTTON_BOX(win->priv->button_box), GTK_BUTTONBOX_END);
+    gtk_box_set_spacing(GTK_BOX(win->priv->button_box), 12);
+
     gtk_container_add(GTK_CONTAINER(win->priv->button_box), win->priv->quit_button);
     gtk_container_add(GTK_CONTAINER(win->priv->button_box), win->priv->continue_button);
 
     gtk_box_pack_start(GTK_BOX(main_box), win->priv->button_box, FALSE, TRUE, 0);
-
-    /* It would be handy for F12 to continue to work like it did in the old
-     * UI, by skipping you to the next screen.
-     */
-    g_signal_connect(win, "realize", G_CALLBACK(anaconda_standalone_window_realize), win);
-}
-
-static void anaconda_standalone_window_realize(GtkWidget *widget,
-                                               AnacondaStandaloneWindow *win) {
-    GtkAccelGroup *accel_group = gtk_accel_group_new();
-    gtk_window_add_accel_group(GTK_WINDOW(win), accel_group);
-    gtk_widget_add_accelerator(win->priv->continue_button,
-                               "clicked",
-                               accel_group,
-                               GDK_KEY_F12,
-                               0,
-                               0);
-}
-
-static void anaconda_standalone_window_quit_clicked(GtkButton *button,
-                                                    AnacondaStandaloneWindow *win) {
-    g_signal_emit(win, window_signals[SIGNAL_QUIT_CLICKED], 0);
-}
-
-static void anaconda_standalone_window_continue_clicked(GtkButton *button,
-                                                        AnacondaStandaloneWindow *win) {
-    g_signal_emit(win, window_signals[SIGNAL_CONTINUE_CLICKED], 0);
-}
-
-/**
- * anaconda_standalone_window_get_may_continue:
- * @win: a #AnacondaStandaloneWindow
- *
- * Returns whether or not the continue button is sensitive (thus, whether the
- * user may continue forward from this window).
- *
- * Returns: Whether the continue button on @win is sensitive.
- *
- * Since: 1.0
- */
-gboolean anaconda_standalone_window_get_may_continue(AnacondaStandaloneWindow *win) {
-    return gtk_widget_get_sensitive(win->priv->continue_button);
-}
-
-/**
- * anaconda_standalone_window_set_may_continue:
- * @win: a #AnacondaStandaloneWindow
- * @may_continue: %TRUE if this window's continue button should be sensitive.
- *
- * Specifies whether the user may continue forward from this window.  If so,
- * the continue button will be made sensitive.  Windows default to continuable
- * so you must set it as false if you want.  The reason the user may not be
- * able to continue is if there is required information the user must enter
- * when no reasonable default may be given.
- *
- * Since: 1.0
- */
-void anaconda_standalone_window_set_may_continue(AnacondaStandaloneWindow *win,
-                                                 gboolean may_continue) {
-    gtk_widget_set_sensitive(win->priv->continue_button, may_continue);
 }
 
 /**
  * anaconda_standalone_window_retranslate:
- * @win: a #AnacondaStaldaloneWindow
+ * @win: a #AnacondaStandaloneWindow
  * @lang: target language
  *
  * Reload translations for this widget as needed.  Generally, this is not
@@ -229,6 +184,7 @@ void anaconda_standalone_window_set_may_continue(AnacondaStandaloneWindow *win,
  */
 void anaconda_standalone_window_retranslate(AnacondaStandaloneWindow *win, const char *lang) {
     anaconda_base_window_retranslate(ANACONDA_BASE_WINDOW(win), lang);
+
     gtk_button_set_label(GTK_BUTTON(win->priv->quit_button), _(QUIT_TEXT));
     gtk_button_set_label(GTK_BUTTON(win->priv->continue_button), _(CONTINUE_TEXT));
 }
diff --git a/anaconda/widgets/src/StandaloneWindow.h b/anaconda/widgets/src/StandaloneWindow.h
index d156205..63a9e9e 100644
--- a/anaconda/widgets/src/StandaloneWindow.h
+++ b/anaconda/widgets/src/StandaloneWindow.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include "BaseWindow.h"
+#include "BaseStandalone.h"
 
 G_BEGIN_DECLS
 
@@ -44,7 +44,7 @@ typedef struct _AnacondaStandaloneWindowPrivate   AnacondaStandaloneWindowPrivat
  * be directly accessed.
  */
 struct _AnacondaStandaloneWindow {
-    AnacondaBaseWindow           parent;
+    AnacondaBaseStandalone       parent;
 
     /*< private >*/
     AnacondaStandaloneWindowPrivate  *priv;
@@ -56,22 +56,13 @@ struct _AnacondaStandaloneWindow {
  *                the widget class structure in order for the class mechanism
  *                to work correctly.  This allows an AnacondaStandaloneWindowClass
  *                pointer to be cast to an #AnacondaBaseWindow pointer.
- * @quit_clicked: Function pointer called when the #AnacondaStandaloneWindow::quit-clicked
- *                signal is emitted.
- * @continue_clicked: Function pointer called when the #AnacondaStandaloneWindow::continue-clicked
- *                    signal is emitted.
  */
 struct _AnacondaStandaloneWindowClass {
-    AnacondaBaseWindowClass parent_class;
-
-    void (* quit_clicked)     (AnacondaStandaloneWindow *window);
-    void (* continue_clicked) (AnacondaStandaloneWindow *window);
+    AnacondaBaseStandaloneClass parent_class;
 };
 
 GType       anaconda_standalone_window_get_type (void);
 GtkWidget  *anaconda_standalone_window_new      ();
-gboolean    anaconda_standalone_window_get_may_continue  (AnacondaStandaloneWindow *win);
-void        anaconda_standalone_window_set_may_continue  (AnacondaStandaloneWindow *win, gboolean may_continue);
 void        anaconda_standalone_window_retranslate       (AnacondaStandaloneWindow *win, const char *lang);
 
 G_END_DECLS
diff --git a/anaconda/widgets/src/TimezoneMap.c b/anaconda/widgets/src/TimezoneMap.c
deleted file mode 100644
index a939c3c..0000000
--- a/anaconda/widgets/src/TimezoneMap.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/* Copyright (C) 2012-2013 Red Hat, Inc
- *
- * Heavily based on the code from gnome-control-center, Copyright (C) 2010 Intel, Inc.
- * Written by Thomas Wood <thomas.wood@intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Author: Vratislav Podzimek <vpodzime@redhat.com>
- *
- */
-
-#include "TimezoneMap.h"
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include "tz.h"
-
-/**
- * SECTION: TimezoneMap
- * @title: AnacondaTimezoneMap
- * @short_description: An interactive map for timezone selection
- *
- * A #AnacondaTimezoneMap is a widget that can be used for timezone selection.
- * The most important is the ::timezone-changed signal that includes the newly
- * selected timezone.
- */
-
-G_DEFINE_TYPE (AnacondaTimezoneMap, anaconda_timezone_map, GTK_TYPE_WIDGET)
-
-#define TIMEZONE_MAP_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), ANACONDA_TYPE_TIMEZONE_MAP, AnacondaTimezoneMapPrivate))
-
-
-typedef struct {
-  gdouble offset;
-  guchar red;
-  guchar green;
-  guchar blue;
-  guchar alpha;
-} AnacondaTimezoneMapOffset;
-
-struct _AnacondaTimezoneMapPrivate {
-  GdkPixbuf *orig_background;
-  GdkPixbuf *orig_color_map;
-
-  GdkPixbuf *background;
-  GdkPixbuf *color_map;
-
-  guchar *visible_map_pixels;
-  gint visible_map_rowstride;
-
-  gdouble selected_offset;
-
-  TzDB *tzdb;
-  TzLocation *location;
-};
-
-enum {
-  TIMEZONE_CHANGED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-static AnacondaTimezoneMapOffset color_codes[] =
-{
-    {-11.0, 43, 0, 0, 255 },
-    {-10.0, 85, 0, 0, 255 },
-    {-9.5, 102, 255, 0, 255 },
-    {-9.0, 128, 0, 0, 255 },
-    {-8.0, 170, 0, 0, 255 },
-    {-7.0, 212, 0, 0, 255 },
-    {-6.0, 255, 0, 1, 255 }, // north
-    {-6.0, 255, 0, 0, 255 }, // south
-    {-5.0, 255, 42, 42, 255 },
-    {-4.5, 192, 255, 0, 255 },
-    {-4.0, 255, 85, 85, 255 },
-    {-3.5, 0, 255, 0, 255 },
-    {-3.0, 255, 128, 128, 255 },
-    {-2.0, 255, 170, 170, 255 },
-    {-1.0, 255, 213, 213, 255 },
-    {0.0, 43, 17, 0, 255 },
-    {1.0, 85, 34, 0, 255 },
-    {2.0, 128, 51, 0, 255 },
-    {3.0, 170, 68, 0, 255 },
-    {3.5, 0, 255, 102, 255 },
-    {4.0, 212, 85, 0, 255 },
-    {4.5, 0, 204, 255, 255 },
-    {5.0, 255, 102, 0, 255 },
-    {5.5, 0, 102, 255, 255 },
-    {5.75, 0, 238, 207, 247 },
-    {6.0, 255, 127, 42, 255 },
-    {6.5, 204, 0, 254, 254 },
-    {7.0, 255, 153, 85, 255 },
-    {8.0, 255, 179, 128, 255 },
-    {9.0, 255, 204, 170, 255 },
-    {9.5, 170, 0, 68, 250 },
-    {10.0, 255, 230, 213, 255 },
-    {10.5, 212, 124, 21, 250 },
-    {11.0, 212, 170, 0, 255 },
-    {11.5, 249, 25, 87, 253 },
-    {12.0, 255, 204, 0, 255 },
-    {12.75, 254, 74, 100, 248 },
-    {13.0, 255, 85, 153, 250 },
-    {-100, 0, 0, 0, 0 }
-};
-
-/**
- * anaconda_timezone_map_new:
- *
- * Creates a new #AnacondaTimezoneMap.
- *
- * Returns: A new #AnacondaTimezoneMap
- */
-GtkWidget *anaconda_timezone_map_new () {
-    return g_object_new(ANACONDA_TYPE_TIMEZONE_MAP, NULL);
-}
-
-static void
-anaconda_timezone_map_get_property (GObject    *object,
-                              guint       property_id,
-                              GValue     *value,
-                              GParamSpec *pspec) {
-  switch (property_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-anaconda_timezone_map_set_property (GObject      *object,
-                              guint         property_id,
-                              const GValue *value,
-                              GParamSpec   *pspec) {
-  switch (property_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-anaconda_timezone_map_dispose (GObject *object) {
-  AnacondaTimezoneMapPrivate *priv = ANACONDA_TIMEZONE_MAP (object)->priv;
-
-  if (priv->orig_background) {
-      g_object_unref (priv->orig_background);
-      priv->orig_background = NULL;
-    }
-
-  if (priv->orig_color_map) {
-      g_object_unref (priv->orig_color_map);
-      priv->orig_color_map = NULL;
-    }
-
-  if (priv->background) {
-      g_object_unref (priv->background);
-      priv->background = NULL;
-    }
-
-  if (priv->color_map) {
-      g_object_unref (priv->color_map);
-      priv->color_map = NULL;
-
-      priv->visible_map_pixels = NULL;
-      priv->visible_map_rowstride = 0;
-    }
-
-  G_OBJECT_CLASS (anaconda_timezone_map_parent_class)->dispose (object);
-}
-
-static void
-anaconda_timezone_map_finalize (GObject *object) {
-  AnacondaTimezoneMapPrivate *priv = ANACONDA_TIMEZONE_MAP (object)->priv;
-
-  if (priv->tzdb) {
-      tz_db_free (priv->tzdb);
-      priv->tzdb = NULL;
-    }
-
-
-  G_OBJECT_CLASS (anaconda_timezone_map_parent_class)->finalize (object);
-}
-
-/* GtkWidget functions */
-static void
-anaconda_timezone_map_get_preferred_width (GtkWidget *widget,
-                                     gint      *minimum,
-                                     gint      *natural) {
-  /* choose a minimum size small enough to prevent the window
-   * from growing horizontally
-   */
-  if (minimum != NULL)
-    *minimum = 300;
-  if (natural != NULL)
-    *natural = 300;
-}
-
-static void
-anaconda_timezone_map_get_preferred_height (GtkWidget *widget,
-                                      gint      *minimum,
-                                      gint      *natural) {
-  AnacondaTimezoneMapPrivate *priv = ANACONDA_TIMEZONE_MAP (widget)->priv;
-  gint size;
-
-  /* The + 20 here is a slight tweak to make the map fill the
-   * panel better without causing horizontal growing
-   */
-  size = 300 * gdk_pixbuf_get_height (priv->orig_background) / gdk_pixbuf_get_width (priv->orig_background) + 20;
-  if (minimum != NULL)
-    *minimum = size;
-  if (natural != NULL)
-    *natural = size;
-}
-
-static void
-anaconda_timezone_map_size_allocate (GtkWidget     *widget,
-                               GtkAllocation *allocation) {
-  AnacondaTimezoneMapPrivate *priv = ANACONDA_TIMEZONE_MAP (widget)->priv;
-
-  if (priv->background)
-    g_object_unref (priv->background);
-
-  priv->background = gdk_pixbuf_scale_simple (priv->orig_background,
-                                              allocation->width,
-                                              allocation->height,
-                                              GDK_INTERP_BILINEAR);
-
-  if (priv->color_map)
-    g_object_unref (priv->color_map);
-
-  priv->color_map = gdk_pixbuf_scale_simple (priv->orig_color_map,
-                                             allocation->width,
-                                             allocation->height,
-                                             GDK_INTERP_BILINEAR);
-
-  priv->visible_map_pixels = gdk_pixbuf_get_pixels (priv->color_map);
-  priv->visible_map_rowstride = gdk_pixbuf_get_rowstride (priv->color_map);
-
-  GTK_WIDGET_CLASS (anaconda_timezone_map_parent_class)->size_allocate (widget,
-                                                                  allocation);
-}
-
-static void
-anaconda_timezone_map_realize (GtkWidget *widget) {
-  GdkWindowAttr attr = { 0, };
-  GtkAllocation allocation;
-  GdkCursor *cursor;
-  GdkWindow *window;
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  attr.window_type = GDK_WINDOW_CHILD;
-  attr.wclass = GDK_INPUT_OUTPUT;
-  attr.width = allocation.width;
-  attr.height = allocation.height;
-  attr.x = allocation.x;
-  attr.y = allocation.y;
-  attr.event_mask = gtk_widget_get_events (widget)
-                                 | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
-
-  window = gdk_window_new (gtk_widget_get_parent_window (widget), &attr,
-                           GDK_WA_X | GDK_WA_Y);
-
-  cursor = gdk_cursor_new (GDK_HAND2);
-  gdk_window_set_cursor (window, cursor);
-
-  gdk_window_set_user_data (window, widget);
-  gtk_widget_set_window (widget, window);
-}
-
-
-static gdouble
-convert_longtitude_to_x (gdouble longitude, gint map_width) {
-  const gdouble xdeg_offset = -6;
-  gdouble x;
-
-  x = (map_width * (180.0 + longitude) / 360.0)
-    + (map_width * xdeg_offset / 180.0);
-
-  return x;
-}
-
-static gdouble
-radians (gdouble degrees) {
-  return (degrees / 360.0) * G_PI * 2;
-}
-
-static gdouble
-convert_latitude_to_y (gdouble latitude, gdouble map_height) {
-  gdouble bottom_lat = -59;
-  gdouble top_lat = 81;
-  gdouble top_per, y, full_range, top_offset, map_range;
-
-  top_per = top_lat / 180.0;
-  y = 1.25 * log (tan (G_PI_4 + 0.4 * radians (latitude)));
-  full_range = 4.6068250867599998;
-  top_offset = full_range * top_per;
-  map_range = fabs (1.25 * log (tan (G_PI_4 + 0.4 * radians (bottom_lat))) - top_offset);
-  y = fabs (y - top_offset);
-  y = y / map_range;
-  y = y * map_height;
-  return y;
-}
-
-
-static gboolean
-anaconda_timezone_map_draw (GtkWidget *widget,
-                      cairo_t   *cr) {
-  AnacondaTimezoneMapPrivate *priv = ANACONDA_TIMEZONE_MAP (widget)->priv;
-  GdkPixbuf *hilight, *orig_hilight, *pin;
-  GtkAllocation alloc;
-  gchar *file;
-  GError *err = NULL;
-  gdouble pointx, pointy;
-  char buf[16];
-
-  gtk_widget_get_allocation (widget, &alloc);
-
-  /* paint background */
-  gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0);
-  cairo_paint (cr);
-
-  /* paint hilight */
-  file = g_strdup_printf ("%s/" TZMAP_DATADIR "/timezone_%s.png",
-                          get_widgets_datadir(),
-                          g_ascii_formatd (buf, sizeof (buf),
-                                           "%g", priv->selected_offset));
-  orig_hilight = gdk_pixbuf_new_from_file (file, &err);
-  g_free (file);
-  file = NULL;
-
-  if (!orig_hilight) {
-      g_warning ("Could not load hilight: %s",
-                 (err) ? err->message : "Unknown Error");
-      if (err)
-        g_clear_error (&err);
-    }
-  else {
-
-      hilight = gdk_pixbuf_scale_simple (orig_hilight, alloc.width,
-                                         alloc.height, GDK_INTERP_BILINEAR);
-      gdk_cairo_set_source_pixbuf (cr, hilight, 0, 0);
-
-      cairo_paint (cr);
-      g_object_unref (hilight);
-      g_object_unref (orig_hilight);
-    }
-
-  /* load pin icon */
-
-  file = g_strdup_printf("%s/" TZMAP_DATADIR "/pin.png", get_widgets_datadir());
-  pin = gdk_pixbuf_new_from_file (file, &err);
-  g_free(file);
-
-  if (err) {
-      g_warning ("Could not load pin icon: %s", err->message);
-      g_clear_error (&err);
-    }
-
-  if (priv->location) {
-      pointx = convert_longtitude_to_x (priv->location->longitude, alloc.width);
-      pointy = convert_latitude_to_y (priv->location->latitude, alloc.height);
-
-      if (pointy > alloc.height)
-        pointy = alloc.height;
-
-      if (pin) {
-          gdk_cairo_set_source_pixbuf (cr, pin, pointx - 8, pointy - 14);
-          cairo_paint (cr);
-        }
-    }
-
-  if (pin) {
-      g_object_unref (pin);
-    }
-
-  return TRUE;
-}
-
-
-static void
-anaconda_timezone_map_class_init (AnacondaTimezoneMapClass *klass) {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (AnacondaTimezoneMapPrivate));
-
-  object_class->get_property = anaconda_timezone_map_get_property;
-  object_class->set_property = anaconda_timezone_map_set_property;
-  object_class->dispose = anaconda_timezone_map_dispose;
-  object_class->finalize = anaconda_timezone_map_finalize;
-
-  widget_class->get_preferred_width = anaconda_timezone_map_get_preferred_width;
-  widget_class->get_preferred_height = anaconda_timezone_map_get_preferred_height;
-  widget_class->size_allocate = anaconda_timezone_map_size_allocate;
-  widget_class->realize = anaconda_timezone_map_realize;
-  widget_class->draw = anaconda_timezone_map_draw;
-
-  signals[TIMEZONE_CHANGED] = g_signal_new ("timezone-changed",
-                                            ANACONDA_TYPE_TIMEZONE_MAP,
-                                            G_SIGNAL_RUN_FIRST,
-                                            0,
-                                            NULL,
-                                            NULL,
-                                            g_cclosure_marshal_VOID__STRING,
-                                            G_TYPE_NONE, 1,
-                                            G_TYPE_STRING);
-}
-
-
-static gint
-sort_locations (TzLocation *a,
-                TzLocation *b) {
-  if (a->dist > b->dist)
-    return 1;
-
-  if (a->dist < b->dist)
-    return -1;
-
-  return 0;
-}
-
-static void
-set_location (AnacondaTimezoneMap *map,
-              TzLocation    *location,
-              gboolean no_city,
-              gboolean no_signal) {
-  AnacondaTimezoneMapPrivate *priv = map->priv;
-  TzInfo *info;
-
-  info = tz_info_from_location (location);
-
-  priv->selected_offset = tz_location_get_utc_offset (location)
-    / (60.0*60.0) + ((info->daylight) ? -1.0 : 0.0);
-
-  if (no_city) {
-      priv->location = NULL;
-      if (!no_signal)
-          g_signal_emit (map, signals[TIMEZONE_CHANGED], 0, "");
-  }
-  else {
-      priv->location = location;
-      if (!no_signal)
-          g_signal_emit (map, signals[TIMEZONE_CHANGED], 0, priv->location->zone);
-  }
-
-  tz_info_free (info);
-}
-
-static gboolean
-button_press_event (GtkWidget      *widget,
-                    GdkEventButton *event) {
-  AnacondaTimezoneMapPrivate *priv = ANACONDA_TIMEZONE_MAP (widget)->priv;
-  gint x, y;
-  guchar r, g, b, a;
-  guchar *pixels;
-  gint rowstride;
-  gint i;
-
-  const GPtrArray *array;
-  gint width, height;
-  GList *distances = NULL;
-  GtkAllocation alloc;
-
-  x = event->x;
-  y = event->y;
-
-
-  rowstride = priv->visible_map_rowstride;
-  pixels = priv->visible_map_pixels;
-
-  r = pixels[(rowstride * y + x * 4)];
-  g = pixels[(rowstride * y + x * 4) + 1];
-  b = pixels[(rowstride * y + x * 4) + 2];
-  a = pixels[(rowstride * y + x * 4) + 3];
-
-
-  for (i = 0; color_codes[i].offset != -100; i++) {
-       if (color_codes[i].red == r && color_codes[i].green == g
-           && color_codes[i].blue == b && color_codes[i].alpha == a) {
-           priv->selected_offset = color_codes[i].offset;
-         }
-    }
-
-  gtk_widget_queue_draw (widget);
-
-  /* work out the co-ordinates */
-
-  array = tz_get_locations (priv->tzdb);
-
-  gtk_widget_get_allocation (widget, &alloc);
-  width = alloc.width;
-  height = alloc.height;
-
-  for (i = 0; i < array->len; i++) {
-      gdouble pointx, pointy, dx, dy;
-      TzLocation *loc = array->pdata[i];
-
-      pointx = convert_longtitude_to_x (loc->longitude, width);
-      pointy = convert_latitude_to_y (loc->latitude, height);
-
-      dx = pointx - x;
-      dy = pointy - y;
-
-      loc->dist = dx * dx + dy * dy;
-      distances = g_list_prepend (distances, loc);
-
-    }
-  distances = g_list_sort (distances, (GCompareFunc) sort_locations);
-
-
-  set_location (ANACONDA_TIMEZONE_MAP (widget), (TzLocation*) distances->data, FALSE, FALSE);
-
-  g_list_free (distances);
-
-  return TRUE;
-}
-
-static void
-anaconda_timezone_map_init (AnacondaTimezoneMap *self) {
-  AnacondaTimezoneMapPrivate *priv;
-  GError *err = NULL;
-  gchar *file;
-
-  priv = self->priv = TIMEZONE_MAP_PRIVATE (self);
-
-  file = g_strdup_printf("%s/" TZMAP_DATADIR "/bg.png", get_widgets_datadir());
-  priv->orig_background = gdk_pixbuf_new_from_file (file, &err);
-  g_free(file);
-
-  if (!priv->orig_background) {
-      g_warning ("Could not load background image: %s",
-                 (err) ? err->message : "Unknown error");
-      g_clear_error (&err);
-    }
-
-  file = g_strdup_printf("%s/" TZMAP_DATADIR "/cc.png", get_widgets_datadir());
-  priv->orig_color_map = gdk_pixbuf_new_from_file (file, &err);
-  g_free(file);
-
-  if (!priv->orig_color_map) {
-      g_warning ("Could not load background image: %s",
-                 (err) ? err->message : "Unknown error");
-      g_clear_error (&err);
-    }
-
-  priv->tzdb = tz_load_db ();
-
-  g_signal_connect (self, "button-press-event", G_CALLBACK (button_press_event),
-                    NULL);
-}
-
-/**
- * anaconda_timezone_map_set_timezone:
- * @map: an #AnacondaTimezoneMap
- * @timezone: timezone name
- * @no_signal: whether the timezone-changed signal should be emitted or not
- *
- * Modifies the map to show @timezone as selected. Also modifies the internal
- * data of the @map.
- *
- * Returns: (transfer none): Whether the change was successfully completed.
- */
-gboolean
-anaconda_timezone_map_set_timezone (AnacondaTimezoneMap *map,
-                                    const gchar   *timezone,
-                                    gboolean no_signal) {
-  GPtrArray *locations;
-  guint i;
-  char *real_tz;
-  gboolean ret;
-  gboolean no_city = FALSE;
-
-  /* "" means reset to default -- Europe/London timezone without
-   *                              a pin (no_city) */
-  if (!g_strcmp0 (timezone, "")) {
-      timezone = "Europe/London";
-      no_city = TRUE;
-  }
-
-  real_tz = tz_info_get_clean_name (map->priv->tzdb, timezone);
-
-  locations = tz_get_locations (map->priv->tzdb);
-  ret = FALSE;
-
-  for (i = 0; i < locations->len; i++) {
-      TzLocation *loc = locations->pdata[i];
-
-      if (!g_strcmp0 (loc->zone, real_tz ? real_tz : timezone)) {
-          set_location (map, loc, no_city, no_signal);
-          ret = TRUE;
-          break;
-        }
-    }
-
-  if (ret)
-    gtk_widget_queue_draw (GTK_WIDGET (map));
-
-  g_free (real_tz);
-
-  return ret;
-}
-
-/**
- * anaconda_timezone_map_get_timezone:
- * @map: an #AnacondaTimezoneMap
- *
- * Returns: (transfer none): the selected timezone
- */
-gchar *
-anaconda_timezone_map_get_timezone (AnacondaTimezoneMap *map) {
-    if (map->priv->location)
-        return map->priv->location->zone;
-    else
-        return "";
-}
diff --git a/anaconda/widgets/src/TimezoneMap.h b/anaconda/widgets/src/TimezoneMap.h
deleted file mode 100644
index 3a857bd..0000000
--- a/anaconda/widgets/src/TimezoneMap.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Red Hat, Inc
- *
- * Heavily based on the gnome-control-center code,
- * Copyright (c) 2010 Intel, Inc
- * Written by Thomas Wood <thomas.wood@intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Author: Vratislav Podzimek <vpodzime@redhat.com>
- *
- */
-
-#ifndef _ANACONDA_TIMEZONE_MAP_H
-#define _ANACONDA_TIMEZONE_MAP_H
-
-#include <gtk/gtk.h>
-#include "tz.h"
-
-G_BEGIN_DECLS
-
-#define ANACONDA_TYPE_TIMEZONE_MAP anaconda_timezone_map_get_type()
-
-#define ANACONDA_TIMEZONE_MAP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  ANACONDA_TYPE_TIMEZONE_MAP, AnacondaTimezoneMap))
-
-#define ANACONDA_TIMEZONE_MAP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  ANACONDA_TYPE_TIMEZONE_MAP, AnacondaTimezoneMapClass))
-
-#define ANACONDA_IS_TIMEZONE_MAP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  ANACONDA_TYPE_TIMEZONE_MAP))
-
-#define ANACONDA_IS_TIMEZONE_MAP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  ANACONDA_TYPE_TIMEZONE_MAP))
-
-#define ANACONDA_TIMEZONE_MAP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  ANACONDA_TYPE_TIMEZONE_MAP, AnacondaTimezoneMapClass))
-
-typedef struct _AnacondaTimezoneMap AnacondaTimezoneMap;
-typedef struct _AnacondaTimezoneMapClass AnacondaTimezoneMapClass;
-typedef struct _AnacondaTimezoneMapPrivate AnacondaTimezoneMapPrivate;
-
-struct _AnacondaTimezoneMap
-{
-  GtkWidget parent;
-
-  AnacondaTimezoneMapPrivate *priv;
-};
-
-struct _AnacondaTimezoneMapClass
-{
-  GtkWidgetClass parent_class;
-};
-
-GType anaconda_timezone_map_get_type (void) G_GNUC_CONST;
-
-GtkWidget *anaconda_timezone_map_new (void);
-
-gboolean anaconda_timezone_map_set_timezone (AnacondaTimezoneMap *map,
-                                             const gchar   *timezone,
-                                             gboolean no_signal);
-
-gchar *anaconda_timezone_map_get_timezone (AnacondaTimezoneMap *map);
-
-G_END_DECLS
-
-#endif /* _ANACONDA_TIMEZONE_MAP_H */
diff --git a/anaconda/widgets/src/glade-adaptor.c b/anaconda/widgets/src/glade-adaptor.c
index 557937a..367e0e8 100644
--- a/anaconda/widgets/src/glade-adaptor.c
+++ b/anaconda/widgets/src/glade-adaptor.c
@@ -64,7 +64,7 @@ void anaconda_standalone_window_post_create(GladeWidgetAdaptor *adaptor,
         glade_widget_property_set(alignment_widget, "xalign", 0.5);
         glade_widget_property_set(alignment_widget, "yalign", 0.0);
         glade_widget_property_set(alignment_widget, "xscale", 0.5);
-        glade_widget_property_set(alignment_widget, "yscale", 0.5);
+        glade_widget_property_set(alignment_widget, "yscale", 1.0);
     } else {
         glade_widget_property_set(alignment_widget, "xalign", 0.5);
         glade_widget_property_set(alignment_widget, "yalign", 0.0);
@@ -72,22 +72,3 @@ void anaconda_standalone_window_post_create(GladeWidgetAdaptor *adaptor,
         glade_widget_property_set(alignment_widget, "yscale", 1.0);
     }
 }
-
-void anaconda_standalone_window_write_widget(GladeWidgetAdaptor *adaptor,
-                                             GladeWidget *widget,
-                                             GladeXmlContext *context, GladeXmlNode *node) {
-    GladeProperty *startup_id_prop;
-
-    if (!glade_xml_node_verify (node, GLADE_XML_TAG_WIDGET))
-        return;
-
-    /* Set a bogus startup-id in the output XML file.  This doesn't really seem
-     * like it should be necessary, but glade will crash if I don't.
-     */
-    startup_id_prop = glade_widget_get_property(widget, "startup-id");
-    glade_property_set(startup_id_prop, "filler");
-    glade_property_write(startup_id_prop, context, node);
-
-    /* Chain up and write the parent's properties */
-    GWA_GET_CLASS (GTK_TYPE_WINDOW)->write_widget (adaptor, widget, context, node);
-}
diff --git a/anaconda/widgets/src/tz.c b/anaconda/widgets/src/tz.c
deleted file mode 100644
index 54c0da5..0000000
--- a/anaconda/widgets/src/tz.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Generic timezone utilities.
- *
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Authors: Hans Petter Jansson <hpj@ximian.com>
- * 
- * Largely based on Michael Fulbright's work on Anaconda.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <math.h>
-#include <string.h>
-#include "tz.h"
-
-
-/* Forward declarations for private functions */
-
-static float convert_pos (gchar *pos, int digits);
-static int compare_country_names (const void *a, const void *b);
-static void sort_locations_by_country (GPtrArray *locations);
-static gchar * tz_data_file_get (void);
-static void load_backward_tz (TzDB *tz_db);
-
-/* Returns path to anaconda widgets data directory using the value of the
- * environment variable ANACONDA_WIDGETS_DATA or WIDGETS_DATADIR macro
- * (defined in Makefile.am) if the environment variable is not defined.
- */
-gchar *get_widgets_datadir() {
-    gchar *env_value;
-
-    env_value = getenv("ANACONDA_WIDGETS_DATA");
-    if (env_value == NULL)
-        return WIDGETS_DATADIR;
-    else
-        return env_value;
-}
-
-/* ---------------- *
- * Public interface *
- * ---------------- */
-TzDB *
-tz_load_db (void)
-{
-	gchar *tz_data_file;
-	TzDB *tz_db;
-	FILE *tzfile;
-	char buf[4096];
-
-	tz_data_file = tz_data_file_get ();
-	if (!tz_data_file) {
-		g_warning ("Could not get the TimeZone data file name");
-		return NULL;
-	}
-	tzfile = fopen (tz_data_file, "r");
-	if (!tzfile) {
-		g_warning ("Could not open *%s*\n", tz_data_file);
-		g_free (tz_data_file);
-		return NULL;
-	}
-
-	tz_db = g_new0 (TzDB, 1);
-	tz_db->locations = g_ptr_array_new ();
-
-	while (fgets (buf, sizeof(buf), tzfile)) {
-		gchar **tmpstrarr;
-		gchar *latstr, *lngstr, *p;
-		TzLocation *loc;
-
-		if (*buf == '#') continue;
-
-		g_strchomp(buf);
-		tmpstrarr = g_strsplit(buf,"\t", 6);
-		
-		latstr = g_strdup (tmpstrarr[1]);
-		p = latstr + 1;
-		while (*p != '-' && *p != '+') p++;
-		lngstr = g_strdup (p);
-		*p = '\0';
-		
-		loc = g_new0 (TzLocation, 1);
-		loc->country = g_strdup (tmpstrarr[0]);
-		loc->zone = g_strdup (tmpstrarr[2]);
-		loc->latitude  = convert_pos (latstr, 2);
-		loc->longitude = convert_pos (lngstr, 3);
-		
-		loc->comment = (tmpstrarr[3]) ? g_strdup(tmpstrarr[3]) : NULL;
-
-		g_ptr_array_add (tz_db->locations, (gpointer) loc);
-
-		g_free (latstr);
-		g_free (lngstr);
-		g_strfreev (tmpstrarr);
-	}
-	
-	fclose (tzfile);
-	
-	/* now sort by country */
-	sort_locations_by_country (tz_db->locations);
-	
-	g_free (tz_data_file);
-
-	/* Load up the hashtable of backward links */
-	load_backward_tz (tz_db);
-
-	return tz_db;
-}
-
-static void
-tz_location_free (TzLocation *loc)
-{
-	g_free (loc->country);
-	g_free (loc->zone);
-	g_free (loc->comment);
-
-	g_free (loc);
-}
-
-void
-tz_db_free (TzDB *db)
-{
-	g_ptr_array_foreach (db->locations, (GFunc) tz_location_free, NULL);
-	g_ptr_array_free (db->locations, TRUE);
-	g_hash_table_destroy (db->backward);
-	g_free (db);
-}
-
-GPtrArray *
-tz_get_locations (TzDB *db)
-{
-	return db->locations;
-}
-
-
-gchar *
-tz_location_get_country (TzLocation *loc)
-{
-	return loc->country;
-}
-
-
-gchar *
-tz_location_get_zone (TzLocation *loc)
-{
-	return loc->zone;
-}
-
-
-gchar *
-tz_location_get_comment (TzLocation *loc)
-{
-	return loc->comment;
-}
-
-
-void
-tz_location_get_position (TzLocation *loc, double *longitude, double *latitude)
-{
-	*longitude = loc->longitude;
-	*latitude = loc->latitude;
-}
-
-glong
-tz_location_get_utc_offset (TzLocation *loc)
-{
-	TzInfo *tz_info;
-	glong offset;
-
-	tz_info = tz_info_from_location (loc);
-	offset = tz_info->utc_offset;
-	tz_info_free (tz_info);
-	return offset;
-}
-
-TzInfo *
-tz_info_from_location (TzLocation *loc)
-{
-	TzInfo *tzinfo;
-	time_t curtime;
-	struct tm *curzone;
-	gchar *tz_env_value;
-	
-	g_return_val_if_fail (loc != NULL, NULL);
-	g_return_val_if_fail (loc->zone != NULL, NULL);
-	
-	tz_env_value = g_strdup (getenv ("TZ"));
-	setenv ("TZ", loc->zone, 1);
-	
-	tzinfo = g_new0 (TzInfo, 1);
-
-	curtime = time (NULL);
-	curzone = localtime (&curtime);
-
-	/* Currently this solution doesnt seem to work - I get that */
-	/* America/Phoenix uses daylight savings, which is wrong    */
-	tzinfo->tzname_normal = g_strdup (curzone->tm_zone);
-	if (curzone->tm_isdst) 
-		tzinfo->tzname_daylight =
-			g_strdup (&curzone->tm_zone[curzone->tm_isdst]);
-	else
-		tzinfo->tzname_daylight = NULL;
-
-	tzinfo->utc_offset = curzone->tm_gmtoff;
-
-	tzinfo->daylight = curzone->tm_isdst;
-
-	if (tz_env_value)
-		setenv ("TZ", tz_env_value, 1);
-	else
-		unsetenv ("TZ");
-
-	g_free (tz_env_value);
-	
-	return tzinfo;
-}
-
-
-void
-tz_info_free (TzInfo *tzinfo)
-{
-	g_return_if_fail (tzinfo != NULL);
-	
-	if (tzinfo->tzname_normal) g_free (tzinfo->tzname_normal);
-	if (tzinfo->tzname_daylight) g_free (tzinfo->tzname_daylight);
-	g_free (tzinfo);
-}
-
-struct {
-	const char *orig;
-	const char *dest;
-} aliases[] = {
-	{ "Asia/Istanbul",  "Europe/Istanbul" },	/* Istanbul is in both Europe and Asia */
-	{ "Europe/Nicosia", "Asia/Nicosia" },		/* Ditto */
-	{ "EET",            "Europe/Istanbul" },	/* Same tz as the 2 above */
-	{ "HST",            "Pacific/Honolulu" },
-	{ "WET",            "Europe/Brussels" },	/* Other name for the mainland Europe tz */
-	{ "CET",            "Europe/Brussels" },	/* ditto */
-	{ "MET",            "Europe/Brussels" },
-	{ "Etc/Zulu",       "Etc/GMT" },
-	{ "Etc/UTC",        "Etc/GMT" },
-	{ "GMT",            "Etc/GMT" },
-	{ "Greenwich",      "Etc/GMT" },
-	{ "Etc/UCT",        "Etc/GMT" },
-	{ "Etc/GMT0",       "Etc/GMT" },
-	{ "Etc/GMT+0",      "Etc/GMT" },
-	{ "Etc/GMT-0",      "Etc/GMT" },
-	{ "Etc/Universal",  "Etc/GMT" },
-	{ "PST8PDT",        "America/Los_Angeles" },	/* Other name for the Atlantic tz */
-	{ "EST",            "America/New_York" },	/* Other name for the Eastern tz */
-	{ "EST5EDT",        "America/New_York" },	/* ditto */
-	{ "CST6CDT",        "America/Chicago" },	/* Other name for the Central tz */
-	{ "MST",            "America/Denver" },		/* Other name for the mountain tz */
-	{ "MST7MDT",        "America/Denver" },		/* ditto */
-};
-
-static gboolean
-compare_timezones (const char *a,
-		   const char *b)
-{
-	if (g_str_equal (a, b))
-		return TRUE;
-	if (strchr (b, '/') == NULL) {
-		char *prefixed;
-
-		prefixed = g_strdup_printf ("/%s", b);
-		if (g_str_has_suffix (a, prefixed)) {
-			g_free (prefixed);
-			return TRUE;
-		}
-		g_free (prefixed);
-	}
-
-	return FALSE;
-}
-
-char *
-tz_info_get_clean_name (TzDB *tz_db,
-			const char *tz)
-{
-	char *ret;
-	const char *timezone;
-	guint i;
-	gboolean replaced;
-
-	/* Remove useless prefixes */
-	if (g_str_has_prefix (tz, "right/"))
-		tz = tz + strlen ("right/");
-	else if (g_str_has_prefix (tz, "posix/"))
-		tz = tz + strlen ("posix/");
-
-	/* Here start the crazies */
-	replaced = FALSE;
-
-	for (i = 0; i < G_N_ELEMENTS (aliases); i++) {
-		if (compare_timezones (tz, aliases[i].orig)) {
-			replaced = TRUE;
-			timezone = aliases[i].dest;
-			break;
-		}
-	}
-
-	/* Try again! */
-	if (!replaced) {
-		/* Ignore crazy solar times from the '80s */
-		if (g_str_has_prefix (tz, "Asia/Riyadh") ||
-		    g_str_has_prefix (tz, "Mideast/Riyadh")) {
-			timezone = "Asia/Riyadh";
-			replaced = TRUE;
-		}
-	}
-
-	if (!replaced)
-		timezone = tz;
-
-	ret = g_hash_table_lookup (tz_db->backward, timezone);
-	if (ret == NULL)
-		return g_strdup (timezone);
-	return g_strdup (ret);
-}
-
-/* ----------------- *
- * Private functions *
- * ----------------- */
-
-static gchar *
-tz_data_file_get (void)
-{
-	gchar *file;
-
-	file = g_strdup (TZ_DATA_FILE);
-
-	return file;
-}
-
-static float
-convert_pos (gchar *pos, int digits)
-{
-	gchar whole[10];
-	gchar *fraction;
-	gint i;
-	float t1, t2;
-	
-	if (!pos || strlen(pos) < 4 || digits > 9) return 0.0;
-	
-	for (i = 0; i < digits + 1; i++) whole[i] = pos[i];
-	whole[i] = '\0';
-	fraction = pos + digits + 1;
-
-	t1 = g_strtod (whole, NULL);
-	t2 = g_strtod (fraction, NULL);
-
-	if (t1 >= 0.0) return t1 + t2/pow (10.0, strlen(fraction));
-	else return t1 - t2/pow (10.0, strlen(fraction));
-}
-
-static int
-compare_country_names (const void *a, const void *b)
-{
-	const TzLocation *tza = * (TzLocation **) a;
-	const TzLocation *tzb = * (TzLocation **) b;
-	
-	return strcmp (tza->zone, tzb->zone);
-}
-
-
-static void
-sort_locations_by_country (GPtrArray *locations)
-{
-	qsort (locations->pdata, locations->len, sizeof (gpointer),
-	       compare_country_names);
-}
-
-static void
-load_backward_tz (TzDB *tz_db)
-{
-  GError *error = NULL;
-  char **lines, *contents;
-  guint i;
-  gchar *file;
-
-  tz_db->backward = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-
-  file = g_strdup_printf ("%s/" TZMAP_DATADIR "/timezones_backward", get_widgets_datadir());
-  if (g_file_get_contents (file, &contents, NULL, &error) == FALSE) {
-      g_warning ("Failed to load 'backward' file: %s", error->message);
-      return;
-    }
-  g_free(file);
-
-  lines = g_strsplit (contents, "\n", -1);
-  g_free (contents);
-  for (i = 0; lines[i] != NULL; i++) {
-      char **items;
-      guint j;
-      char *real, *alias;
-
-      if (g_ascii_strncasecmp (lines[i], "Link\t", 5) != 0)
-        continue;
-
-      items = g_strsplit (lines[i], "\t", -1);
-      real = NULL;
-      alias = NULL;
-      /* Skip the "Link<tab>" part */
-      for (j = 1; items[j] != NULL; j++) {
-          if (items[j][0] == '\0')
-            continue;
-          if (real == NULL) {
-              real = items[j];
-              continue;
-            }
-          alias = items[j];
-          break;
-        }
-
-      if (real == NULL || alias == NULL)
-        g_warning ("Could not parse line: %s", lines[i]);
-
-      /* We don't need more than one name for it */
-      if (g_str_equal (real, "Etc/UTC") ||
-          g_str_equal (real, "Etc/UCT"))
-        real = "Etc/GMT";
-
-      g_hash_table_insert (tz_db->backward, g_strdup (alias), g_strdup (real));
-      g_strfreev (items);
-    }
-  g_strfreev (lines);
-}
-
diff --git a/anaconda/widgets/src/tz.h b/anaconda/widgets/src/tz.h
deleted file mode 100644
index ec8a569..0000000
--- a/anaconda/widgets/src/tz.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Generic timezone utilities.
- *
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Authors: Hans Petter Jansson <hpj@ximian.com>
- * 
- * Largely based on Michael Fulbright's work on Anaconda.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_TZ_H
-#define _E_TZ_H
-
-#include <glib.h>
-
-#define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
-
-typedef struct _TzDB TzDB;
-typedef struct _TzLocation TzLocation;
-typedef struct _TzInfo TzInfo;
-
-gchar *get_widgets_datadir();
-
-struct _TzDB
-{
-	GPtrArray  *locations;
-	GHashTable *backward;
-};
-
-struct _TzLocation
-{
-	gchar *country;
-	gdouble latitude;
-	gdouble longitude;
-	gchar *zone;
-	gchar *comment;
-
-	gdouble dist; /* distance to clicked point for comparison */
-};
-
-/* see the glibc info page information on time zone information */
-/*  tzname_normal    is the default name for the timezone */
-/*  tzname_daylight  is the name of the zone when in daylight savings */
-/*  utc_offset       is offset in seconds from utc */
-/*  daylight         if non-zero then location obeys daylight savings */
-
-struct _TzInfo
-{
-	gchar *tzname_normal;
-	gchar *tzname_daylight;
-	glong utc_offset;
-	gint daylight;
-};
-
-
-TzDB      *tz_load_db                 (void);
-void       tz_db_free                 (TzDB *db);
-char *     tz_info_get_clean_name     (TzDB *tz_db,
-				       const char *tz);
-GPtrArray *tz_get_locations           (TzDB *db);
-void       tz_location_get_position   (TzLocation *loc,
-				       double *longitude, double *latitude);
-char      *tz_location_get_country    (TzLocation *loc);
-gchar     *tz_location_get_zone       (TzLocation *loc);
-gchar     *tz_location_get_comment    (TzLocation *loc);
-glong      tz_location_get_utc_offset (TzLocation *loc);
-gint       tz_location_set_locally    (TzLocation *loc);
-TzInfo    *tz_info_from_location      (TzLocation *loc);
-void       tz_info_free               (TzInfo *tz_info);
-
-#endif
diff --git a/anaconda/widgets/src/widgets-common.c b/anaconda/widgets/src/widgets-common.c
new file mode 100644
index 0000000..60bb0c5
--- /dev/null
+++ b/anaconda/widgets/src/widgets-common.c
@@ -0,0 +1,48 @@
+/* Copyright (C) 2013 Red Hat, Inc
+ *
+ * Common functions for AnacondaWidgets
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions of
+ * the GNU General Public License v.2, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY expressed or implied, including the implied warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.  You should have received a copy of the
+ * GNU General Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+ * source code or documentation are not subject to the GNU General Public
+ * License and may only be used or replicated with the express permission of
+ * Red Hat, Inc.
+ *
+ * Author: David Shea <dshea@redhat.com>
+ *
+ */
+
+#include "widgets-common.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * anaconda_get_widgets_datadir:
+ *
+ * Return the directory containing the anaconda widgets data files.
+ *
+ * The widgets data directory contains the pixmaps used by the anaconda
+ * widgets. This directory defaults to ${prefix}/share/anaconda/pixmaps, but
+ * it may be overriden at runtime using the ANACONDA_WIDGETS_DATA environment
+ * variable.
+ *
+ * Returns: the widgets data directory.
+ */
+const gchar *anaconda_get_widgets_datadir(void) {
+    gchar *env_value;
+
+    env_value = getenv("ANACONDA_WIDGETS_DATA");
+    if (env_value == NULL)
+        return WIDGETS_DATADIR;
+    else
+        return env_value;
+}
diff --git a/anaconda/pyanaconda/isys/eddsupport.h b/anaconda/widgets/src/widgets-common.h
similarity index 72%
rename from anaconda/pyanaconda/isys/eddsupport.h
rename to anaconda/widgets/src/widgets-common.h
index 77fc4c4..5dd7c1b 100644
--- a/anaconda/pyanaconda/isys/eddsupport.h
+++ b/anaconda/widgets/src/widgets-common.h
@@ -1,7 +1,5 @@
 /*
- * eddsupport.h
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2013  Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,14 +13,20 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Shea <dshea@redhat.com>
  */
 
-#ifndef EDDSUPPORT_H
-#define EDDSUPPORT_H
+#ifndef _WIDGETS_COMMON_H
+#define _WIDGETS_COMMON_H
 
-int probeBiosDisks();
-char* getBiosDisk(char *);
+#include <glib.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+G_BEGIN_DECLS
+
+const gchar *anaconda_get_widgets_datadir(void);
+
+G_END_DECLS
 
 #endif
-
-